QA-4816: updated token-2.yaml

pagopa · Dec 11, 2024 · b663528 · b663528
1 parent e59f8e8
commit b663528
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/interop-qa-tests/config/token-2.yaml b/interop-qa-tests/config/token-2.yaml
@@ -11,7 +11,7 @@ userRoles:
   admin: "f07ddb8f-17f9-47d4-b31e-35d1ac10e521"
   api: "17a84b7b-dce6-4b8f-a1ae-85926c55f02e"
   security: "e0477bcc-3baf-4755-aa31-375c051acb44"
-  apiSecurity: "e490f02e-9429-4b38-bb11-ddb8a561fb62"
+  "api,security": "e490f02e-9429-4b38-bb11-ddb8a561fb62"
   support: "e0477bcc-3baf-4755-aa31-375c051acb44"
 ---
 name: "GSP2"
@@ -27,7 +27,7 @@ userRoles:
     admin: "f07ddb8f-17f9-47d4-b31e-35d1ac10e521"
     api: "17a84b7b-dce6-4b8f-a1ae-85926c55f02e"
     security: "e0477bcc-3baf-4755-aa31-375c051acb44"
-    apiSecurity: "e490f02e-9429-4b38-bb11-ddb8a561fb62"
+    "api,security": "e490f02e-9429-4b38-bb11-ddb8a561fb62"
     support: "e0477bcc-3baf-4755-aa31-375c051acb44"
 ---
 name: "PA1"
@@ -43,7 +43,7 @@ userRoles:
     admin: "f07ddb8f-17f9-47d4-b31e-35d1ac10e521"
     api: "c7dc1a86-31f6-4fe9-89cd-184201e29d75"
     security: "17a84b7b-dce6-4b8f-a1ae-85926c55f02e"
-    apiSecurity: "e0477bcc-3baf-4755-aa31-375c051acb44"
+    "api,security": "e0477bcc-3baf-4755-aa31-375c051acb44"
     support: "17a84b7b-dce6-4b8f-a1ae-85926c55f02e"
 ---
 name: "PA2"
@@ -59,7 +59,7 @@ userRoles:
     admin: "4ea722c3-defd-4372-a0c4-b4613072b632"
     api: "34f3b33a-afac-421c-8044-690469f15cc5"
     security: "78b9aa62-a472-4c87-8173-3f73bb2e04b5"
-    apiSecurity: "e490f02e-9429-4b38-bb11-ddb8a561fb62"
+    "api,security": "e490f02e-9429-4b38-bb11-ddb8a561fb62"
     support: "78b9aa62-a472-4c87-8173-3f73bb2e04b5"
 ---
 name: "Privato"
@@ -75,5 +75,5 @@ userRoles:
     admin: "c27e3508-3d26-4b6b-9c73-54cb38e6fe1b"
     api: "e0477bcc-3baf-4755-aa31-375c051acb44"
     security: "e490f02e-9429-4b38-bb11-ddb8a561fb62"
-    apiSecurity: "17a84b7b-dce6-4b8f-a1ae-85926c55f02e"
+    "api,security": "17a84b7b-dce6-4b8f-a1ae-85926c55f02e"
     support: "e490f02e-9429-4b38-bb11-ddb8a561fb62"
diff --git a/interop-qa-tests/src/main/java/it/pagopa/interop/authorization/domain/Role.java b/interop-qa-tests/src/main/java/it/pagopa/interop/authorization/domain/Role.java
@@ -1,11 +1,19 @@
 package it.pagopa.interop.authorization.domain;
 
+import lombok.Getter;
+
+@Getter
 public enum Role {
     ADMIN("admin"),
     API("api"),
     SECURITY("security"),
     SUPPORT("support"),
     API_SECURITY("api,security");
 
-    Role(String admin) {}
+    private String value;
+
+    Role(String value) {
+        this.value = value;
+    }
+
 }
diff --git a/.../test/java/it/pagopa/pn/interop/cucumber/steps/authorization/ClientPurposeRemoveStep.java b/.../test/java/it/pagopa/pn/interop/cucumber/steps/authorization/ClientPurposeRemoveStep.java
@@ -8,6 +8,8 @@
 import it.pagopa.pn.interop.cucumber.steps.utils.DataPreparationService;
 import it.pagopa.pn.interop.cucumber.steps.utils.HttpCallExecutor;
 
+import java.util.UUID;
+
 public class ClientPurposeRemoveStep {
 
     private final IAuthorizationClient authorizationClient;
@@ -39,7 +41,7 @@ public void addPurposeToClient(String tenantType) {
     public void archivePurpose(String tenantType) {
         httpCallExecutor
                 .performCall(() -> dataPreparationService.archivePurpose(clientCommonSteps.getClients().get(0),
-                        purposeCommonContext.getVersionId()));
+                        UUID.fromString(purposeCommonContext.getVersionId())));
     }
 
     @When("l'utente richiede la disassociazione della finalità dal client")