Fixes

.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Launch Program",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/api/controllers/posts.js"
+        }
+    ]
+}

api/app.js

@@ -1,36 +1,38 @@
-const createError = require("http-errors");
-const express = require("express");
-const path = require("path");
-const logger = require("morgan");
-const JWT = require("jsonwebtoken");
+const createError = require('http-errors');
+const express = require('express');
+const path = require('path');
+const logger = require('morgan');
+const JWT = require('jsonwebtoken');
 
-const postsRouter = require("./routes/posts");
-const tokensRouter = require("./routes/tokens");
-const usersRouter = require("./routes/users");
+const commentsRouter = require('./routes/comments');
+const postsRouter = require('./routes/posts');
+const tokensRouter = require('./routes/tokens');
+const usersRouter = require('./routes/users');
+const friendsRouter = require('./routes/friends');
+const likesRouter = require('./routes/likes');
 
 const app = express();
 
 // setup for receiving JSON
-app.use(express.json())
+app.use(express.json());
 
-app.use(logger("dev"));
+app.use(logger('dev'));
 app.use(express.json());
-app.use(express.static(path.join(__dirname, "public")));
+app.use(express.static(path.join(__dirname, 'public')));
 
 // middleware function to check for valid tokens
 const tokenChecker = (req, res, next) => {
-
   let token;
-  const authHeader = req.get("Authorization")
+  const authHeader = req.get('Authorization');
 
-  if(authHeader) {
-    token = authHeader.slice(7)
+  if (authHeader) {
+    token = authHeader.slice(7); // Remove 'bearer' and return the actual token
   }
 
   JWT.verify(token, process.env.JWT_SECRET, (err, payload) => {
-    if(err) {
-      console.log(err)
-      res.status(401).json({message: "auth error"});
+    if (err) {
+      console.log(err);
+      res.status(401).json({ message: 'auth error' });
     } else {
       req.user_id = payload.user_id;
       next();
@@ -39,9 +41,12 @@ const tokenChecker = (req, res, next) => {
 };
 
 // route setup
-app.use("/posts", tokenChecker, postsRouter);
-app.use("/tokens", tokensRouter);
-app.use("/users", usersRouter);
+app.use('/friends', tokenChecker, friendsRouter);
+app.use('/comments', tokenChecker, commentsRouter);
+app.use('/posts', tokenChecker, postsRouter);
+app.use('/tokens', tokensRouter);
+app.use('/users', usersRouter);
+app.use('/likes', tokenChecker, likesRouter);
 
 // catch 404 and forward to error handler
 app.use((req, res, next) => {
@@ -52,10 +57,10 @@ app.use((req, res, next) => {
 app.use((err, req, res) => {
   // set locals, only providing error in development
   res.locals.message = err.message;
-  res.locals.error = req.app.get("env") === "development" ? err : {};
+  res.locals.error = req.app.get('env') === 'development' ? err : {};
 
   // respond with details of the error
-  res.status(err.status || 500).json({message: 'server error'})
+  res.status(err.status || 500).json({ message: 'server error' });
 });
 
 module.exports = app;

api/controllers/comments.js

@@ -0,0 +1,23 @@
+const Post = require('../models/post');
+const TokenGenerator = require('../models/token_generator');
+
+const CommentsController = {
+  AddComment: (req, res) => {
+    Post.findByIdAndUpdate(
+      req.body.id,
+      { $push: { comments: { text: req.body.message } } },
+      { new: true },
+      async function (err, docs) {
+        if (err) {
+          console.log(err);
+        } else {
+          console.log('Updated Post : ', docs);
+        }
+        const token = await TokenGenerator.jsonwebtoken(req.user_id);
+        res.status(201).json({ message: 'OK', token: token });
+      }
+    );
+  },
+};
+
+module.exports = CommentsController;

api/controllers/friends.js

@@ -0,0 +1,43 @@
+const TokenGenerator = require('../models/token_generator');
+const User = require('../models/user');
+
+const FriendsController = {
+  // Form friend connection
+  AddFriend: async (req, res) => {
+    let user = await User.findById(req.user_id)
+    let friendName = req.body.friend.split(' ')
+
+    let potentialFriend = await User.findOne({firstName: friendName[0], lastName: friendName[1]});
+
+    const token = await TokenGenerator.jsonwebtoken(req.user_id);
+
+    if (!potentialFriend) {
+      res.status(201).json({ message: 'Friend not found', token: token });
+    }
+
+    else if (user.friends.includes(potentialFriend._id)) {
+      res.status(201).json({ message: 'They are already friended', token: token });
+    }
+
+    else if (potentialFriend._id.toString() === req.user_id.toString()) {
+      res.status(201).json({ message: 'You cannot add yourself', token: token });
+    }
+
+    else {
+      user.friends.push(potentialFriend._id);
+      user.save();
+      res.status(201).json({ message: 'OK', token: token });
+    }
+  },
+
+  GetFriends: async (req, res) => {
+    let user = await User.findById(req.user_id).populate('friends')
+    let friends = await user.friends;
+    console.log('There are the friends', friends)
+    const token = await TokenGenerator.jsonwebtoken(req.user_id);
+    res.status(200).json({ friends: friends, token: token });
+  }
+}
+
+
+module.exports = FriendsController;

api/controllers/likes.js

@@ -0,0 +1,47 @@
+const Post = require('../models/post');
+const TokenGenerator = require('../models/token_generator');
+
+const LikesController = {
+  // return all posts
+  // Index: (req, res) => {
+  //   Post.find(async (err, posts) => {
+  //     if (err) {
+  //       throw err;
+  //     }
+  //     const token = await TokenGenerator.jsonwebtoken(req.user_id);
+  //     res.status(200).json({ posts: posts, token: token });
+  //   });
+  // },
+  // create new post
+  // Create: (req, res) => {
+  //   const post = new Post(req.body);
+  //   post.poster = req.user_id; // Experimental
+  //   post.save(async (err) => {
+  //     if (err) {
+  //       throw err;
+  //     }
+
+  //     const token = await TokenGenerator.jsonwebtoken(req.user_id);
+  //     res.status(201).json({ message: 'OK', token: token });
+  //   });
+  // },
+
+  Like: (req, res) => {
+    Post.findByIdAndUpdate(
+      req.body.id,
+      { $push: { likes: { userObj: req.body.userId } } },
+      { new: true },
+      async function (err, docs) {
+        if (err) {
+          console.log(err);
+        } else {
+          console.log('Updated Post : ', docs);
+        }
+        const token = await TokenGenerator.jsonwebtoken(req.user_id);
+        res.status(201).json({ message: 'OK', token: token });
+      }
+    );
+  },
+};
+
+module.exports = LikesController;

api/controllers/posts.js

@@ -1,27 +1,34 @@
-const Post = require("../models/post");
-const TokenGenerator = require("../models/token_generator");
+const Post = require('../models/post');
+const TokenGenerator = require('../models/token_generator');
 
 const PostsController = {
+  // return all posts
   Index: (req, res) => {
     Post.find(async (err, posts) => {
       if (err) {
         throw err;
       }
-      const token = await TokenGenerator.jsonwebtoken(req.user_id)
+      const token = await TokenGenerator.jsonwebtoken(req.user_id);
       res.status(200).json({ posts: posts, token: token });
     });
   },
+  // create new post
   Create: (req, res) => {
     const post = new Post(req.body);
+    post.poster = req.user_id; // Experimental
     post.save(async (err) => {
       if (err) {
         throw err;
       }
 
-      const token = await TokenGenerator.jsonwebtoken(req.user_id)
+      const token = await TokenGenerator.jsonwebtoken(req.user_id);
       res.status(201).json({ message: 'OK', token: token });
     });
   },
+
+  // Define a comment (linked to post_id, username or user_id and req.body.comment)
+  // save comment
+  // the fetch post reqest req.body.comment assumes that the comment is packaged as object
 };
 
 module.exports = PostsController;

api/controllers/users.js

@@ -3,6 +3,7 @@ const User = require("../models/user");
 const UsersController = {
   Create: (req, res) => {
     const user = new User(req.body);
+    console.log(req.body)
     user.save((err) => {
       if (err) {
         res.status(400).json({message: 'Bad request'})

api/models/comment.js

@@ -0,0 +1,19 @@
+// this is not in use please see posts
+
+const mongoose = require('mongoose');
+// Some tutorial videos require 'express',
+// commented out as this isn't used in 'post' and 'user'
+// const express = require("express-session")
+
+const CommentSchema = new mongoose.Schema({
+  commentText: { type: String, required: true },
+  username: { type: String },
+  // Post commented out for now to keep things simple
+  // post: { type: mongoose.Schema.Types.ObjectId, ref: 'Post' },
+  // user: { type: mongoose.Schema.Types.ObjectId, ref: 'User' },
+  // post_created: { type: Date, default: Date.now }
+});
+
+const Comment = mongoose.model('Comment', CommentSchema);
+
+module.exports = Comment;

api/models/image.js

@@ -0,0 +1,28 @@
+// const express = require('express')
+// const multer  = require('multer')
+// //importing mongoose schema file
+// const Image = require("./image");
+// const app = express()
+// //setting options for multer
+// const storage = multer.memoryStorage();
+// const image = multer({ storage: storage });
+
+
+// const mongoose = require("mongoose");
+
+// const ImageSchema = new mongoose.Schema({
+//   fileName: {
+//     type: String,
+//     required: true,
+//   },
+//   file: {
+//     data: Buffer,
+//     contentType: String,
+//   },
+//   uploadTime: {
+//     type: Date,
+//     default: Date.now,
+//   },
+// });
+
+// module.exports = Image = mongoose.model("image", ImageSchema);