diff --git a/ems-core/src/main/java/it/integry/ems/javabeans/RequestDataDTO.java b/ems-core/src/main/java/it/integry/ems/javabeans/RequestDataDTO.java index db631eb3a4..4431c9d56e 100644 --- a/ems-core/src/main/java/it/integry/ems/javabeans/RequestDataDTO.java +++ b/ems-core/src/main/java/it/integry/ems/javabeans/RequestDataDTO.java @@ -117,6 +117,10 @@ public class RequestDataDTO { } public boolean isValidPassword() { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (authentication != null && !(authentication instanceof AnonymousAuthenticationToken)) + return true; + return !UtilityString.isNullOrEmpty(password); } diff --git a/ems-engine/src/main/java/it/integry/ems/logistic/service/SmartLogisticService.java b/ems-engine/src/main/java/it/integry/ems/logistic/service/SmartLogisticService.java index 6d2f292131..e6fb0a7c00 100644 --- a/ems-engine/src/main/java/it/integry/ems/logistic/service/SmartLogisticService.java +++ b/ems-engine/src/main/java/it/integry/ems/logistic/service/SmartLogisticService.java @@ -10,7 +10,6 @@ import it.integry.ems.response.FileItem; import it.integry.ems.response.ServiceRestResponse; import it.integry.ems.service.EntityProcessor; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; -import it.integry.ems.user.UtilityUser; import it.integry.ems.utility.BarcodeUtility; import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.db.ResultSetMapper; @@ -334,8 +333,6 @@ public class SmartLogisticService { public FileItem getInfoArticolo(String username, String password, String codDepo, String codDepoClie, String barcode) throws Exception { - UtilityUser.checkUserWeb(multiDBTransactionManager.getPrimaryConnection(), username, password); - FileItem fileItem = null; String sql = "select giacenza.cod_mart, giacenza.cod_col, giacenza.cod_tagl, " + diff --git a/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmAccettazioneService.java b/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmAccettazioneService.java index a5fc6be31f..44ff51d7fb 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmAccettazioneService.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmAccettazioneService.java @@ -51,8 +51,6 @@ public class PvmAccettazioneService { final String gestione = "A"; List entityList = new ArrayList<>(); - UtilityUser.checkUserWeb(multiDBTransactionManager.getPrimaryConnection(), requestDataDTO.getUsername(), requestDataDTO.getPassword()); - String codDtipFatNoRic = getAndCheckTipoDoc("COD_DTIP_FATT_NO_RIC"); String codDtipFatNoRicNC = getAndCheckTipoDoc("COD_DTIP_FATT_NO_RIC_NC"); String codDtipRicNoFatResa = getAndCheckTipoDoc("COD_DTIP_RIC_NO_FAT_RESA"); diff --git a/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmPropostaOrdineService.java b/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmPropostaOrdineService.java index 1f2f42fcce..6929ed1c3a 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmPropostaOrdineService.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmPropostaOrdineService.java @@ -4,7 +4,6 @@ import it.integry.ems.javabeans.RequestDataDTO; import it.integry.ems.retail.pvmRetail.dto.save.PropostaOrdineDTO; import it.integry.ems.service.EntityProcessor; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; -import it.integry.ems.user.UtilityUser; import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.entity.DtbOrdr; import it.integry.ems_model.entity.DtbOrdt; @@ -40,7 +39,6 @@ public class PvmPropostaOrdineService { String username = requestDataDTO.getUsername(); String password = requestDataDTO.getPassword(); List ordini = new ArrayList(); - UtilityUser.checkUserWeb(multiDBTransactionManager.getPrimaryConnection(), username, password); String codMdep = pvmService.getCodMdep(username); DtbOrdt dtbOrdt; diff --git a/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmServiceSave.java b/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmServiceSave.java index 3bb340fe78..b3461ac77f 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmServiceSave.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmServiceSave.java @@ -64,7 +64,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Statement; import java.text.SimpleDateFormat; -import java.time.LocalDate; import java.util.*; import static it.integry.common.var.CommonConstants.DATE_FORMAT_YMD; @@ -100,8 +99,6 @@ public class PvmServiceSave { public List SM2Save(SaveDTO saveDTO) throws Exception { - UtilityUser.checkUserWeb(multiDBTransactionManager.getPrimaryConnection(), requestDataDTO.getUsername(), requestDataDTO.getPassword()); - String gestione = saveDTO.getGestione(); String idDisp = saveDTO.getIdDisp(); String zona = saveDTO.getZona(); @@ -161,9 +158,6 @@ public class PvmServiceSave { } public List saveTerminalino(String xmlInput) throws Exception { - - UtilityUser.checkUserWeb(multiDBTransactionManager.getPrimaryConnection(), requestDataDTO.getUsername(), requestDataDTO.getPassword()); - Document doc = UtilityXML.convertStringToDocument(xmlInput); XPath xPath = XPathFactory.newInstance().newXPath();