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

Improve tenant qualified URL feature. #487

Merged
merged 1 commit into from
Oct 17, 2023
Merged

Improve tenant qualified URL feature. #487

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 ...im2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ private static String getTenantDomain() {

String tenantDomain;
if (IdentityTenantUtil.isTenantQualifiedUrlsEnabled()) {
tenantDomain = IdentityTenantUtil.getTenantDomainFromContext();
tenantDomain = getTenantDomainFromContext();
} else {
tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
}
Expand Down
4 changes: 3 additions & 1 deletion ...vider/src/main/java/org/wso2/carbon/identity/scim2/provider/resources/SchemaResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;

import static org.wso2.carbon.identity.scim2.common.utils.SCIMCommonUtils.getTenantDomainFromContext;

public class SchemaResource extends AbstractResource {

private static final Log logger = LogFactory.getLog(SchemaResource.class);
Expand Down Expand Up @@ -68,7 +70,7 @@ public Response getSchemasById(@PathParam(SCIMConstants.CommonSchemaConstants.ID
UserManager userManager = IdentitySCIMManager.getInstance().getUserManager();

if (IdentityTenantUtil.isTenantQualifiedUrlsEnabled()) {
String tenantDomain = IdentityTenantUtil.getTenantDomainFromContext();
String tenantDomain = getTenantDomainFromContext();
}

// create charon-SCIM schemas endpoint and hand-over the request.
Expand Down
3 changes: 2 additions & 1 deletion ...im2.provider/src/main/java/org/wso2/carbon/identity/scim2/provider/util/SupportUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import java.util.Map;

import static org.wso2.carbon.identity.scim2.common.utils.SCIMCommonUtils.getCustomSchemaURI;
import static org.wso2.carbon.identity.scim2.common.utils.SCIMCommonUtils.getTenantDomainFromContext;

/**
* This class contains the common utils used at HTTP level
Expand Down Expand Up @@ -161,7 +162,7 @@ public static int getTenantId() {
public static String getTenantDomain() {

if (IdentityTenantUtil.isTenantQualifiedUrlsEnabled()) {
return IdentityTenantUtil.getTenantDomainFromContext();
return getTenantDomainFromContext();
}
return PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
}
Expand Down
Loading