Skip to content

Add null check for organizationId before rewriting basePath #7630

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −3
Open

Add null check for organizationId before rewriting basePath #7630

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
8 changes: 5 additions & 3 deletions .../main/java/org/wso2/carbon/identity/mgt/endpoint/util/IdentityManagementEndpointUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,9 +856,11 @@ public static String getBasePath(String tenantDomain, String context, boolean is
} else if (basePath != null && basePath.contains(FrameworkConstants.ORGANIZATION_CONTEXT_PREFIX)) {
String organizationId = PrivilegedCarbonContext.getThreadLocalCarbonContext()
.getOrganizationId();
basePath = basePath.replace(
FrameworkConstants.ORGANIZATION_CONTEXT_PREFIX + organizationId,
FrameworkConstants.TENANT_CONTEXT_PREFIX + tenantDomain);
if (organizationId != null) {
Copy link
Contributor

@ShanChathusanda93 ShanChathusanda93 Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall we use StringUtils? WDYT?

basePath = basePath.replace(
FrameworkConstants.ORGANIZATION_CONTEXT_PREFIX + organizationId,
FrameworkConstants.TENANT_CONTEXT_PREFIX + tenantDomain);
Copy link

Copilot AI Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] While the null check is a good defensive measure, consider adding debug logging when organizationId is null to aid troubleshooting. This would help identify scenarios where the basePath rewrite is skipped unexpectedly. For example:

if (organizationId != null) {
    basePath = basePath.replace(
            FrameworkConstants.ORGANIZATION_CONTEXT_PREFIX + organizationId,
            FrameworkConstants.TENANT_CONTEXT_PREFIX + tenantDomain);
} else {
    if (log.isDebugEnabled()) {
        log.debug("Organization ID is null. Skipping basePath rewrite for organization context.");
    }
}
Suggested change
FrameworkConstants.TENANT_CONTEXT_PREFIX + tenantDomain);
FrameworkConstants.TENANT_CONTEXT_PREFIX + tenantDomain);
} else {
// Organization ID is null. Skipping basePath rewrite for organization context.
if (log.isDebugEnabled()) {
log.debug("Organization ID is null. Skipping basePath rewrite for organization context.");
}

Copilot uses AI. Check for mistakes.
}
}
} else {
serverUrl = ServiceURLBuilder.create().build().getAbsoluteInternalURL();
Expand Down
Loading