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

fix: Upload Foto

Browse Source
This commit is contained in:
paoloar77
2022-02-16 09:40:16 +01:00
parent a3502c1d9d
commit bae30504f7
9 changed files with 147 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
src/server/router/index_router.js
View File

@@ -370,7 +370,9 @@ router.post('/settable', authenticate, (req, res) => {
if (params.table === shared_consts.TAB_MYGROUPS) {
if (shared_consts.MYGROUPS_KEY_TO_CRYPTED in mydata) {
if (mydata[shared_consts.MYGROUPS_KEY_TO_CRYPTED]) {
mydata[shared_consts.MYGROUPS_KEY_TO_CRYPTED + shared_consts.SUFFIX_CRYPTED] = tools.cryptdata(mydata[shared_consts.MYGROUPS_KEY_TO_CRYPTED]);
mydata[shared_consts.MYGROUPS_KEY_TO_CRYPTED +
shared_consts.SUFFIX_CRYPTED] = tools.cryptdata(
mydata[shared_consts.MYGROUPS_KEY_TO_CRYPTED]);
}
}
@@ -388,7 +390,8 @@ router.post('/settable', authenticate, (req, res) => {
*/
}
const indfind = mydata.admins.findIndex((rec) => (rec.username === req.user.username));
const indfind = mydata.admins.findIndex(
(rec) => (rec.username === req.user.username));
if (indfind < 0) {
mydata.admins.push({username: req.user.username});
@@ -416,30 +419,39 @@ router.post('/settable', authenticate, (req, res) => {
}
}
return mytablerec.save().then(rec => {
// tools.mylog('rec', rec);
return res.send(rec);
return mytablerec.save().
then(async (rec) => {
}).catch((e) => {
if (e.code === 11000) {
const id = mytablerec._id;
delete mytablerec._doc['_id'];
const myfields = mytablerec._doc;
if (!myfields.userId) {
myfields.userId = req.user._id.toString();
}
return mytablestrutt.findByIdAndUpdate(id, {$set: myfields}).
then(async (rec) => {
return res.send(rec);
}).
catch((err) => {
tools.mylog('error: ', err.message);
return res.status(400).send(err);
});
} else {
console.log(e.message);
}
});
if (shared_consts.TABLES_GETCOMPLETEREC.includes(params.table)) {
const myrec = await mytablestrutt.getCompleteRecord(rec.idapp,
rec._id);
return res.send(myrec);
} else {
return res.send(rec);
}
// tools.mylog('rec', rec);
}).catch((e) => {
if (e.code === 11000) {
const id = mytablerec._id;
delete mytablerec._doc['_id'];
const myfields = mytablerec._doc;
if (!myfields.userId) {
myfields.userId = req.user._id.toString();
}
return mytablestrutt.findByIdAndUpdate(id, {$set: myfields}).
then(async (rec) => {
return res.send(rec);
}).
catch((err) => {
tools.mylog('error: ', err.message);
return res.status(400).send(err);
});
} else {
console.log(e.message);
}
});
} catch (e) {
return res.status(400).send(e);
@@ -716,7 +728,9 @@ router.patch('/chval', authenticate, async (req, res) => {
msg = 'Ripristinato';
await telegrambot.sendMsgTelegramToTheManagers(idapp,
`L\'utente ` + tools.getNomeCognomeEUserNameByUser(rec) + ` è stato ${msg} da ` + tools.getNomeCognomeEUserNameByUser(req.user));
`L\'utente ` + tools.getNomeCognomeEUserNameByUser(rec) +
` è stato ${msg} da ` +
tools.getNomeCognomeEUserNameByUser(req.user));
}
}
@@ -728,8 +742,10 @@ router.patch('/chval', authenticate, async (req, res) => {
fieldsvalue.aportador_solidario);
const nomecognomeas = await User.getNameSurnameByUsername(idapp,
rec.aportador_solidario);
msg = `Variato l'invitante di ` + tools.getNomeCognomeEUserNameByUser(rec) +
'\nmodificato da ' + tools.getNomeCognomeEUserNameByUser(req.user) +
msg = `Variato l'invitante di ` +
tools.getNomeCognomeEUserNameByUser(rec) +
'\nmodificato da ' +
tools.getNomeCognomeEUserNameByUser(req.user) +
' \n' +
'Prima: ' + nomecognomeas + ' (' + rec.aportador_solidario +
')\n' +
@@ -1167,7 +1183,7 @@ function load(req, res, version) {
myuserextra,
catgrps,
adtypes,
]).then((arrdata) => {
]).then((arrdata) => {
// console.table(arrdata);
let myuser = req.user;
if (myuser) {
@@ -1418,10 +1434,12 @@ function uploadFile(req, res, version) {
// res.sendFile(path.resolve(filename));
oldpath = file.path;
// newname = '/home/paolo/Documents/prova.png'
file.path = newname;
// Move in the folder application !
tools.move(oldpath, newname, (err) => {
// tools.move(oldpath, newname, (err) => {
tools.move(oldpath, newname, async (err) => {
if (err)
console.log('err:', err);
@@ -1444,26 +1462,27 @@ function uploadFile(req, res, version) {
};
// Salva le immagini in formato compresso
(async () => {
try {
const ris = await resizer(newname, setup_image_compress);
try {
const ris = await resizer(newname, setup_image_compress);
console.log('resizer', newname);
if (ris) {
if (tools.isFileExists(resized_img)) {
tools.delete(newname, false, () => {});
if (ris) {
if (tools.isFileExists(resized_img)) {
tools.delete(newname, false, () => {});
tools.move(resized_img, newname, (err) => {
if (err)
console.error('err', err);
});
}
tools.move(resized_img, newname, (err) => {
if (err)
console.error('err', err);
else
console.log('move', newname);
});
}
} catch (e) {
console.error('newname', e);
}
} catch (e) {
console.error('newname', e);
}
})();
res.end();
console.log('res.end');
// return res.send({filename: newname });
});

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

@@ -361,7 +361,7 @@ router.post('/login', (req, res) => {
var user = new User(body);
// const subs = _.pick(req.body, ['subs']);
// tools.mylog("LOGIN: username: " + user.username + " pwd = " + user.password);
// tools.mylog("LOG: u: " + user.username + " p:" + user.password);
// tools.mylog("user REC:", user);
@@ -381,18 +381,11 @@ router.post('/login', (req, res) => {
tools.mylogshow(msg);
// telegrambot.sendMsgTelegramToTheManagers(body.idapp, msg);
res.status(404).send({code: server_constants.RIS_CODE_LOGIN_ERR});
} else if (!!user.subaccount && user.subaccount) {
await tools.snooze(1000);
// const msg = "Tentativo di Login ERRATO [" + body.username + ' , ' + body.password + ']\n' + '[IP: ' + tools.getiPAddressUser(req) + ']';
// tools.mylogshow(msg);
// telegrambot.sendMsgTelegramToTheManagers(body.idapp, msg);
res.status(404).
send({code: server_constants.RIS_CODE_LOGIN_ERR_SUBACCOUNT});
return null;
}
return user;
}).
then(user => {
// console.log('Lgn-Ok');
if (user) {
return user.generateAuthToken(req).then((token) => {
var usertosend = new User();
@@ -421,6 +414,7 @@ router.post('/login', (req, res) => {
return (subscribe !== null);
}).
then(subsExistonDb => {
// console.log('ESEGUITO OK')
return {
usertosend: myris.usertosend,
token: myris.token,
@@ -451,7 +445,7 @@ router.post('/login', (req, res) => {
}
}).
catch((e) => {
tools.mylog('ERRORE IN LOGIN: ' + e.message);
console.error('ERRORE IN LOGIN: ' + e.message);
if (!resalreadysent)
res.status(400).
send({code: server_constants.RIS_CODE_LOGIN_ERR_GENERIC});
@@ -918,18 +912,34 @@ async function eseguiDbOp(idapp, mydata, locale) {
} else if (mydata.dbop === 'emptyDbSkill') {
// Svuota e Ricrea
const {Sector} = require('../models/sector');
const {Skill} = require('../models/skill');
const {SubSkill} = require('../models/subskill');
const {City} = require('../models/city');
const {Province} = require('../models/province');
const {Contribtype} = require('../models/contribtype');
const {AdType} = require('../models/adtype');
await Sector.deleteMany({});
await Skill.deleteMany({});
await SubSkill.deleteMany({});
await Contribtype.deleteMany({});
await AdType.deleteMany({});
await populate.popolaTabelleNuove();
} else if (mydata.dbop === 'ricreaTabCitiesProvinces') {
// Svuota e Ricrea
const {City} = require('../models/city');
const {Province} = require('../models/province');
await City.deleteMany({});
await Province.deleteMany({});
await populate.popolaTabelleNuove();
} else if (mydata.dbop === 'PopulateTables') {
populate.popolaTabelleNuove();