Merge branch 'develop' into feature/JDK11

ems-core/src/main/java/it/integry/ems/javabeans/RequestDataDTO.java

@@ -42,7 +42,7 @@ public class RequestDataDTO {
     private String password;
     private boolean includeNulls = false;
 
-    private IntegryApplicationEnum integryApplication = IntegryApplicationEnum.PVM;
+    private IntegryApplicationEnum integryApplication;
 
     private UserDTO userDTO;
 

ems-core/src/main/java/it/integry/ems/model/IntegryApplicationEnum.java

@@ -6,10 +6,10 @@ public enum IntegryApplicationEnum {
     PVM("845da2d9-f2f9-4f8d-ad5b-34b65a91eb6d"),
     WMS("fa3a21af-606b-4129-a22b-aedc2a52c7b6"),
     TASK("478f3a4c51824ad23cb50c1c60670c0f"),
-    CRM("f0484398-1f8b-42f5-ab79-5282c164e1d8"),
+    SALESBOOK("f0484398-1f8b-42f5-ab79-5282c164e1d8"),
     CONSEGNA("c012124f-4f11-471c-ae12-81bd4a97626c");
 
-    private String text;
+    private final String text;
 
     IntegryApplicationEnum(String text) {
         this.text = text;

ems-core/src/main/java/it/integry/ems/user/service/UserCacheService.java

@@ -147,7 +147,7 @@ public class UserCacheService {
                                     (application == IntegryApplicationEnum.CONSEGNA && x.isWeb()) ||
                                     (application == IntegryApplicationEnum.WMS && x.isWeb()) ||
                                     (application == IntegryApplicationEnum.TASK && x.isWeb()) ||
-                                    (application == IntegryApplicationEnum.CRM && x.isWeb()) ||
+                                    (application == IntegryApplicationEnum.SALESBOOK && x.isWeb()) ||
                                     (application == IntegryApplicationEnum.GESTIONALE_BASE && x.isInternal())))
                     .findFirst();
 
@@ -174,7 +174,7 @@ public class UserCacheService {
                                     (application == IntegryApplicationEnum.CONSEGNA && x.isWeb()) ||
                                     (application == IntegryApplicationEnum.WMS && x.isWeb()) ||
                                     (application == IntegryApplicationEnum.TASK && x.isWeb()) ||
-                                    (application == IntegryApplicationEnum.CRM && x.isWeb()) ||
+                                    (application == IntegryApplicationEnum.SALESBOOK && x.isWeb()) ||
                                     (application == IntegryApplicationEnum.GESTIONALE_BASE && x.isInternal())))
                     .findFirst();
 

ems-core/src/main/java/it/integry/security/service/AuthService.java

@@ -81,6 +81,10 @@ public class AuthService {
             throw new Exception("Device id mancante.");
         }
 
+        if (requestDataDTO.getApplication() == null) {
+            throw new Exception("X-App-Token mancante.");
+        }
+
         String username = loginRequestDTO.getUsername();
         String password = loginRequestDTO.getPassword();
         String deviceId = loginRequestDTO.getDeviceId();

ems-engine/src/main/java/it/integry/ems/system/service/SystemService.java

@@ -214,7 +214,7 @@ public class SystemService {
                 case GESTIONALE_BASE:
                     sql += " WHERE ( stb_user.flag_intra_user = 'S' OR stb_user.flag_dba = 's') ";
                     break;
-                case PVM:
+                default:
                     sql += " WHERE ( stb_user.flag_intra_user = 'S' OR stb_user.flag_extra_user = 's') ";
                     break;
             }