- Aggiornato node.js alla versione 22.18.1

- Aggiornato tutti i pacchetti del server all'ultima versione.
- passato mongoose da versione 5 a versione 6

src/server/router/push_router.js

@@ -7,16 +7,16 @@ const webpush = require('web-push');
 
 const tools = require('../tools/general');
 
-const {authenticate} = require('../middleware/authenticate');
+const { authenticate } = require('../middleware/authenticate');
 
 const shared_consts = require('../tools/shared_nodejs');
 const server_constants = require('../tools/server_constants');
 
-const {User} = require('../models/user');
+const { User } = require('../models/user');
 
 const globalTables = require('../tools/globalTables');
 
-router.post('/', (req, res) => {
+router.post('/', async (req, res) => {
   const payload = {
     title: req.body.title,
     message: req.body.message,
@@ -28,60 +28,59 @@ router.post('/', (req, res) => {
     tag: req.body.tag,
   };
 
-  Subscription.find({}, (err, subscriptions) => {
-    if (err) {
-      console.error(`Error occurred while getting subscriptions`);
-      res.status(500).json({
-        error: 'Technical error occurred',
-      });
+  try {
+    const subscriptions = await Subscription.find({});
+  } catch (err) {
+    console.error(`Error occurred while getting subscriptions`);
+    res.status(500).json({
+      error: 'Technical error occurred',
+    });
+  }
 
-    } else {
-      let parallelSubscriptionCalls = subscriptions.map((subscription) => {
-        return new Promise((resolve, reject) => {
-          const pushSubscription = {
-            endpoint: subscription.endpoint,
-            keys: {
-              p256dh: subscription.keys.p256dh,
-              auth: subscription.keys.auth,
-            },
-          };
+  let parallelSubscriptionCalls = subscriptions.map((subscription) => {
+    return new Promise((resolve, reject) => {
+      const pushSubscription = {
+        endpoint: subscription.endpoint,
+        keys: {
+          p256dh: subscription.keys.p256dh,
+          auth: subscription.keys.auth,
+        },
+      };
 
-          const pushPayload = JSON.stringify(payload);
-          const pushOptions = {
-            vapidDetails: {
-              subject: process.env.VAPI_KEY_SUBJECT,
-              privateKey: process.env.PRIVATE_VAPI_KEY,
-              publicKey: process.env.PUBLIC_VAPI_KEY,
-            },
-            TTL: payload.ttl,
-            headers: {},
-          };
-          webpush.sendNotification(
-              pushSubscription,
-              pushPayload,
-              pushOptions,
-          ).then((value) => {
-            resolve({
-              status: true,
-              endpoint: subscription.endpoint,
-              data: value,
-            });
-          }).catch((err) => {
-            reject({
-              status: false,
-              endpoint: subscription.endpoint,
-              data: err,
-            });
-          });
+      const pushPayload = JSON.stringify(payload);
+      const pushOptions = {
+        vapidDetails: {
+          subject: process.env.VAPI_KEY_SUBJECT,
+          privateKey: process.env.PRIVATE_VAPI_KEY,
+          publicKey: process.env.PUBLIC_VAPI_KEY,
+        },
+        TTL: payload.ttl,
+        headers: {},
+      };
+      webpush.sendNotification(
+        pushSubscription,
+        pushPayload,
+        pushOptions,
+      ).then((value) => {
+        resolve({
+          status: true,
+          endpoint: subscription.endpoint,
+          data: value,
+        });
+      }).catch((err) => {
+        reject({
+          status: false,
+          endpoint: subscription.endpoint,
+          data: err,
         });
       });
-      q.allSettled(parallelSubscriptionCalls).then((pushResults) => {
-        console.info(pushResults);
-      });
-      res.json({
-        data: 'Push triggered',
-      });
-    }
+    });
+  });
+  q.allSettled(parallelSubscriptionCalls).then((pushResults) => {
+    console.info(pushResults);
+  });
+  res.json({
+    data: 'Push triggered',
   });
 });
 
@@ -89,21 +88,21 @@ router.post('/', (req, res) => {
 
 async function SendMsgTo(idapp, username, params) {
 
-  return await User.find({idapp, username}).then(async (arrusers) => {
+  return await User.find({ idapp, username }).then(async (arrusers) => {
     if (arrusers !== null) {
       for (const user of arrusers) {
         await tools.sendNotificationToUser(user._id, params.title, params.content,
-            params.openUrl, params.openUrl2, params.tag, params.actions, params.id).
-            then(ris => {
-              if (ris) {
+          params.openUrl, params.openUrl2, params.tag, params.actions, params.id).
+          then(ris => {
+            if (ris) {
 
-              } else {
-                // already sent the error on calling sendNotificationToUser
-              }
-            }).
-            catch(e => {
-              console.error(e.message);
-            });
+            } else {
+              // already sent the error on calling sendNotificationToUser
+            }
+          }).
+          catch(e => {
+            console.error(e.message);
+          });
       }
     }
   });
@@ -119,10 +118,10 @@ router.post('/send', authenticate, async (req, res) => {
   let nummsg = 0;
 
   if ((!User.isAdmin(req.user.perm) && !User.isManager(req.user.perm) &&
-      !User.isFacilitatore(req.user.perm))) {
+    !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: '' });
   }
 
   let msgcosa = 'da Inviare';
@@ -144,7 +143,7 @@ router.post('/send', authenticate, async (req, res) => {
     });
   } catch (e) {
     return res.send(
-        {code: server_constants.RIS_CODE_ERR, msg: nummsg + ` Msg ${msgcosa} !`});
+      { code: server_constants.RIS_CODE_ERR, msg: nummsg + ` Msg ${msgcosa} !` });
   }
 
 });