From 928bd6c019b83d4680c8743f0dc84c6a26e8d64a Mon Sep 17 00:00:00 2001
From: AnthonyS <a.santoro@integry.it>
Date: Thu, 13 Mar 2025 15:15:16 +0100
Subject: [PATCH] Fix su login web e migliorie log4j

---
 .../ems/system/service/SystemService.java     | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/ems-engine/src/main/java/it/integry/ems/system/service/SystemService.java b/ems-engine/src/main/java/it/integry/ems/system/service/SystemService.java
index d976d69c0a..697489e981 100644
--- a/ems-engine/src/main/java/it/integry/ems/system/service/SystemService.java
+++ b/ems-engine/src/main/java/it/integry/ems/system/service/SystemService.java
@@ -7,7 +7,6 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import it.integry.common.var.CommonConstants;
 import it.integry.ems._context.ApplicationContextProvider;
 import it.integry.ems.datasource.DataSource;
 import it.integry.ems.javabeans.RequestDataDTO;
@@ -21,7 +20,6 @@ import it.integry.ems.response.EsitoType;
 import it.integry.ems.response.FileItem;
 import it.integry.ems.response.ServiceRestResponse;
 import it.integry.ems.service.EntityProcessor;
-import it.integry.ems.service.HttpRestWrapper;
 import it.integry.ems.service.MailService;
 import it.integry.ems.settings.Model.AvailableConnectionsModel;
 import it.integry.ems.settings.Model.SettingsModel;
@@ -49,7 +47,6 @@ import it.integry.ems_model.utility.*;
 import it.integry.security.utility.CryptoUtils;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.entity.ContentType;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.docx4j.Docx4J;
@@ -74,7 +71,6 @@ import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Types;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -368,7 +364,13 @@ public class SystemService {
             List<String> profilesWhereUserFound = new ArrayList<>();
             for (String profile : profiles) {
                 String dbName = settingsModel.getDbNameFromProfileDb(profile);
-                UserDTO foundUser = userCacheService.retrieveUser(dbName, username, password, requestDataDTO.getApplication());
+
+                UserDTO foundUser = null;
+                //MD5 utilizzato da Ordikids
+                if (UtilityString.isNullOrEmpty(password) && !UtilityString.isNullOrEmpty(md5User)) {
+                    foundUser = userCacheService.retrieveUser(dbName, md5User);
+                } else
+                    foundUser = userCacheService.retrieveUser(dbName, username, password, requestDataDTO.getApplication());
 
                 if (foundUser == null || !foundUser.isAttivo())
                     continue;
@@ -382,20 +384,21 @@ public class SystemService {
                 }
 
                 StbUser finalStbUser = stbUser;
+                UserDTO finalFoundUser = foundUser;
                 userData = new HashMap<String, Object>() {{
-                    put("flag_attivo", foundUser.isAttivo() ? "S" : "N");
-                    put("user_name", foundUser.getUsername());
-                    put("fullName", foundUser.getFullname());
-                    put("full_name", foundUser.getFullname());
+                    put("flag_attivo", finalFoundUser.isAttivo() ? "S" : "N");
+                    put("user_name", finalFoundUser.getUsername());
+                    put("fullName", finalFoundUser.getFullname());
+                    put("full_name", finalFoundUser.getFullname());
                     put("cod_lang", finalStbUser.getCodLang());
-                    put("cod_mdep", foundUser.getCodMdep());
+                    put("cod_mdep", finalFoundUser.getCodMdep());
                     put("profile_db", profile);
                     put("password_endtime", finalStbUser.getPasswordEndtime());
-                    put("user_code", foundUser.getUserCode());
-                    put("e_mail", foundUser.getEmail());
+                    put("user_code", finalFoundUser.getUserCode());
+                    put("e_mail", finalFoundUser.getEmail());
                     put("flag_password_expiring", finalStbUser.getFlagPasswordExpiring());
                     put("Last_access_datetime", finalStbUser.getLastAccessDatetime());
-                    put("key_group", foundUser.getKeyGroup());
+                    put("key_group", finalFoundUser.getKeyGroup());
 
                 }};