Validation

.gitignore

@@ -35,6 +35,8 @@ build/Release
 # Dependency directories
 node_modules/
 jspm_packages/
+.idea/
+.DS_Store
 
 # TypeScript v1 declaration files
 typings/

README.md

@@ -1,4 +1,4 @@
-# Acebook
+# Acebook test
 
 In this project, you are tasked with working on an existing application. A significant part of the challenge will be to familiarise yourself with the codebase you've inherited, as you work to **improve and extend** it.
 

api/app.js

@@ -17,6 +17,11 @@ app.use(logger("dev"));
 app.use(express.json());
 app.use(express.static(path.join(__dirname, "public")));
 
+// avatars is the URL path to access the avatars folder
+//display the images in the avatars folder
+app.use('/avatars', express.static(path.join(__dirname, 'avatars')));
+
+
 // middleware function to check for valid tokens
 const tokenChecker = (req, res, next) => {
 
@@ -43,6 +48,7 @@ app.use("/posts", tokenChecker, postsRouter);
 app.use("/tokens", tokensRouter);
 app.use("/users", usersRouter);
 
+
 // catch 404 and forward to error handler
 app.use((req, res, next) => {
   next(createError(404));

api/controllers/posts.js

@@ -1,27 +1,66 @@
 const Post = require("../models/post");
 const TokenGenerator = require("../models/token_generator");
+const JWT = require("jsonwebtoken");
 
 const PostsController = {
   Index: (req, res) => {
-    Post.find(async (err, posts) => {
+    Post.find()
+      .populate("authorUserID")
+      .exec(async (err, posts) => {
+        if (err) {
+          throw err;
+        }
+
+        const token = await TokenGenerator.jsonwebtoken(req.user_id);
+        res.status(200).json({ posts: posts, token: token });
+      });
+  },
+
+  Create: (req, res) => {
+    if (!req.user_id) {
+      return res.status(401).json({ message: "Auth error" });
+    }
+    const post = new Post({ ...req.body, authorUserID: req.user_id });
+    post.save(async (err) => {
       if (err) {
         throw err;
       }
-      const token = await TokenGenerator.jsonwebtoken(req.user_id)
-      res.status(200).json({ posts: posts, token: token });
+      const token = await 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) => {
+  AddLikes: (req, res) => {
+    Post.findById(req.body.article_id, (err, post) => {
       if (err) {
+        console.log('could not find post')
         throw err;
       }
+      post.likes.push(req.body.username);
 
-      const token = await TokenGenerator.jsonwebtoken(req.user_id)
-      res.status(201).json({ message: 'OK', token: token });
+      post.save(async (err, post) => {
+        if (err) {
+          console.log('could not save the updated post with a new like')
+          throw err;
+        }
+        const token = await TokenGenerator.jsonwebtoken(req.user_id);
+        res.status(201).json({ message: "OK", post: post, token: token });
+      });
     });
   },
+
+  Update: async (req, res) => {
+    try {
+      const post_id = req.params.id;
+      console.log(post_id)
+      const update = req.body;
+      const updatedPost = await Post.findOneAndUpdate({ _id: post_id }, update, { new: true });
+      const token = await TokenGenerator.jsonwebtoken(req.user_id);
+      res.json({token})
+      // res.json({mssg: "You have updated this post!", token: token, updatedPost: updatedPost})
+    } catch (err) {
+      res.status(500).json({error: "messed up again!"})
+    }
+  },
 };
 
 module.exports = PostsController;

api/controllers/tokens.js

@@ -4,10 +4,11 @@ const TokenGenerator = require("../models/token_generator")
 const SessionsController = {
 
   Create: (req, res) => {
-    const email = req.body.email;
+    // const email = req.body.email;
+    const username = req.body.username;
     const password = req.body.password;
 
-    User.findOne({ email: email }).then(async (user) => {
+    User.findOne({ username: username }).then(async (user) => {
       if (!user) {
         console.log("auth error: user not found")
         res.status(401).json({ message: "auth error" });

api/controllers/users.js

@@ -1,13 +1,76 @@
 const User = require("../models/user");
+const { validateEmail, validatePassword } = require("../helpers/validation");
+const multer = require("multer");
+
+// Configure multer storage
+//multer disk storage is used to configure the destination directory and the filename of the uploaded file
+const storage = multer.diskStorage({
+  destination: (req, file, cb) => {
+    // Specify the destination directory to save the uploaded avatar images
+    cb(null, "avatars");
+  },
+  filename: (req, file, cb) => {
+    // Generate a unique filename for the uploaded file
+    //
+    const uniqueSuffix = Date.now() + "-" + Math.round(Math.random() * 1e9);
+    const fileExtension = file.originalname.split(".").pop();
+    cb(null, "avatar-" + uniqueSuffix + "." + fileExtension);
+  },
+});
+
+// Create multer upload instance
+const upload = multer({ storage: storage });
 
 const UsersController = {
   Create: (req, res) => {
-    const user = new User(req.body);
-    user.save((err) => {
-      if (err) {
-        res.status(400).json({message: 'Bad request'})
+    upload.single("avatar")(req, res, (err) => {
+      if (err instanceof multer.MulterError) {
+        res.status(500).json({
+          message: "Error uploading avatar image",
+        });
+      } else if (err) {
+        res.status(500).json({
+          message: "Error processing request",
+        });
       } else {
-        res.status(201).json({ message: 'OK' });
+        const user = new User(req.body);
+        if (!validateEmail(user.email)) {
+          res.status(400).json({
+            message: "Invalid email address!",
+          });
+        } else if (!validatePassword(user.password)) {
+          res.status(400).json({
+            message: "Invalid password!",
+          });
+        } else {
+          User.findOne({ email: user.email }).then((check) => {
+            if (check) {
+              res.status(400).json({
+                message: "This Email is already in use!",
+              });
+            } else {
+              if (req.file) {
+                console.log("FILEEE", req.file);
+                // req.protocol returns the protocol used (http), so we can use it to construct the full URL
+                // req.file.filename contains the filename generated by multer
+                //req.get("host") returns the host name of the server eg. localhost:3000
+                user.avatar = `${req.protocol}://${req.get("host")}/avatars/${
+                  // req.file.filename contains the filename generated by multer
+                  req.file.filename
+                }`;
+              }
+              //savedUser is the user that was saved in the database
+              user.save((err, savedUser) => {
+
+                if (err) {
+                  res.status(400).json({ message: "Bad request" });
+                } else {
+                  res.status(201).json({ message: "OK" });
+                }
+              });
+            }
+          });
+        }
       }
     });
   },

api/helpers/validation.js

@@ -0,0 +1,9 @@
+exports.validateEmail = (email) => {
+  //regex to validate email
+  return String(email).toLocaleLowerCase()
+  .match(/^([a-z\d\.-]+)@([a-z\d-]+)\.([a-z]{2,12})(\.[a-z]{1,12})?$/)
+}
+exports.validatePassword = (password) => {
+  return String(password)
+  .match(/^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z]).{8,20}$/)
+}

api/models/post.js

@@ -1,8 +1,22 @@
 const mongoose = require("mongoose");
+//const { ObjectId } = require ("mongoose")
 
 const PostSchema = new mongoose.Schema({
-  message: String
-});
+  message: String, 
+  comments: [],   // AddComments: Added comments (empty array) to schema 
+  authorUserID: {
+    type: mongoose.Schema.Types.ObjectId,
+    required: true,
+    ref: "User"
+  },
+  likes: [{
+    type: String,
+    default: []
+  }],
+  }, {
+    timestamps: true
+  }
+);
 
 const Post = mongoose.model("Post", PostSchema);
 

api/models/token_generator.js

@@ -8,7 +8,8 @@ class TokenGenerator {
       iat: Math.floor(Date.now() / 1000),
 
       // Set the JWT token to expire in 10 minutes
-      exp: Math.floor(Date.now() / 1000) + (10 * 60)
+      // exp: Math.floor(Date.now() / 1000) + (10 * 60) // REAL LINE
+      exp: Math.floor(Date.now() / 1000) + (100 * 60) // EXTENDED TOKEN LINE
     }, secret);
   }
 }

api/models/user.js

@@ -2,7 +2,9 @@ const mongoose = require("mongoose");
 
 const UserSchema = new mongoose.Schema({
   email: { type: String, required: true },
+  username: { type: String, required: true },
   password: { type: String, required: true },
+  avatar: { type: String },
 });
 
 const User = mongoose.model("User", UserSchema);