Skip to content

Fix unresolved CUSTOM placeholder in My Account impersonation callback URL #8172

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
AfraHussaindeen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix unresolved CUSTOM placeholder in My Account impersonation callback URL #8172

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
10 changes: 9 additions & 1 deletion ...cation.mgt/src/main/java/org/wso2/carbon/identity/application/mgt/ApplicationMgtUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1215,17 +1215,25 @@ public static String resolveOriginUrlFromPlaceholders(String absoluteUrl, String
}

if (StringUtils.isEmpty(basePath)) {
return resolveOriginUrlFromPlaceholders(absoluteUrl);
basePath = getAbsolutePublicUrlWithoutPath();
}
absoluteUrl = StringUtils.replace(absoluteUrl, BASE_URL_PLACEHOLDER, basePath);

if (ApplicationConstants.MY_ACCOUNT_APPLICATION_NAME.equals(appName)) {
String consoleBasePath = IdentityUtil.getProperty(CONSOLE_ACCESS_ORIGIN);
if (StringUtils.isEmpty(consoleBasePath)) {
consoleBasePath = getAbsolutePublicUrlWithoutPath();
}
absoluteUrl = StringUtils.replace(absoluteUrl, BASE_URL_CUSTOM_PLACEHOLDER, consoleBasePath);
}
return absoluteUrl;
}

private static String getAbsolutePublicUrlWithoutPath() throws URLBuilderException {

return ServiceURLBuilder.create().build().getAbsolutePublicUrlWithoutPath();
}

/**
* Check whether the application is Console or My Account by app name.
*
Expand Down
Loading