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

fix: WebPush Notification

Browse Source
This commit is contained in:
Paolo Arena
2019-02-13 18:47:58 +01:00
parent df31a9ea9b
commit 0b4ac6391d
8 changed files with 115 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
server/router/users_router.js
View File

@@ -88,7 +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']);
// const subs = _.pick(req.body, ['subs']);
tools.mylog("LOGIN: username: " + user.username + " pwd = " + user.password);
@@ -97,6 +97,7 @@ router.post('/login', (req, res) => {
if (body.keyappid !== process.env.KEY_APP_ID)
return res.status(400).send();
let resalreadysent = false;
User.findByCredentials(user.username, user.password)
.then((user) => {
@@ -108,70 +109,53 @@ router.post('/login', (req, res) => {
return user
})
.then(user => {
return user.generateAuthToken(req).then((token) => {
var usertosend = User();
usertosend.username = user.username;
usertosend.email = user.email;
usertosend.userId = user._id.toHexString();
usertosend.verified_email = user.verified_email;
if (user) {
return user.generateAuthToken(req).then((token) => {
var usertosend = User();
usertosend.username = user.username;
usertosend.email = user.email;
usertosend.userId = user._id.toHexString();
usertosend.verified_email = user.verified_email;
// tools.mylog("user.verified_email:" + user.verified_email);
tools.mylog("usertosend.userId", usertosend.userId);
// tools.mylog("user.verified_email:" + user.verified_email);
tools.mylog("usertosend.userId", usertosend.userId);
// tools.mylog("usertosend:");
// tools.mylog(usertosend);
return { usertosend, token }
})
.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;
// tools.mylog("usertosend:");
// tools.mylog(usertosend);
return { usertosend, token }
}
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:' + err
});
} 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) => {
const useragent = req.get('User-Agent');
const access = 'auth ' + useragent;
// Check if already exist Subscribe
return existSubScribe(myris.usertosend.userId, access).then(subscribe => {
return (subscribe !== null)
}).then(subsExistonDb => {
return { usertosend: myris.usertosend, token: myris.token, subsExistonDb }
}).catch(err => {
return { usertosend: myris.usertosend, token: myris.token, subsExistonDb:false }
})
}).then(myris => {
console.log('res', myris.token, myris.usertosend);
res.header('x-auth', myris.token).send({ usertosend: myris.usertosend, code: server_constants.RIS_CODE_OK });
// SEND TOKEN AND CODE RESULT
res.header('x-auth', myris.token).send({
usertosend: myris.usertosend,
code: server_constants.RIS_CODE_OK,
subsExistonDb: myris.subsExistonDb
});
// tools.mylog("TROVATOOO!");
tools.mylog('FINE LOGIN')
});
}
})
.catch((e) => {
tools.mylog("ERRORE IN LOGIN: " + e);
res.status(400).send({ code: server_constants.RIS_CODE_LOGIN_ERR_GENERIC });
if (!resalreadysent)
res.status(400).send({ code: server_constants.RIS_CODE_LOGIN_ERR_GENERIC });
});
});