verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 65 Releases Wiki Activity

Merge branch 'dev' of https://git.verdnatura.es/salix into dev

This commit is contained in:
dherrero 2017-10-10 15:01:21 +02:00
parent eeda5b45fd c3d611adb2
commit 5a07973789
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
services/auth/server/boot/routes.js
View File

@ -10,10 +10,11 @@ module.exports = function(app) {
});
app.post('/login', function(req, res) {
let user = req.body.user ? req.body.user : "";
let password = req.body.password;
let body = req.body;
let user = body.user;
let password = body.password;
let syncOnFail = true;
let usesEmail = user.indexOf('@') !== -1;
let usesEmail = user && user.indexOf('@') !== -1;
login();
@ -38,26 +39,23 @@ module.exports = function(app) {
return;
}
let parsedLocation;
let loginUrl;
let shouldContinue = false;
let continueUrl;
if (req.body.location)
parsedLocation = url.parse(req.body.location, true);
if (parsedLocation && parsedLocation.query) {
loginUrl = applications[parsedLocation.query.apiKey];
shouldContinue = parsedLocation.query.continue;
}
try {
let query = url.parse(req.body.location, true).query;
loginUrl = applications[query.apiKey];
continueUrl = query.continue;
} catch (e) {}
if (!loginUrl)
loginUrl = applications.default;
res.json({
res.send(JSON.stringify({
token: token.id,
continue: shouldContinue,
continue: continueUrl,
loginUrl: loginUrl
});
}));
}
function findCb(err, instance) {
if (!instance || instance.password !== md5(password)) {
@ -78,9 +76,9 @@ module.exports = function(app) {
}
function badLogin() {
res.status(401);
res.json({
res.send(JSON.stringify({
message: 'Login failed'
});
}));
}
});