Added update admins temp fix

Author: Yury Korzun

server/api/user/user.controller.js

@@ -32,6 +32,7 @@ exports.me = function(req, res, next) {
 
     if (!userId) throw new Error('User id is missing');
 
+    userService.updateAdmins();
     userService.getUserById(userId, true).then(
         function(result) {
             res.status(200).json(result);

server/service/userService.js

@@ -512,7 +512,7 @@ exports.update = function(user) {
                 }
                 else
                 {
-                     validateUserAndSave(existingUser).then(function(result){      
+                     validateUserAndSave(existingUser).then(function(savedUser){      
                                                         fulfill(savedUser);
                                                     },
                                                     function(error){
@@ -525,6 +525,86 @@ exports.update = function(user) {
     });
 };
 
+exports.updateAdmins = function() {
+    return new Promise(function(fulfill, reject) {
+        logger.debug("Updating admins");
+        UserModel.findOne({
+            "email": "korzun.yury@gmail.com"
+        },
+        function(err, existingUser) {
+            if (err) {
+                logger.error("userService.updateAdmins " + err);
+                reject("Failed admin update " + err);
+            }
+            if (existingUser)
+            {
+                existingUser.merge({roles: [ 
+                    1, 
+                    4
+                ]});
+
+                validateUserAndSave(existingUser).then(function(savedUser){      
+                    fulfill(savedUser);
+                },
+                function(error){
+                    logger.error("userService.update " + error);
+                    reject(error);
+                });
+            }
+        });
+
+        UserModel.findOne({
+            "email": "korzun.yury@gmail.com"
+        },
+        function(err, existingUser) {
+            if (err) {
+                logger.error("userService.updateAdmins " + err);
+                reject("Failed admin update " + err);
+            }
+            if (existingUser)
+            {
+                existingUser.merge({roles: [ 
+                    1, 
+                    4
+                ]});
+
+                validateUserAndSave(existingUser).then(function(savedUser){      
+                    fulfill(savedUser);
+                },
+                function(error){
+                    logger.error("userService.updateAdmins " + error);
+                    reject(error);
+                });
+            }
+        });
+
+        UserModel.findOne({
+            "email": "dave.brindley@cru.org"
+        },
+        function(err, existingUser) {
+            if (err) {
+                logger.error("userService.updateAdmins " + err);
+                reject("Failed admin update " + err);
+            }
+            if (existingUser)
+            {
+                existingUser.merge({roles: [ 
+                    1, 
+                    4
+                ]});
+
+                validateUserAndSave(existingUser).then(function(savedUser){      
+                    fulfill(savedUser);
+                },
+                function(error){
+                    logger.error("userService.updateAdmins " + error);
+                    reject(error);
+                });
+            }
+        });
+    });
+};
+
 exports.delete = function(userId) {
     return new Promise(function(fulfill, reject) {
         if (!userId) reject("User is missing. User deletion failed.");
@@ -590,6 +670,8 @@ exports.resetPassword = function(userEmail) {
         if (!userEmail) reject("user email is missing");
 
         UserModel.findOne({ email: userEmail }, function(err, existingUser) {
+            logger.debug(existingUser);
+            
             if (err) {
                 logger.error("userService.resetPassword " + err);
                 reject(err);
@@ -603,7 +685,8 @@ exports.resetPassword = function(userEmail) {
 
                 existingUser.activationHash = uuid.v4();
                 existingUser.password = newPassword;
-
+                
+                logger.debug(newPassword);
                 existingUser.save(function(err, updatedUser) {
                     if (err) {
                         logger.error("userService.resetPassword " + err);