From 46e2c5ad9671a291be92cb6d13b0f4888bab3dcf Mon Sep 17 00:00:00 2001 From: kanapriya Date: Tue, 12 Dec 2023 17:00:15 +0530 Subject: [PATCH] Address review comments Update org mgt version Update the models --- .../common/UserInvitationMgtConstants.java | 2 +- .../v1/model/InvitationRequestBody.java | 4 ++-- .../InvitationSuccessResponseResult.java | 2 +- .../v1/core/GuestApiServiceCore.java | 20 +++++++++---------- .../organization-user-invitation.yaml | 4 ++-- pom.xml | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/common/UserInvitationMgtConstants.java b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/common/UserInvitationMgtConstants.java index 6b0e2f9b70..4396a7653b 100644 --- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/common/UserInvitationMgtConstants.java +++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/common/UserInvitationMgtConstants.java @@ -24,7 +24,7 @@ public class UserInvitationMgtConstants { public static final String ERROR_PREFIX = "OUI-"; - public static final String ERROR_FAIL_STATUS = "Fail"; + public static final String ERROR_FAIL_STATUS = "Failed"; /** * Enum for shared user invitation management related errors. diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/model/InvitationRequestBody.java b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/model/InvitationRequestBody.java index cf4bad3bdd..49627f0bb2 100644 --- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/model/InvitationRequestBody.java +++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/model/InvitationRequestBody.java @@ -41,7 +41,7 @@ public class InvitationRequestBody { /** - * List of username of the user's who will be invited to the organization. This can be an email or an alphanumeric username. + * List of usernames of the users who will be invited to the organization. This can be an email or an alphanumeric username. **/ public InvitationRequestBody usernames(List usernames) { @@ -49,7 +49,7 @@ public InvitationRequestBody usernames(List usernames) { return this; } - @ApiModelProperty(required = true, value = "List of username of the user's who will be invited to the organization. This can be an email or an alphanumeric username.") + @ApiModelProperty(required = true, value = "List of usernames of the users who will be invited to the organization. This can be an email or an alphanumeric username.") @JsonProperty("usernames") @Valid @NotNull(message = "Property usernames cannot be null.") diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/model/InvitationSuccessResponseResult.java b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/model/InvitationSuccessResponseResult.java index a52911e4d0..7e74c83e87 100644 --- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/model/InvitationSuccessResponseResult.java +++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/model/InvitationSuccessResponseResult.java @@ -48,7 +48,7 @@ public InvitationSuccessResponseResult status(String status) { return this; } - @ApiModelProperty(example = "Success/Fail", value = "") + @ApiModelProperty(example = "Successful/Failed", value = "") @JsonProperty("status") @Valid public String getStatus() { diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/core/GuestApiServiceCore.java b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/core/GuestApiServiceCore.java index 84a1a56e38..fcd02f1d8e 100644 --- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/core/GuestApiServiceCore.java +++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/core/GuestApiServiceCore.java @@ -33,21 +33,21 @@ import org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.model.RoleAssignmentResponse; import org.wso2.carbon.identity.organization.user.invitation.management.InvitationCoreServiceImpl; import org.wso2.carbon.identity.organization.user.invitation.management.exception.UserInvitationMgtException; -import org.wso2.carbon.identity.organization.user.invitation.management.models.CreatedInvitation; import org.wso2.carbon.identity.organization.user.invitation.management.models.Invitation; import org.wso2.carbon.identity.organization.user.invitation.management.models.InvitationDO; +import org.wso2.carbon.identity.organization.user.invitation.management.models.InvitationResult; import org.wso2.carbon.identity.organization.user.invitation.management.models.RoleAssignments; import java.util.ArrayList; import java.util.List; import javax.ws.rs.core.Response; -import static org.wso2.carbon.identity.organization.user.invitation.management.constant.UserInvitationMgtConstants.ErrorMessage.ERROR_CODE_MULTIPLE_INVITATIONS_FOR_USER; import static org.wso2.carbon.identity.organization.user.invitation.management.constant.UserInvitationMgtConstants.ErrorMessage.ERROR_CODE_INVALID_CONFIRMATION_CODE; import static org.wso2.carbon.identity.organization.user.invitation.management.constant.UserInvitationMgtConstants.ErrorMessage.ERROR_CODE_INVALID_FILTER; import static org.wso2.carbon.identity.organization.user.invitation.management.constant.UserInvitationMgtConstants.ErrorMessage.ERROR_CODE_INVALID_INVITATION_ID; import static org.wso2.carbon.identity.organization.user.invitation.management.constant.UserInvitationMgtConstants.ErrorMessage.ERROR_CODE_INVALID_ROLE; import static org.wso2.carbon.identity.organization.user.invitation.management.constant.UserInvitationMgtConstants.ErrorMessage.ERROR_CODE_INVALID_USER; +import static org.wso2.carbon.identity.organization.user.invitation.management.constant.UserInvitationMgtConstants.ErrorMessage.ERROR_CODE_MULTIPLE_INVITATIONS_FOR_USER; import static org.wso2.carbon.identity.organization.user.invitation.management.constant.UserInvitationMgtConstants.ErrorMessage.ERROR_CODE_STORE_ROLES_APP_ID_INVALID; import static org.wso2.carbon.identity.organization.user.invitation.management.constant.UserInvitationMgtConstants.ErrorMessage.ERROR_CODE_UNSUPPORTED_FILTER_ATTRIBUTE; import static org.wso2.carbon.identity.organization.user.invitation.management.constant.UserInvitationMgtConstants.ErrorMessage.ERROR_CODE_UNSUPPORTED_FILTER_ATTRIBUTE_VALUE; @@ -102,7 +102,7 @@ public List createInvitation(InvitationRequestBody in } invitation.setRoleAssignments(roleAssignments.toArray(new RoleAssignments[0])); } - List invitationResponse; + List invitationResponse; try { invitationResponse = invitationCoreService.createInvitations(invitation); } catch (UserInvitationMgtException e) { @@ -247,19 +247,19 @@ private String includeData(UserInvitationMgtConstants.ErrorMessage error, String return error.getDescription(); } - private List createInvitationSuccessResponse(List invitationList) { + private List createInvitationSuccessResponse(List invitationList) { List invitationSuccessResponseList = new ArrayList<>(); - for (CreatedInvitation invitation : invitationList) { + for (InvitationResult invitation : invitationList) { InvitationSuccessResponse invitationSuccessResponse = new InvitationSuccessResponse(); InvitationSuccessResponseResult invitationSuccessResponseResult = new InvitationSuccessResponseResult(); - if (UserInvitationMgtConstants.ERROR_FAIL_STATUS.equals(invitation.getResult().getStatus())) { - invitationSuccessResponseResult.setErrorCode(invitation.getResult().getErrorMsg().getCode()); - invitationSuccessResponseResult.setErrorMessage(invitation.getResult().getErrorMsg().getMessage()); - invitationSuccessResponseResult.setErrorDescription(invitation.getResult().getErrorMsg() + if (UserInvitationMgtConstants.ERROR_FAIL_STATUS.equals(invitation.getStatus())) { + invitationSuccessResponseResult.setErrorCode(invitation.getErrorMsg().getCode()); + invitationSuccessResponseResult.setErrorMessage(invitation.getErrorMsg().getMessage()); + invitationSuccessResponseResult.setErrorDescription(invitation.getErrorMsg() .getDescription()); } - invitationSuccessResponseResult.setStatus(invitation.getResult().getStatus()); + invitationSuccessResponseResult.setStatus(invitation.getStatus()); invitationSuccessResponse.setUsername(invitation.getUsername()); invitationSuccessResponse.setResult(invitationSuccessResponseResult); invitationSuccessResponseList.add(invitationSuccessResponse); diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/resources/organization-user-invitation.yaml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/resources/organization-user-invitation.yaml index a84d1b48c7..d2e43e797d 100644 --- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/resources/organization-user-invitation.yaml +++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/resources/organization-user-invitation.yaml @@ -300,7 +300,7 @@ components: properties: usernames: type: array - description: List of username of the user's who will be invited to the organization. This can be an email or an alphanumeric username. + description: List of usernames of the users who will be invited to the organization. This can be an email or an alphanumeric username. items: type: string example: xyz@gmail.com, abc@gmail.com @@ -335,7 +335,7 @@ components: properties: status: type: string - example: Success/Fail + example: Successful/Failed errorCode: type: string example: OUI-00000 diff --git a/pom.xml b/pom.xml index 7dfa6b0a67..bd28144fba 100644 --- a/pom.xml +++ b/pom.xml @@ -782,7 +782,7 @@ - 1.3.131 + 1.3.136