diff --git a/src/server/models/circuit.js b/src/server/models/circuit.js index 9600c93..1c3c4e7 100755 --- a/src/server/models/circuit.js +++ b/src/server/models/circuit.js @@ -1595,9 +1595,9 @@ CircuitSchema.statics.replaceAllCircuitNames = async function (idapp) { newname = 'Circuito RIS Roma Sud e Litora'; } else if (circuit.name.trim() === 'RISO Roma Nord' || circuit.name.trim() === 'Circuito RISO Roma Nord') { newname = 'Circuito RIS Roma Nord'; - /* } else if (circuit.name == 'Circuito RIS Benevento' || circuit.name == 'Circuito RIS Campania') { + } else if (circuit.name == 'Circuito RIS Benevento' || circuit.name == 'Circuito RIS Campania') { newname = 'Circuito RIS Campania'; - path = 'riscampania'; */ + path = 'riscampania'; } else if (circuit.name == 'Circuito RIS Milano Est') { newname = 'Circuito RIS Milano Est'; } else if (circuit.name == 'Circuito RIS Repubblica di San Marino') { diff --git a/src/server/models/user.js b/src/server/models/user.js index 4dc7b6c..27fe497 100755 --- a/src/server/models/user.js +++ b/src/server/models/user.js @@ -1719,7 +1719,17 @@ UserSchema.statics.SvuotaTuttiGliAccessiOnlineConToken = async function (idapp) const User = this; return await User.updateMany({ idapp }, - { $pull: { tokens: { refreshToken: { $exists: false } } } }); + { + $pull: { + tokens: + { + $or: [{ refreshToken: { $exists: false } }, + { refreshToken: { $exists: true, $eq: '' } } + ] + }, + } + }); + }; @@ -2484,7 +2494,7 @@ UserSchema.statics.setFriendsCmd = async function (req, idapp, usernameOrig, use if (!disablenotif) { const userDest = await User.getRecLangAndIdByUsername(idapp, usernameDest); const user = await User.getRecLangAndIdByUsername(idapp, usernameOrig); - + let msgDest = i18n.__({ phrase: 'HANDSHAKE_SENT_FROM_YOU', locale: userDest.lang }, usernameDest); if (already_stretta) msgDest = i18n.__({ phrase: 'HANDSHAKE_CONFIRMED', locale: userDest.lang }, usernameDest);