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

- Manage multiple login, in different browsers... Multi Token...

Browse Source
This commit is contained in:
Paolo Arena
2019-02-09 18:03:14 +01:00
parent 318ff7a798
commit 636ee92786
8 changed files with 50 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/router/index_router.js
View File

@@ -87,7 +87,7 @@ router.post(process.env.LINK_UPDATE_PASSWORD, (req, res) => {
user.password = password;
// Crea token
user.generateAuthToken().then(token => {
user.generateAuthToken(req).then(token => {
user.tokenforgot = ''; // Svuota il tokenforgot perché non ti servirà più...
// Salva lo User

12
server/router/todos_router.js
View File

@@ -38,7 +38,7 @@ router.post('/', authenticate, (req, res) => {
return res.status(404).send({ code: server_constants.RIS_CODE_TODO_CREATING_NOTMYUSER });
}
tools.mylog('POST ', todo.descr);
tools.mylog('POST :', todo.descr, todo._id);
todo.modified = false;
if (!todo.descr) {
@@ -51,7 +51,7 @@ router.post('/', authenticate, (req, res) => {
let idobj = writeresult._id;
Todo.findById(idobj)
.then(record => {
tools.mylog('REC SAVED :', record);
tools.mylog('REC SAVED :', record.descr);
res.send({record});
})
}).catch((e) => {
@@ -154,6 +154,8 @@ router.patch('/:id', authenticate, (req, res) => {
todo.modified = false;
tools.mylog('PATCH ', todo.descr, todo._id);
res.send({todo});
}).catch((e) => {
res.status(400).send();
@@ -178,7 +180,7 @@ router.get('/:userId', authenticate, (req, res) => {
// Extract all the todos of the userId only
Todo.findAllByUserId(userId).then((todos) => {
tools.mylog('todos', todos)
// tools.mylog('todos', todos)
res.send({ todos });
}).catch((e) => {
console.log(e);
@@ -187,7 +189,7 @@ router.get('/:userId', authenticate, (req, res) => {
});
router.delete('/:id', (req, res) => {
router.delete('/:id', authenticate, (req, res) => {
var id = req.params.id;
if (!ObjectID.isValid(id)) {
@@ -199,6 +201,8 @@ router.delete('/:id', (req, res) => {
return res.status(404).send();
}
tools.mylog('DELETED ', todo.descr, todo._id);
res.send({todo});
}).catch((e) => {
res.status(400).send();

10
server/router/users_router.js
View File

@@ -36,7 +36,7 @@ router.post('/', (req, res) => {
tools.mylog("TROVATO USERNAME ? ", user.username, usertrovato);
if (usertrovato !== null) {
return user.generateAuthToken();
return user.generateAuthToken(req);
} else {
res.status(11100).send();
return 0;
@@ -76,7 +76,7 @@ router.post('/login', (req, res) => {
var body = _.pick(req.body, ['username', 'password', 'idapp', 'keyappid', 'lang']);
var user = new User(body);
tools.mylog("username: " + user.username + " pwd = " + user.password);
tools.mylog("LOGIN: username: " + user.username + " pwd = " + user.password);
tools.mylog("user REC:", user);
@@ -91,7 +91,7 @@ router.post('/login', (req, res) => {
tools.mylogshow("NOT FOUND !");
res.status(404).send({ code: server_constants.RIS_CODE_LOGIN_ERR });
} else {
return user.generateAuthToken().then((token) => {
return user.generateAuthToken(req).then((token) => {
var usertosend = User();
usertosend.username = user.username;
usertosend.email = user.email;
@@ -105,10 +105,12 @@ router.post('/login', (req, res) => {
// tools.mylog(usertosend);
res.header('x-auth', token).send({usertosend, code: server_constants.RIS_CODE_OK});
// tools.mylog("TROVATOOO!");
tools.mylog('FINE LOGIN')
});
}
}).catch((e) => {
tools.mylog("ERR: " + e);
tools.mylog("ERRORE IN LOGIN: " + e);
res.status(400).send({ code: server_constants.RIS_CODE_LOGIN_ERR_GENERIC });
});
});