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

Step 2: Creating page Messages: userlist last messages + a page for all the messages received and sent.

Browse Source
This commit is contained in:
Paolo Arena
2019-10-27 00:37:10 +02:00
parent e6c4053ccf
commit 5307c04151
9 changed files with 106 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server/router/users_router.js
View File

@@ -41,6 +41,7 @@ router.post('/', (req, res) => {
user.linkreg = reg.getlinkregByEmail(body.idapp, body.email, body.username);
user.verified_email = false;
user.ipaddr = reg.getiPAddressUser(req);
user.lasttimeonline = new Date();
if (tools.testing()) {
user.verified_email = true;
}
@@ -141,24 +142,19 @@ router.post('/login', (req, res) => {
if (user) {
return user.generateAuthToken(req).then((token) => {
var usertosend = User();
usertosend.username = user.username;
usertosend.name = user.name;
usertosend.surname = user.surname;
usertosend.email = user.email;
usertosend._id = user._id.toHexString();
usertosend.verified_email = user.verified_email;
usertosend.idapp = user.idapp;
usertosend.perm = user.perm;
usertosend.img = user.img;
if (!User.isAdmin(req.user)) {
usertosend.ipaddr = user.ipaddr;
}
shared_consts.fieldsUserToChange().forEach((field) => {
usertosend[field] = user[field]
});
// usertosend._id = user._id.toHexString();
// if (!User.isAdmin(req.user)) {
// usertosend.ipaddr = user.ipaddr;
// }
// tools.mylog("user.verified_email:" + user.verified_email);
tools.mylog("usertosend.userId", usertosend.userId);
// tools.mylog("usertosend:");
// tools.mylog(usertosend);
return { usertosend, token }
})