From dce06ea5e980e3a133d4e4ab1532d5811b72914b Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Sat, 17 Aug 2019 21:41:22 +0200
Subject: [PATCH] .

---
 core/passport.js                |  1 +
 middlewares/accessValidator.js  |  2 +-
 modules/auth/auth.controller.js | 16 ++++++++++------
 modules/auth/auth.routes.js     |  2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/core/passport.js b/core/passport.js
index 8b5a835..5faf9aa 100644
--- a/core/passport.js
+++ b/core/passport.js
@@ -114,6 +114,7 @@ passport.use('jwt', new CustomStrategy(async (req, done) => {
         if (user) {
             user = user.toJSON();
             delete user.password;
+            console.log('Usuario encontrado', user);
             return done(null, user, { message: 'Logged in Successfully' });
         }
         else {
diff --git a/middlewares/accessValidator.js b/middlewares/accessValidator.js
index 07f5039..4e95037 100644
--- a/middlewares/accessValidator.js
+++ b/middlewares/accessValidator.js
@@ -13,7 +13,7 @@ const isAdministratorUser = compose([isLoggedUser,
         if (user.level >= 8) {
             next();
         } else {
-            return res.status(httpStatus.UNAUTHORIZED).send('Unauthorized');
+            return res.status(httpStatus.UNAUTHORIZED).send('Unauthorized. User is not administrator.');
         }
     }
 ]);
diff --git a/modules/auth/auth.controller.js b/modules/auth/auth.controller.js
index 57cf3fc..98f4c89 100644
--- a/modules/auth/auth.controller.js
+++ b/modules/auth/auth.controller.js
@@ -23,18 +23,22 @@ async function login(req, res, next) {
     try {
         const data = {
             id: req.user.id,
-            email: req.user.email
+            email: req.user.email,
+            phone: req.user.phoneNumber,
+            fbuid: req.user.uid
         };
 
         const tokens = securityHelper.generateToken(data);
 
-        res.status(httpStatus.OK).json({
+        const response = {
             token: tokens.token,
             refreshToken: tokens.refreshToken,
-            user: data,
-        });        
+            user: req.user,
+        };
+
+        return controllerHelper.handleResultResponse(response, null, req.params, res, httpStatus.OK);      
     } catch (error) {
-        controllerHelper.handleErrorResponse(MODULE_NAME, login.name, error, res)
+        return controllerHelper.handleErrorResponse(MODULE_NAME, login.name, error, res)
     }
 }
 
@@ -46,7 +50,7 @@ async function login2(req, res, next) {
 //            user: data,
         })
     } catch (error) {
-        controllerHelper.handleErrorResponse(MODULE_NAME, login.name, error, res)
+        return controllerHelper.handleErrorResponse(MODULE_NAME, login.name, error, res)
     }
 }
 
diff --git a/modules/auth/auth.routes.js b/modules/auth/auth.routes.js
index a5fecc0..7a1350f 100644
--- a/modules/auth/auth.routes.js
+++ b/modules/auth/auth.routes.js
@@ -25,7 +25,7 @@ routes.get('/auth',
 );
 
 routes.get('/auth/verify',
-    AccessValidator.isRegisteredUserEmail,
+    AccessValidator.isAdministratorUser,
 );
 
 // Registro de usuario a partir del usuario de Firebase y