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

- Fixed Image avatar user list, q-qvatar rounded image

Browse Source
This commit is contained in:
Paolo Arena
2019-10-25 19:08:38 +02:00
parent c8c4f57d16
commit 4154605fdd
6 changed files with 56 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/router/index_router.js
View File

@@ -354,7 +354,9 @@ router.get(process.env.LINK_CHECK_UPDATES, authenticate, (req, res) => {
// const sall = '0';
msgs = SendMsg.findAllByUserIdAndIdApp(userId, req.user.username, req.user.idapp);
// msgs = SendMsg.findAllByUserIdAndIdApp(userId, req.user.username, req.user.idapp);
msgs = SendMsg.findLastGroupByUserIdAndIdApp(userId, req.user.username, req.user.idapp);
let usersList = null;

5
server/router/users_router.js
View File

@@ -145,10 +145,11 @@ router.post('/login', (req, res) => {
usertosend.name = user.name;
usertosend.surname = user.surname;
usertosend.email = user.email;
usertosend.userId = user._id.toHexString();
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;
}
@@ -166,7 +167,7 @@ router.post('/login', (req, res) => {
const browser = req.get('User-Agent');
// Check if already exist Subscribe
return existSubScribe(myris.usertosend.userId, access, browser).then(subscribe => {
return existSubScribe(myris.usertosend._id, access, browser).then(subscribe => {
return (subscribe !== null)
}).then(subsExistonDb => {
return { usertosend: myris.usertosend, token: myris.token, subsExistonDb }