++ diffusori

fixed user chip

mongodb/Diffusori.mongodb

@@ -0,0 +1,100 @@
+// MongoDB Playground
+// To disable this template go to Settings | MongoDB | Use Default Template For Playground.
+// Make sure you are connected to enable completions and to be able to run a playground.
+// Use Ctrl+Space inside a snippet or a string literal to trigger completions.
+
+// Select the database to use.
+use('test_FreePlanet');
+
+let aggregation = [
+  {
+    $match: {
+      idapp: "13",
+      $or: [
+        {
+          deleted: {
+            $exists: false,
+          },
+        },
+        {
+          deleted: {
+            $exists: true,
+            $eq: false,
+          },
+        },
+      ],
+    },
+  },
+  {
+    $group: {
+      _id: "$aportador_solidario",
+      count: {
+        $sum: 1,
+      },
+    },
+  },
+  {
+      $match: { "count": { $gte: 2 } }
+  },
+  {
+    $sort: {
+      count: -1,
+    },
+  },  
+  {
+    $lookup: {
+      from: "users",
+      let: {
+        username: "$_id",
+        idapp: "13",
+      },
+      pipeline: [
+        {
+          $match: {
+            $expr: {
+              $and: [
+                {
+                  $eq: [
+                    "$$username",
+                    "$username",
+                  ],
+                },
+                {
+                  $eq: [
+                    "$$idapp",
+                    "$idapp",
+                  ],
+                },
+              ],
+            },
+          },
+        },
+      ],
+      as: "user",
+    },
+  },
+  { $unwind: "$user" },
+  {
+    $replaceRoot: {
+      newRoot: {
+        $mergeObjects: [ "$user", "$$ROOT" ],
+      },
+    },
+  },
+  {
+    $project: {
+      _id: 0,
+      count: 1,
+      aportador_solidario: 1,
+      username: 1,
+      name: 1,
+      surname: 1,
+      lasttimeonline: 1,
+      idapp: 1,
+      "profile.img": 1,
+    },
+  },
+];
+
+db.users.aggregate(aggregation);
+

src/server/models/user.js

@@ -136,6 +136,9 @@ const UserSchema = new mongoose.Schema({
   tokenforgot: {
     type: String,
   },
+  tokenforgot_code: {
+    type: String,
+  },
   date_tokenreg: {
     type: Date,
   },
@@ -1164,6 +1167,17 @@ UserSchema.statics.findByLinkTokenforgot = function (idapp, email, tokenforgot)
   });
 };
 
