From c6a14eab41bd1b2a1cd69cf5d6c94b631ce42d9c Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Tue, 9 Jul 2019 15:18:25 +0200
Subject: [PATCH] .

---
 config/environments/development.js |  2 +-
 config/environments/production.js  |  2 +-
 modules/auth/auth.controller.js    | 22 ++++++++--------------
 modules/auth/user.model.js         |  2 +-
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/config/environments/development.js b/config/environments/development.js
index 2edf012..0d6ba3f 100644
--- a/config/environments/development.js
+++ b/config/environments/development.js
@@ -9,7 +9,7 @@ module.exports = {
 
     session: {
         secret_token: process.env.SECRET_TOKEN || "B57J=7B`NQ$y98|~5;hc715bo09^5oz8NR+]n9r~215B91Nd9P%25_N6r!GHcOKp|18y5-73Dr5^@9k7n]5l<-41D1o",
-        token_expires_in: '12h'
+        token_expires_in: '365d'
     },
 
     server: {
diff --git a/config/environments/production.js b/config/environments/production.js
index 00b6f74..baafc4c 100644
--- a/config/environments/production.js
+++ b/config/environments/production.js
@@ -9,7 +9,7 @@ module.exports = {
 
     session: {
         secret_token: process.env.SECRET_TOKEN || "B57J=7B`NQ$y98|~5;hc715bo09^5oz8NR+]n9r~215B91Nd9P%25_N6r!GHcOKp|18y5-73Dr5^@9k7n]5l<-41D1o",
-        token_expires_in: '12h'
+        token_expires_in: '365d'
     },
 
     server: {
diff --git a/modules/auth/auth.controller.js b/modules/auth/auth.controller.js
index f04efe4..f5fd9cb 100644
--- a/modules/auth/auth.controller.js
+++ b/modules/auth/auth.controller.js
@@ -41,7 +41,6 @@ async function login(req, res, next) {
 async function register(req, res, next) {
     function cleanAdminData(user) {
         let cUser = user;
-        delete cUser.token;
         delete cUser.lastLogin;
         delete cUser.state;
         delete cUser.createdAt;
@@ -50,35 +49,30 @@ async function register(req, res, next) {
     }
 
     try {
-        console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>regsitro');        
- 
         const values = {
             phone: req.body.phone,
             platform: req.body.fbuid
         };
         const tokens = securityHelper.generateToken(values);
-        console.log(tokens)
 
         const data = {
-            token: tokens.refreshToken,
+            refresh_token: tokens.refreshToken,
             phone: req.body.phone,
             fbuid: req.body.fbuid,
             email: req.body.email, 
             name: req.body.name,
             surname: req.body.surname,
             entityid: req.body.entityid,
-            accessibility:  req.body.accesssibility
+            accessibility: req.body.accesssibility
         };
         console.log(data);
 
-        const newUser = await authService.extraMethods.createUser(data);
-        const result = {
-            token: tokens.token,
-            refreshToken: tokens.token,
-            user: cleanAdminData(newUser.toJSON()),
-        };
-        console.log(result);
-        return controllerHelper.handleResultResponse(result, null, req.params, res, httpStatus.OK);
+        let newUser = await authService.extraMethods.createUser(data);
+        newUser = cleanAdminData(newUser.toJSON());
+        newUser.token = tokens.token;
+
+        console.log(newUser);
+        return controllerHelper.handleResultResponse(newUser, null, req.params, res, httpStatus.OK);
     } catch (error) {
         console.log(error);
         controllerHelper.handleErrorResponse(MODULE_NAME, register.name, error, res);
diff --git a/modules/auth/user.model.js b/modules/auth/user.model.js
index 899e356..c0315de 100644
--- a/modules/auth/user.model.js
+++ b/modules/auth/user.model.js
@@ -41,7 +41,7 @@ module.exports = function (sequelize, DataTypes) {
             type: DataTypes.BOOLEAN,
             defaultValue: true,
         },
-        token: {
+        refresh_token: {
             type: DataTypes.STRING(512),
         },
         state: {