From ea0607987839a10adbf3f6fc5116a7fa10b515c4 Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Tue, 12 Feb 2019 19:10:58 +0100 Subject: [PATCH] fixed problem with then catch chain (Promise)... --- server/db/mongoose.js | 18 +++++++- server/middleware/authenticate.js | 4 +- server/models/user.js | 2 +- server/router/users_router.js | 72 ++++++++++++++++--------------- 4 files changed, 57 insertions(+), 39 deletions(-) diff --git a/server/db/mongoose.js b/server/db/mongoose.js index 41b82b1..f22654d 100644 --- a/server/db/mongoose.js +++ b/server/db/mongoose.js @@ -14,13 +14,29 @@ var options = { // user: process.env.UDB, // pass: process.env.PDB, useMongoClient: true, + useNewUrlParser: true, promiseLibrary: require('bluebird') + + // useCreateIndex: true, + // useFindAndModify: false, + // autoIndex: false, // Don't build indexes + // reconnectTries: Number.MAX_VALUE, // Never stop trying to reconnect + // reconnectInterval: 500, // Reconnect every 500ms + // poolSize: 10, // Maintain up to 10 socket connections + // // If not connected, return errors immediately rather than waiting for reconnect + // bufferMaxEntries: 0, + // connectTimeoutMS: 10000, // Give up initial connection after 10 seconds + // socketTimeoutMS: 45000, // Close sockets after 45 seconds of inactivity + // family: 4 // Use IPv4, skip trying IPv6 + + // keepAlive: true, // keepAlive is true by default since mongoose 5.2.0 + // keepAliveInitialDelay: 300000 // keepAliveInitialDelay is the number of milliseconds to wait before initiating keepAlive on the socket. }; // mongoose.connect(process.env.MONGODB_URI + '?authSource=admin', { options }) -mongoose.connect(process.env.MONGODB_URI, { options }) +mongoose.connect(process.env.MONGODB_URI, options) .then(() => console.log('connection succesful ' + process.env.MONGODB_URI + ' db: ' + process.env.DATABASE) ) diff --git a/server/middleware/authenticate.js b/server/middleware/authenticate.js index 32662f1..48f2248 100644 --- a/server/middleware/authenticate.js +++ b/server/middleware/authenticate.js @@ -10,12 +10,10 @@ var authenticate = (req, res, next) => { const useragent = req.get('User-Agent'); const access = 'auth ' + useragent; - tools.mylog("TOKEN = ", token); - tools.mylog("USER-AGENT = ", useragent); User.findByToken(token, access).then((user) => { if (!user) { - tools.mylog("TOKEN NOT FOUND! Maybe Connected to other Page"); + tools.mylog("TOKEN " + token + " NOT FOUND! (Maybe Connected to other Page) ACCESS: '" + access + "'"); return Promise.reject(server_constants.RIS_CODE_HTTP_INVALID_TOKEN); // res.status().send(); } diff --git a/server/models/user.js b/server/models/user.js index 9dc74a0..f8c6c04 100644 --- a/server/models/user.js +++ b/server/models/user.js @@ -102,7 +102,7 @@ UserSchema.methods.generateAuthToken = function (req) { return user.save() .then(() => { - console.log("TOKEN CREATO IN LOGIN : " + token) + console.log("TOKEN CREATO IN LOGIN : " + token); return token; }) .catch(err => { diff --git a/server/router/users_router.js b/server/router/users_router.js index 7ceec0c..5a148cb 100644 --- a/server/router/users_router.js +++ b/server/router/users_router.js @@ -88,6 +88,7 @@ router.get('/:username', (req, res) => { router.post('/login', (req, res) => { var body = _.pick(req.body, ['username', 'password', 'idapp', 'keyappid', 'lang']); var user = new User(body); + const subs = _.pick(req.body, ['subs']); tools.mylog("LOGIN: username: " + user.username + " pwd = " + user.password); @@ -104,9 +105,9 @@ router.post('/login', (req, res) => { tools.mylogshow("NOT FOUND !"); res.status(404).send({ code: server_constants.RIS_CODE_LOGIN_ERR }); } + return user }) .then(user => { - let mytoken = ''; return user.generateAuthToken(req).then((token) => { var usertosend = User(); usertosend.username = user.username; @@ -119,47 +120,50 @@ router.post('/login', (req, res) => { // tools.mylog("usertosend:"); // tools.mylog(usertosend); - return usertosend + return { usertosend, token } }) - .then((usertosend) => { + .then((myris) => { const useragent = req.get('User-Agent'); const access = 'auth ' + useragent; // if (usertosend.tokens.length > 0) // access = usertosend.tokens[usertosend.tokens.length - 1].access; + return existSubScribe(myris.usertosend.userId, access).then(subscribe => { + let subscriptionModel = null; + if (subscribe === null) { + // Doesn't exist, so save sub passed in INPUT + subscriptionModel = new Subscription(subs); + subscriptionModel.userId = myris.usertosend.userId; + subscriptionModel.access = access; - return existSubScribe(usertosend.userId, access) - .then(subscribe => { - if (subscribe === null) { - // Doesn't exist, so save sub passed in INPUT - let subscriptionModel = new Subscription(req.body.subs); - subscriptionModel.userId = usertosend._id; - subscriptionModel.access = access; + } + return {usertosend: myris.usertosend, token: myris.token, subscriptionModel } + }).then(myris => { + if (myris.subscriptionModel !== null) { + return myris.subscriptionModel.save().then((err, subscription) => { + if (err) { + console.error(`Error occurred while saving subscription. Err: ${err}`); + res.status(500).json({ + error: 'Technical error occurred' + }); + } else { + // Send 201 - resource created + // res.status(201).json({ data: 'Subscription saved.' }); + // res.send({ data: 'Subscription saved.' }); - return subscriptionModel.save((err, subscription) => { - if (err) { - console.error(`Error occurred while saving subscription. Err: ${err}`); - res.status(500).json({ - error: 'Technical error occurred' - }); - } else { - // Send 201 - resource created - // res.status(201).json({ data: 'Subscription saved.' }); - // res.send({ data: 'Subscription saved.' }); + tools.sendBackNotif(subscription, req.body.options) + } + return { usertosend: myris.usertosend, token: myris.token } + }); + } else { + return { usertosend: myris.usertosend, token: myris.token } + } + }).catch(e => { + console.log('Err subscribing:', e); + }) + }).then(myris => { + console.log('res', myris.token, myris.usertosend); - tools.sendBackNotif(subscription, req.body.options) - } - - return { usertosend } - }); - } else { - return { usertosend } - } - }); - }) - .then((usertosend) => { - console.log('res', mytoken, usertosend); - - res.header('x-auth', mytoken).send({ usertosend, code: server_constants.RIS_CODE_OK }); + res.header('x-auth', myris.token).send({ usertosend: myris.usertosend, code: server_constants.RIS_CODE_OK }); // tools.mylog("TROVATOOO!"); tools.mylog('FINE LOGIN')