surya/freeplanet_serverside
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Todo Multi refresh ...

Browse Source 
fix some promises problem
This commit is contained in:
Paolo Arena
2019-02-14 19:01:41 +01:00
parent 0b4ac6391d
commit f6fa45a9e9
13 changed files with 191 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/router/subscribe_router.js
View File

@@ -2,7 +2,6 @@ const express = require('express');
const router = express.Router();
const mongoose = require('mongoose');
const Subscription = mongoose.model('subscribers');
const webpush = require('web-push');
const tools = require('../tools/general');
@@ -27,7 +26,7 @@ const isValidSaveRequest = (req, res) => {
}
};
router.post('/', (req, res) => {
router.post('/', authenticate, (req, res) => {
console.log('req.body.others', req.body.others);
if (!isValidSaveRequest(req, res)) {
@@ -37,9 +36,10 @@ router.post('/', (req, res) => {
let subscriptionModel = new Subscription(req.body.subs);
subscriptionModel.userId = req.body.others.userId;
subscriptionModel.access = req.body.others.access;
subscriptionModel.browser = req.get('User-Agent');
// Find if already exist
Subscription.findOne( {userId: subscriptionModel.userId, access: subscriptionModel.access})
Subscription.findOne( {userId: subscriptionModel.userId, access: subscriptionModel.access, browser: subscriptionModel.browser})
.then(itemsub => {
return itemsub
})
@@ -67,7 +67,9 @@ router.post('/', (req, res) => {
// res.status(201).json({ data: 'Subscription saved.' });
res.send({ data: 'Subscription saved.' });
tools.sendBackNotif(subscription, req.body.options)
if (req.body.options !== null) {
tools.sendBackNotif(subscription, req.body.options)
}
}
});
@@ -78,7 +80,8 @@ router.post('/', (req, res) => {
router.delete('/del', authenticate, (req, res) => {
// tools.mylog("TOKENREM = " + req.token);
Subscription.findOneAndRemove( { userId: req.user._id, access: req.access } ).then(() => {
const browser = req.get('User-Agent');
Subscription.findOneAndRemove( { userId: req.user._id, access: req.access, browser } ).then(() => {
res.status(200).send();
}, () => {
res.status(400).send();