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

fixed problem with then catch chain (Promise)...

Browse Source
This commit is contained in:
Paolo Arena
2019-02-12 19:10:58 +01:00
parent 71132b9a57
commit ea06079878
4 changed files with 57 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
server/router/users_router.js
View File

@@ -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')