Merge remote-tracking branch 'origin/dev'

src/controllers/api/account/deleteController.js

@@ -33,17 +33,14 @@ module.exports.post = async function(req, res){
             const data = matchedData(req);
 
             //make sure we're not bullshitting ourselves here.
-            if(user == null){
+            if(user == null || user.user == null){
-                res.status(400);
+                return errorHandler(res, 'You must be logged in to delete your account!', 'unauthorized');
-                return res.send('Invalid Session! Cannot delete account while logged out!'); 
             }
 
             const userDB = await userModel.findOne({user: user.user});
 
-
             if(!userDB){
-                res.status(400);
+                return errorHandler(res, 'User not found!', 'unauthorized');
-                return res.send('Invalid User! Account must exist in order to delete!');
             }
 
             await userDB.nuke(data.pass);

src/controllers/api/account/updateController.js

@@ -46,6 +46,12 @@ module.exports.post = async function(req, res){
             const {field, change} = data;
             const {user} = req.session;
 
+            //If the user is null
+            if(user == null || user.user == null){
+                //BEFORE YOU BREAK MY HEART!!!
+                return errorHandler(res, 'You must be logged in to preform this action!', 'unauthorized');
+            }
+
             const userDB = await userModel.findOne({user: user.user});
             const update = {};
 
@@ -86,8 +92,7 @@ module.exports.post = async function(req, res){
                 res.status(200);
                 return res.send(update);
             }else{
-                res.status(400);
+                return errorHandler(res, 'User not found!', 'unauthorized');
-                return res.send({errors: [{msg:"User not found!"}]});
             }
         }else{
             res.status(400);