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

Doppia modalità di Registrazione con lista extra utenti

Browse Source
This commit is contained in:
Paolo Arena
2020-01-13 23:52:51 +01:00
parent 8f784df4fa
commit e23a3a792e
25 changed files with 829 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
src/server/router/users_router.js
View File

@@ -1,22 +1,23 @@
const express = require('express');
const router = express.Router();
var { User } = require('../models/user');
const { User } = require('../models/user');
const { ExtraList } = require('../models/extralist');
var sendemail = require('../sendemail');
const sendemail = require('../sendemail');
const tools = require('../tools/general');
const shared_consts = require('../tools/shared_nodejs');
var server_constants = require('../tools/server_constants');
const server_constants = require('../tools/server_constants');
const _ = require('lodash');
var reg = require('../reg/registration');
const reg = require('../reg/registration');
var { authenticate } = require('../middleware/authenticate');
const { authenticate } = require('../middleware/authenticate');
var mongoose = require('mongoose');
const mongoose = require('mongoose');
const Subscription = mongoose.model('subscribers');
function existSubScribe(userId, access, browser) {
@@ -30,10 +31,20 @@ function existSubScribe(userId, access, browser) {
}
function getMobileComplete(user) {
let str = user.profile.intcode_cell + user.profile.cell;
str = str.replace(/\s+/g, '');
// str = str.replace(/.+/g, '');
// str = str.replace(/-+/g, '');
return str
}
// POST /users
router.post('/', async (req, res) => {
tools.mylog("POST /users");
const body = _.pick(req.body, ['email', 'password', 'username', 'name', 'surname', 'idapp', 'keyappid', 'lang', 'profile', 'aportador_solidario']);
const body = _.pick(req.body, ['email', 'password', 'username', 'name', 'surname', 'idapp', 'keyappid', 'lang', 'profile', 'aportador_solidario', 'already_registered']);
const user = new User(body);
// tools.mylog("LANG PASSATO = " + user.lang, "IDAPP", user.idapp);
@@ -73,33 +84,71 @@ router.post('/', async (req, res) => {
if (exit === 1)
return;
user.save().then(() => {
User.findByUsername(user.idapp, user.username)
.then((usertrovato) => {
let recextra = null;
// tools.mylog("TROVATO USERNAME ? ", user.username, usertrovato);
if (usertrovato !== null) {
return user.generateAuthToken(req);
} else {
res.status(400).send();
return 0;
}
}).then((token) => {
// tools.mylog("passo il TOKEN: ", token);
res.header('x-auth', token).send(user);
if (user.already_registered) {
// Check in the extraList if is present!
recextra = await ExtraList.findByCellAndNameSurname(user.idapp, getMobileComplete(user), user.name, user.surname);
if (!recextra) {
res.status(400).send({ code: server_constants.RIS_CODE_USER_EXTRALIST_NOTFOUND, msg: '' });
return 1;
} else {
user.ind_order = recextra.ind_order;
user.date_reg = recextra.date_reg;
if (recextra.aportador_solidario_name_surname)
user.aportador_solidario_nome_completo = recextra.aportador_solidario_name_surname;
else
user.aportador_solidario_nome_completo = recextra.aportador_solidario_originale_name_surname;
// tools.mylog("LINKREG = " + user.linkreg);
// Invia un'email all'utente
// tools.mylog('process.env.TESTING_ON', process.env.TESTING_ON);
console.log('res.locale', res.locale);
if (!tools.testing()) {
return sendemail.sendEmail_Registration(user.lang, user.email, user, user.idapp, user.linkreg);
}
user.aportador_solidario_ind_order = recextra.aportador_solidario_ind_order;
});
}).catch((e) => {
res.status(400).send(e);
})
const useraportador = await ExtraList.findByIndOrder(user.idapp, user.aportador_solidario_ind_order);
if (useraportador)
user.aportador_solidario = useraportador.username;
}
}
return await user.save()
.then(async () => {
return await User.findByUsername(user.idapp, user.username)
.then((usertrovato) => {
// tools.mylog("TROVATO USERNAME ? ", user.username, usertrovato);
if (usertrovato !== null) {
return user.generateAuthToken(req);
} else {
res.status(400).send();
return 0;
}
})
.then(async (token) => {
// tools.mylog("passo il TOKEN: ", token);
if (recextra) {
recextra.registered = true;
recextra.username = user.username;
await recextra.save();
await User.fixUsername(user.idapp, user.ind_order, user.username);
}
return token;
})
.then(async (token) => {
// tools.mylog("LINKREG = " + user.linkreg);
// Invia un'email all'utente
// tools.mylog('process.env.TESTING_ON', process.env.TESTING_ON);
console.log('res.locale', res.locale);
if (!tools.testing()) {
await sendemail.sendEmail_Registration(user.lang, user.email, user, user.idapp, user.linkreg);
}
res.header('x-auth', token).send(user);
return true;
});
}).catch((e) => {
res.status(400).send(e);
})
});
router.get('/:idapp/:username', (req, res) => {
@@ -158,7 +207,7 @@ router.post('/login', (req, res) => {
User.findByCredentials(user.idapp, user.username, user.password)
.then((user) => {
tools.mylog("CREDENZIALI ! ");
// tools.mylog("CREDENZIALI ! ");
if (!user) {
tools.mylogshow("NOT FOUND !");
res.status(404).send({ code: server_constants.RIS_CODE_LOGIN_ERR });
@@ -208,7 +257,7 @@ router.post('/login', (req, res) => {
});
// tools.mylog("TROVATOOO!");
tools.mylog('FINE LOGIN')
// tools.mylog('FINE LOGIN')
});
}
})
@@ -220,7 +269,7 @@ router.post('/login', (req, res) => {
});
router.delete('/me/token', authenticate, (req, res) => {
tools.mylog("TOKENREM = " + req.token);
// tools.mylog("TOKENREM = " + req.token);
req.user.removeToken(req.token).then(() => {
res.status(200).send();
}, () => {
@@ -239,5 +288,17 @@ router.post('/setperm', authenticate, (req, res) => {
});
});
router.post('/import_extralist', async (req, res) => {
const strdata = req.body.strdata;
idapp = req.body.idapp;
locale = req.body.locale;
const ris = await ExtraList.ImportData(locale, idapp, strdata);
console.log('ris', ris);
res.send(ris);
});
module.exports = router;