+UserSchema.statics.findByLinkTokenforgotCode = function (idapp, email, tokenforgot_code) {
+  const User = this;
+
+  return User.findOne({
+    email,
+    tokenforgot_code,
+    date_tokenforgot: { $gte: tools.IncDateNow(-1000 * 60 * 60 * 4) },  // 4 ore fa!
+    idapp,
+  });
+};
+
 UserSchema.statics.createNewRequestPwd = function (idapp, email) {
   const User = this;
 
@@ -1177,9 +1191,10 @@ UserSchema.statics.createNewRequestPwd = function (idapp, email) {
       user.tokenforgot = jwt.sign(user._id.toHexString(), process.env.SIGNCODE).
         toString();
       user.date_tokenforgot = new Date();
+      user.tokenforgot_code = 100000 + Math.round(Math.random() * 899999);
       user.lasttimeonline = new Date();
       return await user.save().then(async () => {
-        await sendemail.sendEmail_RequestNewPassword(user.lang, user, user.email, user.idapp, user.tokenforgot);
+        await sendemail.sendEmail_RequestNewPassword(user.lang, user, user.email, user.idapp, user.tokenforgot, user.tokenforgot_code);
 
         return true;
       });
@@ -1202,10 +1217,12 @@ UserSchema.statics.createNewRequestPwdByUsernameAndGetLink = async function (ida
     user.tokenforgot = jwt.sign(user._id.toHexString(), process.env.SIGNCODE).
       toString();
     user.date_tokenforgot = new Date();
+    user.tokenforgot_code = 100000 + Math.round(Math.random() * 899999);
     user.lasttimeonline = new Date();
+    user.code_pwd_reset = 0;
 
     return await user.save().then(() => {
-      return tools.getlinkRequestNewPassword(idapp, user.email, user.tokenforgot);
+      return tools.getlinkRequestNewPassword(idapp, user.email, user.tokenforgot, user.tokenforgot_code);
     });
   }
 
@@ -3501,6 +3518,18 @@ UserSchema.statics.getLastOnlineUsers = async function (idapp) {
 
 };
 
+UserSchema.statics.getDiffusoriUsers = async function (idapp) {
+  const User = this;
+
+  const lastn = 10;
+
+  return await User.aggregate(User.getQueryUsersDiffusori(idapp)).then(ris => {
+    // console.table(ris);
+    return ris;
+  });
+
+};
+
 UserSchema.statics.checkUser = async function (idapp, username) {
   const User = this;
 
@@ -3580,6 +3609,7 @@ UserSchema.statics.findAllDistinctNationality = async function (idapp) {
   });
 };
 
+
 UserSchema.statics.getUsersRegDaily = function (idapp, nrec) {
 
   const query = [
@@ -3611,6 +3641,101 @@ UserSchema.statics.getUsersRegDaily = function (idapp, nrec) {
   return query;
 };
 
+UserSchema.statics.getQueryUsersDiffusori = function (idapp) {
+
+  const query = [
+    {
+      $match: {
+        idapp,
+        $or: [
+          {
+            deleted: {
+              $exists: false,
+            },
+          },
+          {
+            deleted: {
+              $exists: true,
+              $eq: false,
+            },
+          },
+        ],
+      },
+    },
+    {
+      $group: {
+        _id: "$aportador_solidario",
+        count: {
+          $sum: 1,
+        },
+      },
+    },
+    {
+        $match: { "count": { $gte: 2 } }
+    },
+    {
+      $sort: {
+        count: -1,
+      },
+    },
+    { $limit: 20 },  
+    {
+      $lookup: {
+        from: "users",
+        let: {
+          username: "$_id",
+          idapp,
+        },
+        pipeline: [
+          {
+            $match: {
+              $expr: {
+                $and: [
+                  {
+                    $eq: [
+                      "$$username",
+                      "$username",
+                    ],
+                  },
+                  {
+                    $eq: [
+                      "$$idapp",
+                      "$idapp",
+                    ],
+                  },
+                ],
+              },
+            },
+          },
+        ],
+        as: "user",
+      },
+    },
+    { $unwind: "$user" },
+    {
+      $replaceRoot: {
+        newRoot: {
+          $mergeObjects: [ "$user", "$$ROOT" ],
+        },
+      },
+    },
+      {
+      $project: {
+        _id: 0,
+        count: 1,
+        aportador_solidario: 1,
+        username: 1,
+        name: 1,
+        surname: 1,
+        lasttimeonline: 1,
+        idapp: 1,
+        "profile.img": 1,
+      },
+    },
+  ];
+  return query;
+};
+
 UserSchema.statics.getUsersRegWeekly = function (idapp, nrec) {
 
   const query = [

src/server/router/index_router.js

@@ -7,15 +7,15 @@ const telegrambot = require('../telegram/telegrambot');
 
 const sharp = require('sharp');
 
-const {authenticate, authenticate_noerror} = require(
+const { authenticate, authenticate_noerror } = require(
   '../middleware/authenticate');
 
-const {ObjectID} = require('mongodb');
+const { ObjectID } = require('mongodb');
 // const {ListaIngresso} = require('../models/listaingresso');
-const {Graduatoria} = require('../models/graduatoria');
+const { Graduatoria } = require('../models/graduatoria');
 
 const mongoose = require('mongoose').set('debug', false);
-const {CfgServer} = require('../models/cfgserver');
+const { CfgServer } = require('../models/cfgserver');
 
 // const uuidv4 = require('uuid/v4'); // I chose v4 ‒ you can select others
 
@@ -29,36 +29,36 @@ if (!fs.existsSync(folder)) {
 
 const _ = require('lodash');
 
-const {User} = require('../models/user');
-const {MyGroup} = require('../models/mygroup');
-const {Circuit} = require('../models/circuit');
-const {Booking} = require('../models/booking');
-const {Operator} = require('../models/operator');
-const {Where} = require('../models/where');
-const {MyEvent} = require('../models/myevent');
-const {Contribtype} = require('../models/contribtype');
-const {PaymentType} = require('../models/paymenttype');
-const {Discipline} = require('../models/discipline');
-const {MyElem} = require('../models/myelem');
-const {Skill} = require('../models/skill');
-const {Good} = require('../models/good');
-const {StatusSkill} = require('../models/statusSkill');
-const {Province} = require('../models/province');
-const {Sector} = require('../models/sector');
-const {SectorGood} = require('../models/sectorgood');
-const {CatGrp} = require('../models/catgrp');
+const { User } = require('../models/user');
+const { MyGroup } = require('../models/mygroup');
+const { Circuit } = require('../models/circuit');
+const { Booking } = require('../models/booking');
+const { Operator } = require('../models/operator');
+const { Where } = require('../models/where');
+const { MyEvent } = require('../models/myevent');
+const { Contribtype } = require('../models/contribtype');
+const { PaymentType } = require('../models/paymenttype');
+const { Discipline } = require('../models/discipline');
+const { MyElem } = require('../models/myelem');
+const { Skill } = require('../models/skill');
+const { Good } = require('../models/good');
+const { StatusSkill } = require('../models/statusSkill');
+const { Province } = require('../models/province');
+const { Sector } = require('../models/sector');
+const { SectorGood } = require('../models/sectorgood');
+const { CatGrp } = require('../models/catgrp');
 const Site = require('../models/site');
-const {Level} = require('../models/level');
-const {AdType} = require('../models/adtype');
-const {AdTypeGood} = require('../models/adtypegood');
-const {Newstosent} = require('../models/newstosent');
-const {MyPage} = require('../models/mypage');
-const {CalZoom} = require('../models/calzoom');
-const {Gallery} = require('../models/gallery');
-const {Settings} = require('../models/settings');
-const {SendMsg} = require('../models/sendmsg');
-const {SendNotif} = require('../models/sendnotif');
-const {Permission} = require('../models/permission');
+const { Level } = require('../models/level');
+const { AdType } = require('../models/adtype');
+const { AdTypeGood } = require('../models/adtypegood');
+const { Newstosent } = require('../models/newstosent');
+const { MyPage } = require('../models/mypage');
+const { CalZoom } = require('../models/calzoom');
+const { Gallery } = require('../models/gallery');
+const { Settings } = require('../models/settings');
+const { SendMsg } = require('../models/sendmsg');
+const { SendNotif } = require('../models/sendnotif');
+const { Permission } = require('../models/permission');
 const Producer = require('../models/producer');
 const Cart = require('../models/cart');
 const OrdersCart = require('../models/orderscart');
@@ -145,37 +145,57 @@ router.post(process.env.LINK_REQUEST_NEWPASSWORD, async (req, res) => {
   try {
     const ris = await User.createNewRequestPwd(idapp, email);
     if (ris) {
-      res.send({code: server_constants.RIS_CODE_OK, msg: ''});
+      res.send({ code: server_constants.RIS_CODE_OK, msg: '' });
     } else {
       tools.snooze(5000);
       return res.status(200).
-          send({code: server_constants.RIS_CODE_EMAIL_NOT_EXIST, msg: ''});
+        send({ code: server_constants.RIS_CODE_EMAIL_NOT_EXIST, msg: '' });
     }
   } catch (e) {
     console.log(process.env.LINK_REQUEST_NEWPASSWORD, e.message);
     res.status(400).send();
-    res.send({code: server_constants.RIS_CODE_ERR, msg: e});
+    res.send({ code: server_constants.RIS_CODE_ERR, msg: e });
   }
 
 });
 
 // Invio la Nuova Password richiesta dal reset!
 // Ritorna il token per poter effettuare le chiamate...
-router.post(process.env.LINK_UPDATE_PWD, (req, res) => {
-  const body = _.pick(req.body, ['idapp', 'email', 'tokenforgot', 'password']);
+router.post(process.env.LINK_UPDATE_PWD, async (req, res) => {
+  const body = _.pick(req.body, ['idapp', 'email', 'tokenforgot', 'tokenforgot_code', 'password']);
   const idapp = body.idapp;
   const email = body.email.toLowerCase().trim();
   const tokenforgot = body.tokenforgot;
+  const tokenforgot_code = body.tokenforgot_code;
   const password = body.password;
   const msg = 'Richiesta Nuova Password: idapp= ' + idapp + ' email = ' + email;
   console.log(msg);
 
   // telegrambot.sendMsgTelegramToTheManagers(body.idapp, msg);
 
-  User.findByLinkTokenforgot(idapp, email, tokenforgot).then((user) => {
+  let user = null;
+
+  user = await User.findByLinkTokenforgot(idapp, email, tokenforgot)
+    .then((user) => {
+      return user;
+    }).catch((e) => {
+      console.log(process.env.LINK_UPDATE_PWD, e.message);
+      res.status(400).send();
+    });
+
+  if (!user) {
+    user = await User.findByLinkTokenforgotCode(idapp, email, tokenforgot_code)
+      .then((user) => {
+        return user;
+      }).catch((e) => {
+        console.log(process.env.LINK_UPDATE_PWD, e.message);
+        res.status(400).send();
+      });
+  }
+
   if (!user) {
     return res.send(
-          {code: server_constants.RIS_CODE_TOKEN_RESETPASSWORD_NOT_FOUND});
+      { code: server_constants.RIS_CODE_TOKEN_RESETPASSWORD_NOT_FOUND });
   } else {
     // aggiorna la nuova password
     user.password = password;
@@ -184,26 +204,22 @@ router.post(process.env.LINK_UPDATE_PWD, (req, res) => {
     // Crea token
     user.generateAuthToken(req).then(token => {
       user.tokenforgot = '';  // Svuota il tokenforgot perché non ti servirà più...
+      user.tokenforgot_code = '';  // Svuota il tokenforgot perché non ti servirà più...
 
       // Salva lo User
       user.save().then(() => {
         res.header('x-auth', token).
-              send({code: server_constants.RIS_CODE_OK});   // Ritorna il token di ritorno
+          send({ code: server_constants.RIS_CODE_OK });   // Ritorna il token di ritorno
       });
     });
   }
-  }).catch((e) => {
-    console.log(process.env.LINK_UPDATE_PWD, e.message);
-    res.status(400).send();
-  });
-
 });
 
 router.post('/testServer', authenticate_noerror, async (req, res) => {
 
   try {
     const test = req.body.test;
-    let ris = {test};
+    let ris = { test };
 
     if (req.user) {
       await tools.sendNotificationToUser(req.user._id, 'Test Server',
@@ -223,7 +239,7 @@ router.get('/test1', authenticate_noerror, async (req, res) => {
 
   try {
     const test = req.query.test;
-    let ris = {test};
+    let ris = { test };
 
     if (req.user) {
       await tools.sendNotificationToUser(req.user._id, 'Test Server',
@@ -249,7 +265,7 @@ router.post('/settable', authenticate, async (req, res) => {
     delete mydata['extrarec'];
   }
 
-  const fieldsvalue = {'ALL': 1};
+  const fieldsvalue = { 'ALL': 1 };
 
   mydata.idapp = req.user.idapp;
   const idapp = mydata.idapp;
@@ -267,7 +283,7 @@ router.post('/settable', authenticate, async (req, res) => {
       !tools.ModificheConsentite(params.table, fieldsvalue)) {
       // If without permissions, exit
       return res.status(404).
-          send({code: server_constants.RIS_CODE_ERR_UNAUTHORIZED, msg: ''});
+        send({ code: server_constants.RIS_CODE_ERR_UNAUTHORIZED, msg: '' });
     }
 
     if (shared_consts.TABLES_USER_ID.includes(params.table)) {
@@ -309,7 +325,7 @@ router.post('/settable', authenticate, async (req, res) => {
           (rec) => (rec.username === req.user.username));
 
         if (indfind < 0) {
-          mydata.admins.push({username: req.user.username});
+          mydata.admins.push({ username: req.user.username });
         }
       }
     }
@@ -341,23 +357,23 @@ router.post('/settable', authenticate, async (req, res) => {
 
     if (params.table === shared_consts.TAB_MYGROUPS && isnewrec) {
       // Controlla se esiste già con lo stesso nome
-      let alreadyexist = await MyGroup.findOne({idapp, groupname: mydata.groupname});
+      let alreadyexist = await MyGroup.findOne({ idapp, groupname: mydata.groupname });
       if (alreadyexist) {
-        return res.send({code: server_constants.RIS_CODE_REC_ALREADY_EXIST_CODE});
+        return res.send({ code: server_constants.RIS_CODE_REC_ALREADY_EXIST_CODE });
       }
-      alreadyexist = await MyGroup.findOne({idapp, title: mydata.title});
+      alreadyexist = await MyGroup.findOne({ idapp, title: mydata.title });
       if (alreadyexist) {
-        return res.send({code: server_constants.RIS_CODE_REC_ALREADY_EXIST_NAME});
+        return res.send({ code: server_constants.RIS_CODE_REC_ALREADY_EXIST_NAME });
       }
     } else if (params.table === shared_consts.TAB_MYCIRCUITS && isnewrec) {
       // Controlla se esiste già con lo stesso nome
-      let alreadyexist = await Circuit.findOne({idapp, name: mydata.name});
+      let alreadyexist = await Circuit.findOne({ idapp, name: mydata.name });
       if (alreadyexist) {
-        return res.send({code: server_constants.RIS_CODE_REC_ALREADY_EXIST_CODE});
+        return res.send({ code: server_constants.RIS_CODE_REC_ALREADY_EXIST_CODE });
       }
-      alreadyexist = await Circuit.findOne({idapp, path: mydata.path});
+      alreadyexist = await Circuit.findOne({ idapp, path: mydata.path });
       if (alreadyexist) {
-        return res.send({code: server_constants.RIS_CODE_REC_ALREADY_EXIST_NAME});
+        return res.send({ code: server_constants.RIS_CODE_REC_ALREADY_EXIST_NAME });
       }
       /*alreadyexist = await Circuit.findOne({idapp, symbol: mydata.symbol});
       if (alreadyexist) {
@@ -423,7 +439,7 @@ router.post('/settable', authenticate, async (req, res) => {
         }
 
         if (setnotif) {
-            await SendNotif.createNewNotification(req, res, {groupnameDest, circuitnameDest}, params.table, myrec, typedir, typeid);
+          await SendNotif.createNewNotification(req, res, { groupnameDest, circuitnameDest }, params.table, myrec, typedir, typeid);
         }
 
         if (params.table === 'circuits') {
@@ -436,18 +452,18 @@ router.post('/settable', authenticate, async (req, res) => {
           return await User.setGroupsCmd(mydata.idapp, req.user.username,
             myrec.groupname,
             shared_consts.GROUPSCMD.SETGROUP, true, req.user.username).then((ris) => {
-              return res.send({rec: myrec, ris});
+              return res.send({ rec: myrec, ris });
             });
         } else if (params.table === shared_consts.TAB_MYCIRCUITS && isnewrec) {
           // nuovo Record:
           // aggiungi il creatore al Circuito stesso
           return await User.setCircuitCmd(mydata.idapp, req.user.username, myrec.name,
             shared_consts.CIRCUITCMD.SET, true, req.user.username, extrarec).then((ris) => {
-              return res.send({rec: myrec, ris});
+              return res.send({ rec: myrec, ris });
             });
         }
 
-          return res.send({rec: myrec, ris: null});
+        return res.send({ rec: myrec, ris: null });
       }).catch(async (e) => {
         console.error('settable', e.message);
         if (e.code === 11000) {
@@ -457,9 +473,9 @@ router.post('/settable', authenticate, async (req, res) => {
           if (!myfields.userId) {
             myfields.userId = req.user._id.toString();
           }
-            return await mytablestrutt.findByIdAndUpdate(id, {$set: myfields}).
+          return await mytablestrutt.findByIdAndUpdate(id, { $set: myfields }).
             then(async (rec) => {
-                  return res.send({rec});
+              return res.send({ rec });
             }).
             catch((err) => {
               tools.mylog('error: ', err.message);
@@ -513,7 +529,7 @@ router.post('/setsubrec', authenticate, (req, res) => {
       if (!myfields.userId) {
         myfields.userId = req.user._id.toString();
       }
-      return mytablestrutt.findByIdAndUpdate(id, {$set: myfields}).
+      return mytablestrutt.findByIdAndUpdate(id, { $set: myfields }).
         then(async (rec) => {
           return res.send(rec);
         }).
@@ -568,7 +584,7 @@ router.post('/getexp', authenticate, (req, res) => {
     !User.isFacilitatore(req.user.perm))) {
     // If without permissions, exit
     return res.status(404).
-        send({code: server_constants.RIS_CODE_ERR_UNAUTHORIZED, msg: ''});
+      send({ code: server_constants.RIS_CODE_ERR_UNAUTHORIZED, msg: '' });
   }
 
   try {
@@ -577,8 +593,8 @@ router.post('/getexp', authenticate, (req, res) => {
       return myUser.find({
         idapp,
         $or: [
-              {deleted: {$exists: false}},
-              {deleted: {$exists: true, $eq: false}}],
+          { deleted: { $exists: false } },
+          { deleted: { $exists: true, $eq: false } }],
       },
         {
           username: 1,
@@ -634,8 +650,8 @@ router.post('/getpage', async (req, res) => {
   const idapp = req.body.idapp;
   const mypath = params.path;
 
-  return await MyPage.findOne({idapp, path: mypath}).then((ris) => {
-    return res.send({mypage: ris});
+  return await MyPage.findOne({ idapp, path: mypath }).then((ris) => {
+    return res.send({ mypage: ris });
   }).catch((e) => {
     console.log(e.message);
     res.status(400).send(e);
@@ -658,10 +674,10 @@ router.patch('/setlang', authenticate, async (req, res) => {
     const rec = await User.findByUsername(idapp, username, false);
     let ris = null;
     if (!!rec)
-      ris = await User.findByIdAndUpdate(rec.id, {$set: fieldsvalue});
+      ris = await User.findByIdAndUpdate(rec.id, { $set: fieldsvalue });
 
     if (!!ris) {
-      return res.send({code: server_constants.RIS_CODE_OK, msg: ''});
+      return res.send({ code: server_constants.RIS_CODE_OK, msg: '' });
     }
 
     res.status(400).send();
@@ -689,7 +705,7 @@ router.patch('/chval', authenticate, async (req, res) => {
       !tools.ModificheConsentite(mydata.table, fieldsvalue)) {
       // If without permissions, exit
       return res.status(404).
-          send({code: server_constants.RIS_CODE_ERR_UNAUTHORIZED, msg: ''});
+        send({ code: server_constants.RIS_CODE_ERR_UNAUTHORIZED, msg: '' });
     }
 
     const camporequisiti = UserCost.FIELDS_REQUISITI.includes(
@@ -733,8 +749,8 @@ router.patch('/chval', authenticate, async (req, res) => {
       myrec['_id'] = fieldsvalue['_id'];
       return await mytable.insertMany(myrec).then((ris) => {
         if (ris) {
-          return mytable.deleteMany({_id: myidDel}).then((risdel) => {
-            return res.send({code: server_constants.RIS_CODE_OK, msg: ''});
+          return mytable.deleteMany({ _id: myidDel }).then((risdel) => {
+            return res.send({ code: server_constants.RIS_CODE_OK, msg: '' });
           });
         } else {
           return res.status(404).send();
@@ -761,7 +777,7 @@ router.patch('/chval', authenticate, async (req, res) => {
 
     }
 
-    return await mytable.findByIdAndUpdate(id, {$set: fieldsvalue}).
+    return await mytable.findByIdAndUpdate(id, { $set: fieldsvalue }).
       then(async (rec) => {
         // tools.mylogshow(' REC TO MODIFY: ', rec);
         if (!rec) {
@@ -810,7 +826,7 @@ router.patch('/chval', authenticate, async (req, res) => {
                     myuserfound._id);
                   fieldsvalue.aportador_solidario = aportador;
                   //Aggiorna record !
-                    await mytable.findByIdAndUpdate(id, {$set: fieldsvalue});
+                  await mytable.findByIdAndUpdate(id, { $set: fieldsvalue });
 
                 }
               } else {
@@ -860,8 +876,8 @@ router.patch('/chval', authenticate, async (req, res) => {
                 // Metti l'iniziale
                 if (!await User.AportadorOrig(id)) {
                   await mytable.findByIdAndUpdate(id,
-                        {$set: {aportador_iniziale: fieldsvalue.aportador_solidario}},
-                        {new: false});
+                    { $set: { aportador_iniziale: fieldsvalue.aportador_solidario } },
+                    { new: false });
                 }
               }
 
@@ -871,7 +887,7 @@ router.patch('/chval', authenticate, async (req, res) => {
               telegrambot.sendMsgTelegramToTheManagers(idapp, msg);
           }
 
-            res.send({code: server_constants.RIS_CODE_OK, msg: ''});
+          res.send({ code: server_constants.RIS_CODE_OK, msg: '' });
 
         }
 
@@ -902,7 +918,7 @@ router.patch('/askfunz', authenticate, async (req, res) => {
       !User.isFacilitatore(req.user.perm)) && (req.user._id.toString() !== id)) {
       // If without permissions, exit
       return res.status(404).
-          send({code: server_constants.RIS_CODE_ERR_UNAUTHORIZED, msg: ''});
+        send({ code: server_constants.RIS_CODE_ERR_UNAUTHORIZED, msg: '' });
     }
   }
 
@@ -910,7 +926,7 @@ router.patch('/askfunz', authenticate, async (req, res) => {
     const userfree = await Graduatoria.getFirstUserGradFree(idapp);
 
     if (!!userfree)
-      return res.send({code: server_constants.RIS_CODE_OK, out: userfree});
+      return res.send({ code: server_constants.RIS_CODE_OK, out: userfree });
     /*} else if (mydata.myfunc === shared_consts.CallFunz.GET_VALBYTABLE) {
       const mytable = globalTables.getTableByTableName(mydata.table);
       const coltoshow = {
@@ -932,7 +948,7 @@ router.patch('/askfunz', authenticate, async (req, res) => {
         return res.send({ code: server_constants.RIS_CODE_OK });*/
   }
 
-  return res.send({code: server_constants.RIS_CODE_ERR});
+  return res.send({ code: server_constants.RIS_CODE_ERR });
 
 });
 
@@ -958,11 +974,11 @@ router.patch('/callfunz', authenticate, async (req, res) => {
         !User.isFacilitatore(req.user.perm)) && (req.user._id.toString() !== id)) {
         // If without permissions, exit
         return res.status(404).
-            send({code: server_constants.RIS_CODE_ERR_UNAUTHORIZED, msg: ''});
+          send({ code: server_constants.RIS_CODE_ERR_UNAUTHORIZED, msg: '' });
       }
     }
 
-    let myuser = await User.findOne({idapp, username});
+    let myuser = await User.findOne({ idapp, username });
 
     let fieldsvalue = {};
 
@@ -977,13 +993,13 @@ router.patch('/callfunz', authenticate, async (req, res) => {
           false, FormDaMostrare);
 
         const ris = await User.findByIdAndUpdate(myuser.id,
-            {$set: {'profile.ask_zoom_partecipato': true}});
+          { $set: { 'profile.ask_zoom_partecipato': true } });
         if (ris)
-          return res.send({code: server_constants.RIS_CODE_OK, msg: ''});
+          return res.send({ code: server_constants.RIS_CODE_OK, msg: '' });
       }
     }
 
-    return res.send({code: server_constants.RIS_CODE_ERR});
+    return res.send({ code: server_constants.RIS_CODE_ERR });
 
   } catch (e) {
     console.log(e.message);
@@ -1031,14 +1047,14 @@ router.delete('/delrec/:table/:id', authenticate, async (req, res) => {
 
   const mytable = globalTables.getTableByTableName(tablename);
 
-  const fields = {'ALL': 1};
+  const fields = { 'ALL': 1 };
 
   if ((!User.isAdmin(req.user.perm) && !User.isManager(req.user.perm)) &&
     (tablename !== 'extralist') &&
     !tools.ModificheConsentite(tablename, fields, id, req.user)) {
     // If without permissions, exit
     return res.status(404).
-        send({code: server_constants.RIS_CODE_ERR_UNAUTHORIZED, msg: ''});
+      send({ code: server_constants.RIS_CODE_ERR_UNAUTHORIZED, msg: '' });
   }
 
   let cancellato = false;
@@ -1054,7 +1070,7 @@ router.delete('/delrec/:table/:id', authenticate, async (req, res) => {
         date_deleted: new Date(),
       };
 
-      await mytable.findByIdAndUpdate(id, {$set: fieldsvalue});
+      await mytable.findByIdAndUpdate(id, { $set: fieldsvalue });
 
       cancellato = true;
     }
@@ -1096,11 +1112,11 @@ router.delete('/delrec/:table/:id', authenticate, async (req, res) => {
     // Do extra things after deleted
     //let ris2 = await actions.doOtherlasThingsAfterDeleted(tablename, myrec, notifBot, req);
     if (!!ris) {
-      return res.send({code: server_constants.RIS_CODE_OK, msg: ''});
+      return res.send({ code: server_constants.RIS_CODE_OK, msg: '' });
     }
   }
 
-  res.send({code: server_constants.RIS_CODE_ERR, msg: ''});
+  res.send({ code: server_constants.RIS_CODE_ERR, msg: '' });
   return ris;
 
 });
@@ -1116,13 +1132,13 @@ router.post('/duprec/:table/:id', authenticate, async (req, res) => {
 
   if (!req.user) {
     return res.status(404).
-        send({code: server_constants.RIS_CODE_ERR_UNAUTHORIZED, msg: ''});
+      send({ code: server_constants.RIS_CODE_ERR_UNAUTHORIZED, msg: '' });
   }
 
   if (!User.isAdmin(req.user.perm) && !User.isManager(req.user.perm)) {
     // If without permissions, exit
     return res.status(404).
-        send({code: server_constants.RIS_CODE_ERR_UNAUTHORIZED, msg: ''});
+      send({ code: server_constants.RIS_CODE_ERR_UNAUTHORIZED, msg: '' });
   }
 
   return await mytable.findById(id).then(async (mydata) => {
@@ -1139,11 +1155,11 @@ router.post('/duprec/:table/:id', authenticate, async (req, res) => {
 
       // Do extra things after deleted
       return await actions.doOtherThingsAfterDuplicated(tablename, rec).
-          then(({myrec}) => {
+        then(({ myrec }) => {
           // ...
           mytable.findById(myrec._id).then((record) => {
             return res.send(
-                  {code: server_constants.RIS_CODE_OK, record, msg: ''});
+              { code: server_constants.RIS_CODE_OK, record, msg: '' });
           });
 
         });
@@ -1331,7 +1347,7 @@ function load(req, res, version) {
           myuser.password = '';
           myuser.calcstat = arrdata[13];
         }
-      } catch (e) {}
+      } catch (e) { }
     }
     if (version < 91) {
       res.send({
@@ -1422,7 +1438,7 @@ router.get(process.env.LINK_CHECK_UPDATES, authenticate, async (req, res) => {
     return res.status(404).send();
   }
 
-  await CfgServer.find({idapp}).then((arrcfgrec) => {
+  await CfgServer.find({ idapp }).then((arrcfgrec) => {
 
     if (!arrcfgrec)
       return res.status(404).send();
@@ -1460,7 +1476,7 @@ router.get(process.env.LINK_CHECK_UPDATES, authenticate, async (req, res) => {
 
   }).catch((e) => {
     console.log(e.message);
-    res.status(400).send({code: server_constants.RIS_CODE_ERR, msg: e});
+    res.status(400).send({ code: server_constants.RIS_CODE_ERR, msg: e });
   });
 
 });
@@ -1552,13 +1568,13 @@ function uploadFile(req, res, version) {
   form.uploadDir = mydir2;
   try {
 
-    form.on('fileBegin', async function(name, file) {
+    form.on('fileBegin', async function (name, file) {
       const mydir = folder + '/' + file.newFilename;
       // tools.mkdirpath(mydir);
       file.path = mydir
     });
 
-    form.on('file', async function(name, file) {
+    form.on('file', async function (name, file) {
       try {
         console.log('1) Uploading ' + file.originalFilename);
         const mydir = tools.getdirByIdApp(idapp) + dirmain +
@@ -1582,8 +1598,8 @@ function uploadFile(req, res, version) {
 
         oldpath = file.newFilename;
 
-        let fromfile = '.'+server_constants.DIR_UPLOAD + '/' + dir + '/' + oldpath;
-        let tofile = '.'+server_constants.DIR_UPLOAD + '/' + dir + '/' +file.originalFilename;
+        let fromfile = '.' + server_constants.DIR_UPLOAD + '/' + dir + '/' + oldpath;
+        let tofile = '.' + server_constants.DIR_UPLOAD + '/' + dir + '/' + file.originalFilename;
         let mydircurrent = process.cwd() + '/src/server/router/upload/' + dir;
         fromfile = mydircurrent + '/' + oldpath;
         tofile = mydir + '/' + file.originalFilename;
@@ -1613,28 +1629,28 @@ function uploadFile(req, res, version) {
               // SMALL
 
               // questa opzione 'failOnError' serve per risolvere l'errore (Error: VipsJpeg: Invalid SOS parameters for sequential JPEG
-              sharp(newname, {failOnError: false}).
+              sharp(newname, { failOnError: false }).
                 resize(64, 64).
                 withMetadata().
                 toFile(resized_img_small);
 
               // MEDIUM
               let resized_img = tools.extractFilePath(newname) + '/' + server_constants.PREFIX_IMG + tools.extractFileName(newname);
-              sharp(newname, {failOnError: false}).
+              sharp(newname, { failOnError: false }).
                 resize({
                   width: 512,
                   // height: 512,
                   //fit: sharp.fit.cover,
                   fit: sharp.fit.contain,
                   // position: sharp.strategy.entropy,
-                  }).withMetadata().toFile(resized_img, function(err) {
+                }).withMetadata().toFile(resized_img, function (err) {
 
                   // console.log('3) Ridimensionata Immagine ' + newname, 'in', resized_img);
 
                   if (tools.isFileExists(resized_img)) {
                     // console.log('4) Cancella l \'immagine grande originale:', newname);
                     // DELETE THE ORIGINAL BIG
-                  tools.delete(newname, false, () => {});
+                    tools.delete(newname, false, () => { });
 
                     // console.log('5) Rinomina l\'immagine Media da', resized_img, 'a:', newname);
                     // RENAME THE MEDIUM IN THE ORIGINAL NAME
@@ -1666,7 +1682,7 @@ function uploadFile(req, res, version) {
       }
     });
 
-    form.on('end', function() {
+    form.on('end', function () {
       console.log('-> upload done');
     });
 
@@ -1735,7 +1751,7 @@ function deleteFile(req, res, version) {
       tools.delete(fullpathfile, true, (err) => {
         if (err) console.log('err', err);
         if (err === undefined || err.errno === -2)
-          res.send({code: server_constants.RIS_CODE_OK, msg: ''});
+          res.send({ code: server_constants.RIS_CODE_OK, msg: '' });
       });
 
     } catch (e) {

src/server/router/site_router.js

@@ -48,6 +48,7 @@ router.post('/load', async (req, res) => {
     reg_weekly: await User.calcRegWeekly(idapp),
     lastsreg: await User.getLastUsers(idapp),
     lastsonline: await User.getLastOnlineUsers(idapp),
+    diffusorilist: await User.getDiffusoriUsers(idapp),
     checkuser: await User.checkUser(idapp, username),
     // navi_partite: await Nave.getNaviPartite(idapp),
     // navi_in_partenza: await Nave.getNaviInPartenza(idapp),

src/server/sendemail.js

@@ -278,7 +278,7 @@ module.exports = {
     }
   },
 
-  sendEmail_RequestNewPassword: async function(lang, user, emailto, idapp, tokenforgot) {
+  sendEmail_RequestNewPassword: async function(lang, user, emailto, idapp, tokenforgot, tokenforgot_code) {
 
     let mylocalsconf = {
       idapp,
@@ -286,6 +286,7 @@ module.exports = {
       locale: lang,
       nomeapp: tools.getNomeAppByIdApp(idapp),
       strlinksetpassword: tools.getlinkRequestNewPassword(idapp, emailto, tokenforgot),
+      tokenforgot_code,
       emailto: emailto,
     };