Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[SELC-6300] feat: add role ADMIN_EA_IO" #246

Merged
merged 1 commit into from
Feb 6, 2025
Merged

Revert "[SELC-6300] feat: add role ADMIN_EA_IO" #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<packaging>pom</packaging>

<properties>
<onboarding-sdk.version>0.6.8</onboarding-sdk.version>
<onboarding-sdk.version>0.4.1</onboarding-sdk.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion apps/user-group-ms/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<description>Microservice to manage Self Care User Group</description>

<properties>
<selc-commons.version>2.5.6</selc-commons.version>
<selc-commons.version>2.5.1</selc-commons.version>
<sonar.host.url>https://sonarcloud.io/</sonar.host.url>
<sonar.skip>true</sonar.skip>
</properties>
Expand Down
14 changes: 7 additions & 7 deletions apps/user-ms/src/main/docs/openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,7 +981,7 @@
"name" : "role",
"in" : "query",
"schema" : {
"description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO",
"description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA",
"type" : "string"
}
}, {
Expand Down Expand Up @@ -1518,7 +1518,7 @@
"type" : "string"
},
"role" : {
"description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO",
"description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA",
"type" : "string"
},
"env" : {
Expand Down Expand Up @@ -1552,7 +1552,7 @@
"type" : "string"
},
"role" : {
"description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO",
"description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA",
"type" : "string"
},
"env" : {
Expand Down Expand Up @@ -1619,7 +1619,7 @@
"type" : "string"
},
"role" : {
"description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO",
"description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA",
"type" : "string"
},
"tokenId" : {
Expand All @@ -1645,7 +1645,7 @@
"type" : "string"
},
"role" : {
"description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO",
"description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA",
"type" : "string"
},
"tokenId" : {
Expand Down Expand Up @@ -1849,7 +1849,7 @@
"type" : "string"
},
"role" : {
"description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO",
"description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA",
"type" : "string"
},
"status" : {
Expand Down Expand Up @@ -1987,7 +1987,7 @@
"type" : "string"
},
"role" : {
"description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO",
"description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA",
"type" : "string"
},
"productRole" : {
Expand Down
14 changes: 7 additions & 7 deletions apps/user-ms/src/main/docs/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ paths:
in: query
schema:
description: "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR,\
\ ADMIN_EA, ADMIN_EA_IO"
\ ADMIN_EA"
type: string
- name: status
in: query
Expand Down Expand Up @@ -1096,7 +1096,7 @@ components:
type: string
role:
description: "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR,\
\ ADMIN_EA, ADMIN_EA_IO"
\ ADMIN_EA"
type: string
env:
$ref: "#/components/schemas/Env"
Expand Down Expand Up @@ -1126,7 +1126,7 @@ components:
type: string
role:
description: "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR,\
\ ADMIN_EA, ADMIN_EA_IO"
\ ADMIN_EA"
type: string
env:
$ref: "#/components/schemas/Env"
Expand Down Expand Up @@ -1183,7 +1183,7 @@ components:
type: string
role:
description: "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR,\
\ ADMIN_EA, ADMIN_EA_IO"
\ ADMIN_EA"
type: string
tokenId:
type: string
Expand All @@ -1205,7 +1205,7 @@ components:
type: string
role:
description: "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR,\
\ ADMIN_EA, ADMIN_EA_IO"
\ ADMIN_EA"
type: string
tokenId:
type: string
Expand Down Expand Up @@ -1348,7 +1348,7 @@ components:
type: string
role:
description: "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR,\
\ ADMIN_EA, ADMIN_EA_IO"
\ ADMIN_EA"
type: string
status:
$ref: "#/components/schemas/OnboardedProductState"
Expand Down Expand Up @@ -1444,7 +1444,7 @@ components:
type: string
role:
description: "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR,\
\ ADMIN_EA, ADMIN_EA_IO"
\ ADMIN_EA"
type: string
productRole:
type: string
Expand Down
2 changes: 1 addition & 1 deletion apps/user-ms/src/main/java/it/pagopa/selfcare/user/controller/UserController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public Uni<Void> deleteProducts(@PathParam(value = "userId") String userId,
public Uni<Response> updateUserStatus(@PathParam(value = "id") String userId,
@QueryParam(value = "institutionId") String institutionId,
@QueryParam(value = "productId") String productId,
@Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO") @QueryParam(value = "role") String role,
@Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA") @QueryParam(value = "role") String role,
@QueryParam(value = "productRole") String productRole,
@QueryParam(value = "status") OnboardedProductState status) {
log.debug("updateProductStatus - userId: {}", userId);
Expand Down
2 changes: 1 addition & 1 deletion apps/user-ms/src/main/java/it/pagopa/selfcare/user/controller/request/AddUserRoleDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static class Product {
private String productId;

@NotNull(message = "role is required")
@Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO")
@Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA")
private String role;

private String tokenId;
Expand Down
2 changes: 1 addition & 1 deletion apps/user-ms/src/main/java/it/pagopa/selfcare/user/controller/request/CreateUserDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static class Product {
private String productId;

@NotNull(message = "role is required")
@Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO")
@Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA")
private String role;

private String tokenId;
Expand Down
2 changes: 1 addition & 1 deletion ...s/src/main/java/it/pagopa/selfcare/user/controller/response/OnboardedProductResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class OnboardedProductResponse {
private String tokenId;
private OnboardedProductState status;
private String productRole;
@Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO")
@Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA")
private String role;
private Env env;
private OffsetDateTime createdAt;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/it/pagopa/selfcare/user/controller/response/UserInstitutionRoleResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class UserInstitutionRoleResponse {
private String institutionId;
private String institutionName;
private String institutionRootName;
@Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO")
@Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA")
private String role;
private OnboardedProductState status;
}
2 changes: 1 addition & 1 deletion ...java/it/pagopa/selfcare/user/controller/response/product/OnboardedProductWithActions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class OnboardedProductWithActions {
private String tokenId;
private OnboardedProductState status;
private String productRole;
@Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO")
@Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA")
private String role;
private Env env = ROOT;
private OffsetDateTime createdAt;
Expand Down
14 changes: 0 additions & 14 deletions apps/user-ms/src/main/resources/role_action_mapping.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,20 +60,6 @@
"Selc:ViewInstitutionData",
"Selc:UpdateInstitutionData"
],
"ADMIN_EA_IO": [
"Selc:UploadLogo",
"Selc:ViewBilling",
"Selc:ListActiveProducts",
"Selc:AccessProductBackoffice",
"Selc:ViewManagedInstitutions",
"Selc:ViewDelegations",
"Selc:ManageProductUsers",
"Selc:ListProductUsers",
"Selc:ManageProductGroups",
"Selc:CreateDelegation",
"Selc:ViewInstitutionData",
"Selc:UpdateInstitutionData"
],
"OPERATOR": [
"Selc:ViewBilling",
"Selc:AccessProductBackoffice",
Expand Down
2 changes: 1 addition & 1 deletion apps/user-ms/src/test/java/it/pagopa/selfcare/user/service/UserServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1324,7 +1324,7 @@ void createUserFromOnboardingByUserIdInvalidRole() {

userService.createUserByUserId(addUserRoleDto, "userId", loggedUser)
.subscribe().withSubscriber(UniAssertSubscriber.create())
.assertFailedWith(InvalidRequestException.class, "Invalid role: INVALID. Allowed value are: [MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO]");
.assertFailedWith(InvalidRequestException.class, "Invalid role: INVALID. Allowed value are: [MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA]");
}


Expand Down
3 changes: 1 addition & 2 deletions apps/user-ms/src/test/java/it/pagopa/selfcare/user/util/ActionMapRetrieverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ void retrieveActionsMap_returnsCorrectActionsMap() {

// Then
assertNotNull(actionMapRetriever.getUserActionsMap());
assertEquals(6, actionMapRetriever.getUserActionsMap().size());
assertEquals(5, actionMapRetriever.getUserActionsMap().size());
assertTrue(actionMapRetriever.getUserActionsMap().containsKey(PartyRole.MANAGER.name()));
assertTrue(actionMapRetriever.getUserActionsMap().containsKey(PartyRole.DELEGATE.name()));
assertTrue(actionMapRetriever.getUserActionsMap().containsKey(PartyRole.ADMIN_EA.name()));
assertTrue(actionMapRetriever.getUserActionsMap().containsKey(PartyRole.ADMIN_EA_IO.name()));
assertTrue(actionMapRetriever.getUserActionsMap().containsKey(PartyRole.SUB_DELEGATE.name()));
assertTrue(actionMapRetriever.getUserActionsMap().containsKey(PartyRole.OPERATOR.name()));

Expand Down
4 changes: 0 additions & 4 deletions apps/user-ms/src/test/resources/role_action_mapping_test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
"Selc:ViewBilling",
"Selc:RequestProductAccess"
],
"ADMIN_EA_IO": [
"Selc:UploadLogo",
"Selc:ViewBilling"
],
"OPERATOR": [
"Selc:ViewBilling"
]
Expand Down
2 changes: 1 addition & 1 deletion libs/user-sdk-event/src/main/java/it/pagopa/selfcare/user/model/UserToNotify.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class UserToNotify {
private String name;
private String familyName;
private String email;
@Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO")
@Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA")
private String role;
private String productRole;
private List<String> roles;
Expand Down
2 changes: 1 addition & 1 deletion libs/user-sdk-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<dependency>
<groupId>it.pagopa.selfcare</groupId>
<artifactId>onboarding-sdk-common</artifactId>
<version>0.6.8</version>
<version>0.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
Loading