- se iOS non ricarica la pagina ma disinstalla il SW precedente e chiede di riavviare

- fixed: Creando un Conto di Gruppo, pare che venga impostato anche l'username... invece dev'essere solo il groupname
-
This commit is contained in:
Surya Paolo
2023-10-03 23:16:52 +02:00
parent d6303f5880
commit 536fbd1752
7 changed files with 187 additions and 26 deletions

View File

@@ -28,7 +28,8 @@ const _ = require('lodash');
const reg = require('../reg/registration');
const { authenticate } = require('../middleware/authenticate');
const { authenticate, authenticate_noerror } = require('../middleware/authenticate');
const Cart = require('../models/cart');
const CartClass = require('../modules/Cart');
@@ -428,7 +429,7 @@ router.post('/receiveris', authenticate, (req, res) => {
};
});
router.post('/profile', (req, res) => {
router.post('/profile', authenticate_noerror, (req, res) => {
const usernameOrig = req.user ? req.user.username : '';
const perm = req.user ? req.user.perm : tools.Perm.PERM_NONE;
const username = req.body['username'];
@@ -447,8 +448,16 @@ router.post('/profile', (req, res) => {
then((ris) => {
return User.getFriendsByUsername(idapp, usernameOrig).
then((friends) => {
res.send({ user: ris, friends });
then(async (friends) => {
if (username === usernameOrig) {
const userprofile = await User.getExtraInfoByUsername(idapp, username);
ris.profile = userprofile;
}
return { ris, friends };
}).then(tot => {
return res.send({ user: tot.ris, friends: tot.friends });
});
}).catch((e) => {
@@ -716,7 +725,7 @@ router.post('/updatesaldo', authenticate, async (req, res) => {
userprofile
}
return res.send({ris});
return res.send({ ris });
} catch (e) {
tools.mylog('ERRORE IN updatesaldo: ' + e);
@@ -833,6 +842,7 @@ async function eseguiDbOp(idapp, mydata, locale, req, res) {
const populate = require('../populate/populate');
const globalTables = require('../tools/globalTables');
const { Reaction } = require('../models/reaction');
let mystr = '';
@@ -1190,6 +1200,9 @@ async function eseguiDbOp(idapp, mydata, locale, req, res) {
// Passa le tabelle da users sulle nuove tabelle:
await User.removerecordsFavorite();
} else if (mydata.dbop === 'updateReactionsCounts') {
await Reaction.updateReactionsCounts();
} else if (mydata.dbop === 'newRecordsFav') {
// Passa le tabelle da users sulle nuove tabelle:
await User.moverecordsFavorite(1);