Merge branch 'master' of https://github.com/CECS-478-AuRave/SecureChat into androidDeploy

Author: torch2424

Assets/Logo/shush144.png

@@ -164,8 +164,11 @@ module.exports.acceptFriend = function(req, res) {
 // Controller for deleting a friend.
 module.exports.deleteFriend = function(req, res) {
     if (req.user) {
+        // Get the Current user.
         var thisUser = req.user;
+        // get the other user's facebook from the body.
         var otherUserID = req.body.otherUserID;
+        // find the friend from the current users list of friends.
         var otherIdIndex = thisUser.friends.indexOf(otherUserID);
         var thisFacebookId = thisUser.facebook.id;
         if (!otherUserID) {
@@ -176,24 +179,30 @@ module.exports.deleteFriend = function(req, res) {
             res.status(400).json({'error': 'That user is not your friend.'});
             return;
         }
+        // Remove the friend from the current user's friend list.
         thisUser.friends.splice(otherIdIndex, 1);
+        // save the current user to the database.
         thisUser.save(function(err, thisUser) {
             if (err) {
                 res.status(500).json(err);
             }
         });
+        // Find the other user based on the facebook id provided.
         User.findOne({'facebook.id':otherUserID}, function(err, otherUser) {
             if (!otherUser) {
                 res.status(404).json({'error':'Other User was not found.'});
             } else if (err) {
                 res.status(500).json(err);
             } else {
+                // check if the other user is a friend of the current user.
                 var thisIdIndex = otherUser.friends.indexOf(thisFacebookId);
                 if (thisIdIndex == -1) {
                     res.status(400).json({'error': 'That user is not your friend.'});
                     return;
                 }
+                // Remove the current user from the other user's friends list.
                 otherUser.friends.splice(thisIdIndex, 1);
+                // Save the other user to the database.
                 otherUser.save(function(err, otherUser) {
                     if (err) {
                         res.status(500).json(err);

Assets/Logo/shush192.png

@@ -76,29 +76,68 @@ module.exports.findUserById = function(req, res) {
 
 module.exports.getFriend = function(req, res) {
     if (req.user) {
-        if (req.user.friends.length <= 0) {
-            res.status(404).json({'error' : 'No friends found for user'});
-        }
-        var friends = [];
-        var count = 0;
-        // for each friend for the given user add it to the friends array
-        // if the friend was found.
-        req.user.friends.forEach(function(friendId) {
-            User.findOne({'facebook.id' : friendId}, function(err, friend) {
-                if (err) {
-                    // error finding friend.
-                    res.status(500).json(err);
-                } else if (friend) {
-                    count++; // keep track of the number of friends found.
-                    friends.push(friend);
-                }
-            }).then(function() {
-                // respond with the friends array after the loop has finished running.
-                if (count === req.user.friends.length) {
-                    res.status(200).json(friends);
-                }
+        // Create a new promise to find all friends.
+        var findFriend = new Promise((resolve, reject) => {
+            var friends = [];
+            if (req.user.friends.length === 0) {
+                // return empty list since no friends :(|
+                resolve(friends);
+            }
+            req.user.friends.forEach((friendId) => {
+                // Find friends and add them to the list.
+                User.findOne({'facebook.id' : friendId})
+                .select('name profilePhotoURL _id facebook.id')
+                .exec(function(err, friend) {
+                    if (err) {
+                        // error finding friend.
+                        res.status(500).json(err);
+                        reject("Error");
+                    } else if (friend) {
+                        // add friend to list.
+                        friends.push(friend);
+                        if (friends.length === req.user.friends.length) {
+                            // return the list of friends.
+                            resolve(friends);
+                        }
+                    }
+                });
+            });
+        });
+        // Create a new promise to find pending friends.
+        var findPending = new Promise((resolve, reject) => {
+            var friends = [];
+            if (req.user.pendingFriends.length === 0) {
+                // return empty list since no pending friends :(|
+                resolve(friends);
+            }
+            req.user.pendingFriends.forEach((friendId) => {
+                // Find pending friends add them to the list.
+                User.findOne({'facebook.id' : friendId})
+                .select('name profilePhotoURL id facebook.id')
+                .exec(function(err, friend) {
+                    if (err) {
+                        // error finding friend.
+                        res.status(500).json(err);
+                        reject("Error");
+                    } else if (friend) {
+                        // add pending friend to list.
+                        friends.push(friend);
+                        if (friends.length === req.user.pendingFriends.length) {
+                            // return the list of pending friends.
+                            resolve(friends);
+                        }
+                    }
+                });
             });
         });
+        // Run all promises first then respond with the data.
+        Promise.all([findFriend, findPending]).then((data) => {
+            res.status(200).json({
+                'friends' : data[0],
+                'pendingFriends' : data[1]
+            });
+        });
+
     } else {
         // Respond with Unauthorized access.
         res.status(401).json({'error': 'Access Not Authorized.'});

Assets/Logo/shush48.png

@@ -2,6 +2,7 @@
 var mongoose = require('mongoose'),
     Schema = mongoose.Schema;
 
+// Schema for conversation.
 var conversationSchema = new Schema({
     conversationID: {type: String, required: true},
     members: [{type: Schema.ObjectId, ref: 'User'}],

Assets/Logo/shush512.png

@@ -3,6 +3,7 @@
 var mongoose = require('mongoose'),
     Schema = mongoose.Schema;
 
+// Schema for messages.
 var messageSchema = new Schema({
     message: {type: String, required: true},
     from: {type: Schema.ObjectId, ref: 'User', required: true},