libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

[KEYCLOAK-17174] - New admin console using wrong base URI for redirection (#7794)

Browse source
This commit is contained in:
Pedro Igor 2021-03-03 12:15:24 -03:00 committed by GitHub
parent 0f30b3118a
commit 2796f62899
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
services/src/main/java/org/keycloak/services/resources/account/AccountConsole.java
View file

@ -82,16 +82,19 @@ public class AccountConsole {
@GET @GET
@NoCache @NoCache
public Response getMainPage() throws IOException, FreeMarkerException { public Response getMainPage() throws IOException, FreeMarkerException {
UriInfo uriInfo = session.getContext().getUri(UrlType.FRONTEND);
URI accountBaseUrl = uriInfo.getBaseUriBuilder().path(RealmsResource.class).path(realm.getName())
.path(Constants.ACCOUNT_MANAGEMENT_CLIENT_ID).path("/").build(realm);
if (!session.getContext().getUri().getRequestUri().getPath().endsWith("/")) { if (!session.getContext().getUri().getRequestUri().getPath().endsWith("/")) {
return Response.status(302).location(session.getContext().getUri().getRequestUriBuilder().path("/").build()).build(); return Response.status(302).location(accountBaseUrl).build();
} else { } else {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
URI adminBaseUri = session.getContext().getUri(UrlType.ADMIN).getBaseUri(); URI adminBaseUri = session.getContext().getUri(UrlType.ADMIN).getBaseUri();
UriInfo uriInfo = session.getContext().getUri(UrlType.FRONTEND);
URI authUrl = uriInfo.getBaseUri(); URI authUrl = uriInfo.getBaseUri();
map.put("authUrl", authUrl.toString()); map.put("authUrl", authUrl.toString());
map.put("baseUrl", uriInfo.getBaseUriBuilder().path(RealmsResource.class).path(realm.getName()).path(Constants.ACCOUNT_MANAGEMENT_CLIENT_ID).build(realm).toString()); map.put("baseUrl", accountBaseUrl);
map.put("realm", realm); map.put("realm", realm);
map.put("resourceUrl", Urls.themeRoot(authUrl).getPath() + "/" + Constants.ACCOUNT_MANAGEMENT_CLIENT_ID + "/" + theme.getName()); map.put("resourceUrl", Urls.themeRoot(authUrl).getPath() + "/" + Constants.ACCOUNT_MANAGEMENT_CLIENT_ID + "/" + theme.getName());
map.put("resourceCommonUrl", Urls.themeRoot(adminBaseUri).getPath() + "/common/keycloak"); map.put("resourceCommonUrl", Urls.themeRoot(adminBaseUri).getPath() + "/common/keycloak");