Fix Getting 500 error response for client errors in SCIM/Groups PATCH #478
Conversation
PasinduYeshan
changed the title
...y.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java
Outdated
Show resolved
Hide resolved
| @@ -3366,6 +3367,11 @@ private void doPatchGroup(String groupId, String currentGroupName, Map<String, L | |||
| temporaryMembers.clear(); | |||
|
|
|||
| for (String member : deletedMembers) { | |||
| if (addedMembers.isEmpty() && (member == null || member.isEmpty())) { | |||
There was a problem hiding this comment.
let's refactor this.
eg:
for (String member : deletedMembers) {
if (addedMembers.isEmpty() && StringUtils.isBlank(member)) {
throw new BadRequestException(ResponseCodeConstants.INVALID_VALUE);
}
if (StringUtils.isNotBlank(member)) {
String username = UserCoreUtil.addDomainToName(UserCoreUtil.removeDomainFromName(member), userStoreDomainForGroup);
temporaryMembers.add(username);
}
}There was a problem hiding this comment.
Refactored in this fedd887
.github/workflows/pr-builder.yml
Outdated
| @@ -19,7 +19,7 @@ jobs: | |||
|
|
|||
| strategy: | |||
| matrix: | |||
| java-version: [ 11, 17 ] | |||
| java-version: [ 11.0.19+7 ] | |||
There was a problem hiding this comment.
any reason for removing java version 17?
There was a problem hiding this comment.
I followed this https://github.com/wso2-extensions/identity-inbound-auth-oauth/blob/6cb4c30737e62537aad1d94c07e88283dcf80198/.github/workflows/pr-builder.yml#L23 as a workaround for the build failure.
There was a problem hiding this comment.
include jdk-17.0.7+7 as well
There was a problem hiding this comment.
Added in bea2a6a
| if (e instanceof org.wso2.carbon.user.core.UserStoreException && StringUtils | ||
| .equals(UserCoreErrorConstants.ErrorMessages.ERROR_CODE_NON_EXISTING_USER.getCode(), | ||
| ((org.wso2.carbon.user.core.UserStoreException) e).getErrorCode())) { | ||
| throw new BadRequestException(ResponseCodeConstants.INVALID_VALUE); |
There was a problem hiding this comment.
why aren't we passing the throwable?
There was a problem hiding this comment.
public class BadRequestException extends AbstractCharonException {
public BadRequestException() {
this("invalid request");
}
public BadRequestException(String scimType) {
this("Request is unparsable, syntactically incorrect, or violates schema.", scimType);
}
public BadRequestException(String details, String scimType) {
super(400, details, scimType);
}
}
This is the implementation of BadRequestException. There's no way to pass the throwable to the BadRequestException.
There was a problem hiding this comment.
Added a log with the throwable as suggested offline.
|
PR builder started |
|
PR builder completed |
|
PR builder started |
|
PR builder completed |
There was a problem hiding this comment.
Approving the pull request based on the successful pr build https://github.com/wso2/product-is/actions/runs/5808197251
Purpose
This PR aims to address the issues mentioned in wso2/product-is#16097.
Goals
The goals of this PR are to:
remove and add a userscenario by using the user ID. However, this was working with the user display name.