Fix: Todo Multi refresh ...

fix some promises problem

server/router/todos_router.js

@@ -1,14 +1,6 @@
 const express = require('express');
 const router = express.Router();
 
-
-// SETTINGS WebPush Configuration
-const webpush = require('web-push');
-
-const publicVapidKey = process.env.PUBLIC_VAPI_KEY;
-const privateVapidKey = process.env.PRIVATE_VAPI_KEY;
-webpush.setVapidDetails('mailto:' + process.env.EMAIL_FROM, publicVapidKey, privateVapidKey);
-
 const tools = require('../tools/general');
 
 var server_constants = require('../tools/server_constants');
@@ -58,7 +50,7 @@ router.post('/', authenticate, (req, res) => {
       .then(record => {
         tools.mylog('REC SAVED :', record.descr);
 
-        sendNotificationToUser(todo.userId, 'Todo: ' + record.descr, record.descr, '/todo/' + todo.category, 'todo')
+        tools.sendNotificationToUser(todo.userId, 'Todo: ' + record.descr, record.descr, '/todo/' + todo.category, 'todo')
           .then(ris => {
             if (ris) {
               res.send({ record });
@@ -74,85 +66,6 @@ router.post('/', authenticate, (req, res) => {
 });
 
 
-function sendNotificationToUser(userId, title, content, openUrl, tag) {
-
-  const payload = {
-    title: title,
-    message: content,
-    url: openUrl,
-    tag,
-    // ttl: req.body.ttl,
-    // icon: req.body.icon,
-    // image: req.body.image,
-    // badge: req.body.badge,
-    // tag: req.body.tag
-  };
-
-  return Subscription.find({ userId }, (err, subscriptions) => {
-    if (err) {
-      console.error(`Error occurred while getting subscriptions`);
-      res.status(500).json({
-        error: 'Technical error occurred'
-      });
-      return false;
-    } 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
-            }
-          };
-
-          const pushPayload = JSON.stringify(payload);
-          const pushOptions = {
-            vapidDetails: {
-              subject: process.env.URLBASE_APP1,
-              privateKey: process.env.PRIVATE_VAPI_KEY,
-              publicKey: process.env.PUBLIC_VAPI_KEY,
-            },
-            TTL: payload.ttl,
-            headers: {}
-          };
-
-          // console.log('pushSubscription', pushSubscription);
-          // console.log('pushOptions', pushOptions);
-          // console.log('pushPayload', pushPayload);
-
-          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
-            });
-          });
-        }).catch(error => {
-          console.log('ERROR: sendNotificationToUser', error.data)
-        });
-      });
-      // q.allSettled(parallelSubscriptionCalls).then((pushResults) => {
-      //   console.info(pushResults);
-      // });
-      // res.json({
-      //   data: 'Push triggered'
-      // });
-      return true;
-    }
-  });
-
-}
 
 router.patch('/:id', authenticate, (req, res) => {
   var id = req.params.id;