admin role fixes

eclipse-tractusx · Oct 31, 2023 · b4e4dfc · b4e4dfc
1 parent 51980f2
commit b4e4dfc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.../demandcapacitymgmt/demandcapacitymgmtbackend/services/impl/SecurityTokenServiceImpl.java b/.../demandcapacitymgmt/demandcapacitymgmtbackend/services/impl/SecurityTokenServiceImpl.java
@@ -25,6 +25,7 @@
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.interfaces.Claim;
 import com.auth0.jwt.interfaces.DecodedJWT;
+import com.fasterxml.uuid.Logger;
 import eclipse.tractusx.demand_capacity_mgmt_specification.model.IntrospectTokenResponse;
 import eclipse.tractusx.demand_capacity_mgmt_specification.model.Role;
 import eclipse.tractusx.demand_capacity_mgmt_specification.model.TokenResponse;
@@ -230,19 +231,17 @@ private UserEntity generateUser(String userID, DecodedJWT decodedJWT) {
 
         Object rolesObject = realmAccessMap.get("roles");
 
-        if (rolesObject instanceof List<?>) {
-            List<?> list = (List<?>) rolesObject;
+        if (rolesObject instanceof List<?> list) {
             for (Object roleObj : list) {
-                if (roleObj instanceof String) {
-                    String roleStr = (String) roleObj;
+                if (roleObj instanceof String roleStr) {
                     try {
                         org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.enums.Role role = org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.enums.Role.valueOf(
                             roleStr
                         );
                         newUserEntity.setRole(role);
                         break;
                     } catch (IllegalArgumentException e) {
-                        throw new RuntimeException("Illegal Role detected! User must have one of the role types");
+                        Logger.logError("Incompatible role! User must have one of the 3 role types 'ADMIN','CUSTOMER','SUPPLIER'");
                     }
                 }
             }

diff --git a/demand-capacity-mgmt-specification/src/main/resources/openapi.yml b/demand-capacity-mgmt-specification/src/main/resources/openapi.yml
@@ -918,6 +918,7 @@ components:
       enum:
         - CUSTOMER
         - SUPPLIER
+        - ADMIN
     TokenResponse:
       type: object
       properties: