From dbcdbd689b6b9bff3d2801aa8e4f49da991e08f0 Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Wed, 17 Jan 2024 21:49:59 +0100 Subject: [PATCH] fix order non si vedeva.. e msg login errato --- src/server/models/user.js | 3 +- src/server/router/users_router.js | 4 +- src/server/telegram/telegrambot.js | 104 ++++++++++++++++------------- src/server/tools/general.js | 4 +- src/server/tools/globalTables.js | 5 +- 5 files changed, 68 insertions(+), 52 deletions(-) diff --git a/src/server/models/user.js b/src/server/models/user.js index 6e3311b..53538d1 100755 --- a/src/server/models/user.js +++ b/src/server/models/user.js @@ -5013,9 +5013,10 @@ UserSchema.statics.getExtraInfoByUsername = async function (idapp, username) { let myuser = await User.findOne({ idapp, username }).lean(); if (myuser) { myuserextra = await User.addExtraInfo(idapp, myuser, null); + return myuser.profile; } - return myuser.profile; + return null; }; UserSchema.statics.addExtraInfo = async function (idapp, recUser, recUserSave, version) { diff --git a/src/server/router/users_router.js b/src/server/router/users_router.js index f2818fd..6515cfc 100755 --- a/src/server/router/users_router.js +++ b/src/server/router/users_router.js @@ -568,6 +568,8 @@ router.post('/login', (req, res) => { let resalreadysent = false; + const myuser = user; + User.findByCredentials(user.idapp, user.username, user.password). then(async (user) => { // tools.mylog("CREDENZIALI ! "); @@ -576,7 +578,7 @@ router.post('/login', (req, res) => { const msg = 'Tentativo di Login ERRATO [' + body.username + ' , ' + ']\n' + '[IP: ' + tools.getiPAddressUser(req) + ']'; tools.mylogshow(msg); - await telegrambot.sendMsgTelegramToTheAdmin(user.idapp, msg, true); + await telegrambot.sendMsgTelegramToTheAdmin(myuser.idapp, msg, true); tools.writeErrorLog(msg); // telegrambot.sendMsgTelegramToTheManagers(body.idapp, msg); res.status(404).send({ code: server_constants.RIS_CODE_LOGIN_ERR }); diff --git a/src/server/telegram/telegrambot.js b/src/server/telegram/telegrambot.js index 148c96e..949c392 100755 --- a/src/server/telegram/telegrambot.js +++ b/src/server/telegram/telegrambot.js @@ -797,63 +797,71 @@ const MyTelegramBot = { }, notifyToTelegram: async function (phase, mylocalsconf) { - let userdest = mylocalsconf.user.aportador_solidario; - let langdest = mylocalsconf.user.lang; - let NameFrom = `${mylocalsconf.user.name} ${mylocalsconf.user.surname}`; - if (!mylocalsconf.user.name) { - NameFrom = `${mylocalsconf.user.username}`; - } - const index = mylocalsconf.user.index; - - let aportador = ''; - if (userdest) { - aportador = `${userdest}`; - NameFrom += aportador; - } else { - aportador = mylocalsconf.user.aportador_solidario_nome_completo - ? mylocalsconf.user.aportador_solidario_nome_completo - : mylocalsconf.user.aportador_solidario; - } - - let text = ''; - if (phase === this.phase.REGISTRATION) { - - if (tools.getConfSiteOptionEnabledByIdApp(mylocalsconf.idapp, - shared_consts.ConfSite.Notif_Reg_Bot_ToManagers)) { - if (userdest) { - NameFrom = await User.getNameSurnameByUsername(mylocalsconf.idapp, - userdest, true); - aportador = NameFrom ? NameFrom + ' ' + aportador : aportador; - } - const numutenti = await User.getNumUsers(mylocalsconf.idapp); - let nome = tools.getNomeCognomeEUserNameByUser(mylocalsconf.user); - text = printf(getstr(langdest, 'MSG_APORTADOR_USER_REGISTERED'), nome, - numutenti, aportador); + try { + let userdest = mylocalsconf.user.aportador_solidario; + let langdest = mylocalsconf.user.lang; + let NameFrom = `${mylocalsconf.user.name} ${mylocalsconf.user.surname}`; + if (!mylocalsconf.user.name) { + NameFrom = `${mylocalsconf.user.username}`; } + const index = mylocalsconf.user.index; + + let aportador = ''; + if (userdest) { + aportador = `${userdest}`; + NameFrom += aportador; + } else { + aportador = mylocalsconf.user.aportador_solidario_nome_completo + ? mylocalsconf.user.aportador_solidario_nome_completo + : mylocalsconf.user.aportador_solidario; + } + + let text = ''; + if (phase === this.phase.REGISTRATION) { + + if (tools.getConfSiteOptionEnabledByIdApp(mylocalsconf.idapp, + shared_consts.ConfSite.Notif_Reg_Bot_ToManagers)) { + if (userdest) { + NameFrom = await User.getNameSurnameByUsername(mylocalsconf.idapp, + userdest, true); + aportador = NameFrom ? NameFrom + ' ' + aportador : aportador; + } + const numutenti = await User.getNumUsers(mylocalsconf.idapp); + let nome = tools.getNomeCognomeEUserNameByUser(mylocalsconf.user); + text = printf(getstr(langdest, 'MSG_APORTADOR_USER_REGISTERED'), nome, + numutenti, aportador); + } + } + + let addtext = ''; + let rismsg = null; + + if (text) { + + await this.sendMsgTelegramToTheManagers(mylocalsconf.idapp, + addtext + text, false, null); + } + + } catch (e) { + console.error('Err notifyToTelegram', e); } - - let addtext = ''; - let rismsg = null; - - if (text) { - - await this.sendMsgTelegramToTheManagers(mylocalsconf.idapp, - addtext + text, false, null); - } - }, notifyIscrizioneToTelegram: async function (phase, mylocalsconf, msg) { - let langdest = mylocalsconf.iscritto.lang; - let NameFrom = `${mylocalsconf.iscritto.name} ${mylocalsconf.iscritto.surname}`; + try { + let langdest = mylocalsconf.iscritto.lang; + let NameFrom = `${mylocalsconf.iscritto.name} ${mylocalsconf.iscritto.surname}`; - let nomeapp = tools.getHostByIdApp(mylocalsconf.idapp); + let nomeapp = tools.getHostByIdApp(mylocalsconf.idapp); - let text = printf(getstr(langdest, msg), NameFrom, nomeapp); + let text = printf(getstr(langdest, msg), NameFrom, nomeapp); - let addtext = ''; + let addtext = ''; - await this.sendMsgTelegramToTheManagers(mylocalsconf.idapp, addtext + text); + await this.sendMsgTelegramToTheManagers(mylocalsconf.idapp, addtext + text); + } catch (e) { + console.error('notifyIscrizioneToTelegram', e); + } }, askConfirmationUser: async function (idapp, myfunc, myuser, userDest = '', name = '', groupid = '', regexpire = '', groupname = '') { diff --git a/src/server/tools/general.js b/src/server/tools/general.js index ec2de27..125cf60 100755 --- a/src/server/tools/general.js +++ b/src/server/tools/general.js @@ -4385,7 +4385,9 @@ module.exports = { }, async isManagerByReq(req) { - try { + try { + var { User } = require('../models/user'); + const idapp = req.body.idapp; let userId = ''; if (req.body) diff --git a/src/server/tools/globalTables.js b/src/server/tools/globalTables.js index 96b5a74..142863f 100755 --- a/src/server/tools/globalTables.js +++ b/src/server/tools/globalTables.js @@ -83,6 +83,7 @@ const tools = require('./general'); const shared_consts = require('./shared_nodejs'); +const server_constants = require('../tools/server_constants'); module.exports = { @@ -490,12 +491,14 @@ module.exports = { return await this.SendMsgToParam(idapp, params); }, - replaceUsername: async function (idapp, search_username, replace_username) { + replaceUsername: async function (idapp, search_username, replace_username) { if (!search_username || !replace_username) { return false; } + console.log('INIZIO replaceUsername') + try { let ris = null; console.log('replaceUsername = ', search_username, replace_username);