- aggiornamento refreshtoken (parte 1)

- PCB: fix listino

src/server/router/users_router.js

@@ -298,8 +298,11 @@ router.post('/', async (req, res) => {
 
         await telegrambot.askConfirmationUser(myuser.idapp, shared_consts.CallFunz.REGISTRATION, myuser);
 
-        const token = await myuser.generateAuthToken(req);
-        res.header('x-auth', token).send(myuser);
+        const { token, refreshToken } = await myuser.generateAuthToken(req);
+        res
+          .header('x-auth', token)
+          .header('x-refrTok', refreshToken)
+          .send(myuser);
         return true;
       }
     }
@@ -333,7 +336,7 @@ router.post('/', async (req, res) => {
           return 0;
         }
       }).
-      then(async (token) => {
+      then(async (ris) => {
         // tools.mylog("passo il TOKEN: ", token);
 
         if (recextra) {
@@ -343,9 +346,9 @@ router.post('/', async (req, res) => {
 
           // await User.fixUsername(user.idapp, user.ind_order, user.username);
         }
-        return token;
+        return ris;
       }).
-      then(async (token) => {
+      then(async (ris) => {
 
         // tools.mylog("LINKREG = " + user.linkreg);
         // Invia un'email all'utente
@@ -358,7 +361,10 @@ router.post('/', async (req, res) => {
         await sendemail.sendEmail_Registration(user.lang, user.email, user,
           user.idapp, user.linkreg);
         // }
-        res.header('x-auth', token).send(user);
+        res
+          .header('x-auth', ris.token)
+          .header('x-refrTok', ris.refreshToken)
+          .send(user);
         return true;
       });
   }).catch((e) => {
@@ -605,6 +611,33 @@ router.post('/notifs', authenticate, async (req, res) => {
 
 });
 
+router.post('/newtok', async (req, res) => {
+
+  try {
+    const refreshToken = req.body.refreshToken;
+
+    // Ottieni l'utente in base al refreshtoken
+    const recFound = await User.findOne({ 'tokens.refreshToken': refreshToken });
+
+    if (recFound) {
+      return recFound.generateAuthToken(req)
+        .then((ris) => {
+          return res.status(200).send({
+            usertosend,
+            token: ris.token,
+            refreshToken: ris.refreshToken
+          });
+        })
+    }
+
+  } catch (e) {
+    console.error('Err', e);
+  }
+
+  res.status(404).send({ code: server_constants.RIS_CODE_LOGIN_ERR });
+
+});
+
 router.post('/login', (req, res) => {
   var body = _.pick(req.body,
     ['username', 'password', 'idapp', 'keyappid', 'lang']);
@@ -640,7 +673,7 @@ router.post('/login', (req, res) => {
     then(user => {
       // console.log('Lgn-Ok');
       if (user) {
-        return user.generateAuthToken(req).then((token) => {
+        return user.generateAuthToken(req).then((ris) => {
           var usertosend = new User();
 
           shared_consts.fieldsUserToChange().forEach((field) => {
@@ -655,7 +688,7 @@ router.post('/login', (req, res) => {
           // tools.mylog("user.verified_email:" + user.verified_email);
           // tools.mylog("usertosend.userId", usertosend.userId);
 
-          return { usertosend, token };
+          return { usertosend, token: ris.token, refreshToken: ris.refreshToken };
 
         }).then((myris) => {
           const access = 'auth';
@@ -671,6 +704,7 @@ router.post('/login', (req, res) => {
               return {
                 usertosend: myris.usertosend,
                 token: myris.token,
+                refreshToken: myris.refreshToken,
                 subsExistonDb,
               };
             }).
@@ -678,6 +712,7 @@ router.post('/login', (req, res) => {
               return {
                 usertosend: myris.usertosend,
                 token: myris.token,
+                refreshToken: myris.refreshToken,
                 subsExistonDb: false,
               };
             });
@@ -685,11 +720,14 @@ router.post('/login', (req, res) => {
           // console.log('res', myris.token, myris.usertosend);
 
           // SEND TOKEN AND CODE RESULT
-          return res.header('x-auth', myris.token).send({
-            usertosend: myris.usertosend,
-            code: server_constants.RIS_CODE_OK,
-            subsExistonDb: myris.subsExistonDb,
-          });
+          return res
+            .header('x-auth', myris.token)
+            .header('x-refrTok', myris.refreshToken)
+            .send({
+              usertosend: myris.usertosend,
+              code: server_constants.RIS_CODE_OK,
+              subsExistonDb: myris.subsExistonDb,
+            });
 
           // tools.mylog("TROVATOOO!");