libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

KEYCLOAK-10807 Fix incorrect RS link on my resources page

Browse source
This commit is contained in:
k-tamura 2019-07-10 10:38:31 +09:00 committed by Pedro Igor
parent f238c4b736
commit 2dceda3f50
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
services/src/main/java/org/keycloak/forms/account/freemarker/model/AuthorizationBean.java
View file

@ -42,6 +42,7 @@ import org.keycloak.models.RealmModel;
import org.keycloak.models.UserModel;
import org.keycloak.models.utils.ModelToRepresentation;
import org.keycloak.representations.idm.authorization.ScopeRepresentation;
import org.keycloak.services.util.ResolveRelative;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
@ -380,6 +381,10 @@ public class AuthorizationBean {
return redirectUris.iterator().next();
}
public String getBaseUri() {
return ResolveRelative.resolveRelativeUri(null, clientModel.getRootUrl(), clientModel.getBaseUrl());
}
}
public class ManagedPermissionBean {

4
services/src/main/java/org/keycloak/services/util/ResolveRelative.java
View file

@ -29,13 +29,15 @@ public class ResolveRelative {
if (url == null || !url.startsWith("/")) return url;
if (rootUrl != null) {
return rootUrl + url;
} else {
} else if (requestUri != null) {
UriBuilder builder = UriBuilder.fromPath(url).host(requestUri.getHost());
builder.scheme(requestUri.getScheme());
if (requestUri.getPort() != -1) {
builder.port(requestUri.getPort());
}
return builder.build().toString();
} else {
return null;
}
}
}

4
themes/src/main/resources/theme/base/account/resources.ftl
View file

@ -202,7 +202,7 @@
</a>
</td>
<td>
<a href="${resource.resourceServer.redirectUri}">${resource.resourceServer.name}</a>
<a href="${resource.resourceServer.baseUri}">${resource.resourceServer.name}</a>
</td>
<td>
<#if resource.shares?size != 0>
@ -259,7 +259,7 @@
<#if resource.owner.email??>${resource.owner.email}<#else>${resource.owner.username}</#if>
</td>
<td>
<a href="${resource.resourceServer.redirectUri}">${resource.resourceServer.name}</a>
<a href="${resource.resourceServer.baseUri}">${resource.resourceServer.name}</a>
</td>
<td>
<#if resource.permissions?size != 0>