Cy testing

.gitignore

@@ -63,3 +63,6 @@ typings/
 # cypress.io
 cypress/screenshots
 cypress/videos
+
+# .DS_Store
+.DS_Store

README.md

@@ -123,7 +123,7 @@ The signature is created using a 'secret', which must be kept private (i.e. not
 Here, we've used an environment variable called `JWT_SECRET`, which you'll see used in the commands to start the application and run the tests (below). You can change the value of that environment variable to anything you like.
 ## Card wall
 
-REPLACE THIS TEXT WITH A LINK TO YOUR CARD WALL
+[Trello](https://trello.com/b/ucgll1v8/acebook-airbenders)
 
 ## Quickstart
 

api/app.js

@@ -39,13 +39,13 @@ const tokenChecker = (req, res, next) => {
 };
 
 // route setup
-app.use("/posts", tokenChecker, postsRouter);
+app.use("/posts", tokenChecker, postsRouter); // tokenChecker is a middleware function
 app.use("/tokens", tokensRouter);
 app.use("/users", usersRouter);
 
 // catch 404 and forward to error handler
 app.use((req, res, next) => {
-  next(createError(404));
+  next(createError(404)); 
 });
 
 // error handler

api/controllers/posts.js

@@ -1,25 +1,84 @@
 const Post = require("../models/post");
+const Comment = require("../models/comment");
 const TokenGenerator = require("../models/token_generator");
 
 const PostsController = {
   Index: (req, res) => {
-    Post.find(async (err, posts) => {
+    // .find gets data out, .populate adds the referenced user fields
+    // sort will take an object with a format of {property: sort, property: sort}
+    // sort = -1 is descending, sort = 1 is ascending order
+    // in the current format, if time is exactly the same it will sort alphabetically by message
+    // note: (this is purely for the proof of concept, sounds silly to take into account)
+    Post.find()
+      .populate({ path: "user", select: ["name", "avatar"] })
+      .populate({
+        path: "comments",
+        populate: {
+          path: "user",
+          select: ["name", "avatar"],
+        },
+      })
+      .sort({ time: -1, message: 1 })
+      .exec((err, posts) => {
+        if (err) {
+          throw err;
+        }
+        const token = TokenGenerator.jsonwebtoken(req.user_id);
+        // .json() on the backend sends an http response containing a json.
+        res.status(200).json({ posts: posts, token: token });
+      });
+  },
+
+  Create: (req, res) => {
+    const post = new Post(req.body);
+    post.user = req.user_id;
+
+    post.save(err => {
       if (err) {
         throw err;
       }
-      const token = await TokenGenerator.jsonwebtoken(req.user_id)
-      res.status(200).json({ posts: posts, token: token });
+      const token = TokenGenerator.jsonwebtoken(req.user_id);
+      res.status(201).json({ message: "OK", token: token });
     });
   },
-  Create: (req, res) => {
-    const post = new Post(req.body);
-    post.save(async (err) => {
+
+  Update: (req, res) => {
+    // .findOneAndUpdate(filter, changes, return function)
+    Post.findOneAndUpdate({ _id: req.body.postId }, { likes: req.body.likes }, async (err, posts) => {
       if (err) {
         throw err;
       }
+      const token = await TokenGenerator.jsonwebtoken(req.user_id);
+      res.status(201).json({ message: "Post liked", token: token });
+    });
+  },
+
+  CreateComment: (req, res) => {
+    // POST http://localhost:8080/posts/comments
+    // Header - Authorization: "bearer {token}"
+    // Body - { "postId": "64887a8097403dcf437532d0", "message": "i am comment" }
+
+    const comment = new Comment(req.body);
+    comment.user = req.user_id;
+
+    comment.save((err, comment) => {
+      if (err) {
+        throw err;
+      }
+      const token = TokenGenerator.jsonwebtoken(req.user_id);
+      res.status(201).json({ message: "Comment posted", commentId: comment._id });
+    });
+  },
+
+  UpdatePost: (req, res) => {
+    // Comments array inside Post contains a list of comment IDs
+    // PATCH http://localhost:8080/posts/comments
+    // Header - Authorization: "bearer {token}"
+    // Body = {"postId": "64887a8097403dcf437532d0", "commentId": "64888985ee20f9d200ee9e0a"}
 
-      const token = await TokenGenerator.jsonwebtoken(req.user_id)
-      res.status(201).json({ message: 'OK', token: token });
+    Post.findOneAndUpdate({ _id: req.body.postId }, { $addToSet: { comments: req.body.commentId } }, { new: true }).then(post => {
+      const token = TokenGenerator.jsonwebtoken(req.user_id);
+      res.status(201).json({ post: post, token: token });
     });
   },
 };

api/controllers/tokens.js

@@ -1,5 +1,7 @@
 const User = require("../models/user");
 const TokenGenerator = require("../models/token_generator")
+const bcrypt = require('bcrypt');
+
 
 const SessionsController = {
 
@@ -9,17 +11,16 @@ const SessionsController = {
 
     User.findOne({ email: email }).then(async (user) => {
       if (!user) {
-        console.log("auth error: user not found")
-        res.status(401).json({ message: "auth error" });
-      } else if (user.password !== password) {
-        console.log("auth error: passwords do not match")
-        res.status(401).json({ message: "auth error" });
+        res.status(401).json({ message: "auth error, user does not exist" });
+      } else if (await bcrypt.compare(password, user.password) === false) {
+        res.status(401).json({ message: "auth error, password incorrect" });
       } else {
-        const token = await TokenGenerator.jsonwebtoken(user.id)
+        const token = TokenGenerator.jsonwebtoken(user.id)
         res.status(201).json({ token: token, message: "OK" });
       }
     });
   }
 };
 
+
 module.exports = SessionsController;

api/controllers/users.js

@@ -5,9 +5,13 @@ const UsersController = {
     const user = new User(req.body);
     user.save((err) => {
       if (err) {
-        res.status(400).json({message: 'Bad request'})
+        if (err.code === 11000) {
+          res.status(409).json({ message: "Email already exists. Please choose a different email." });
+        } else {
+          res.status(400).json({ message: "Bad request" });
+        }
       } else {
-        res.status(201).json({ message: 'OK' });
+        res.status(201).json({ message: "OK" });
       }
     });
   },

api/models/comment.js

@@ -0,0 +1,12 @@
+const mongoose = require("mongoose");
+const { Schema } = mongoose;
+
+const CommentSchema = new Schema({
+  message: String,
+  time: Date,
+  user: { type: Schema.Types.ObjectId, ref: "User" },
+});
+
+const Comment = mongoose.model("Comment", CommentSchema);
+
+module.exports = Comment;

api/models/post.js

@@ -1,9 +1,15 @@
 const mongoose = require("mongoose");
+const { Schema } = mongoose;
 
-const PostSchema = new mongoose.Schema({
-  message: String
+const PostSchema = new Schema({
+  user: { type: Schema.Types.ObjectId, ref: "User" },
+  message: String,
+  imageUrl: String,
+  time: Date,
+  likes: { type: [String], default: [] },
+  comments: [{ type: Schema.Types.ObjectId, ref: "Comment", default: [] }],
 });
 
-const Post = mongoose.model("Post", PostSchema);
+const Post = mongoose.model("Post", PostSchema)
 
 module.exports = Post;

api/models/user.js

@@ -1,8 +1,19 @@
 const mongoose = require("mongoose");
+const { Schema } = mongoose;
+const bcrypt = require('bcrypt');
 
-const UserSchema = new mongoose.Schema({
-  email: { type: String, required: true },
+const UserSchema = new Schema({
+  name: { type: String, required: true, default: "Name" },
+  email: { type: String, required: true, unique: true },
   password: { type: String, required: true },
+  avatar: { type: String, default: '/default_avatar.png'}
+});
+
+UserSchema.pre('save', async function (next) {
+  const salt = await bcrypt.genSalt(10);
+  const hashedPassword = await bcrypt.hash(this.password, salt);
+  this.password = hashedPassword;
+  next();
 });
 
 const User = mongoose.model("User", UserSchema);