UNIX.dog
/
keycloak
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Theme resource common path is always /keycloak/common 

Closes #17569
This commit is contained in:
Douglas Palmer 2023-03-22 13:29:26 -07:00 committed by Marek Posolda
parent 8bc5273792
commit a48db930fe
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
services/src/main/java/org/keycloak/forms/account/freemarker/model/UrlBean.java
View File

@ -17,10 +17,12 @@
package org.keycloak.forms.account.freemarker.model;
import org.jboss.logging.Logger;
import org.keycloak.models.RealmModel;
import org.keycloak.services.Urls;
import org.keycloak.theme.Theme;
import java.io.IOException;
import java.net.URI;
/**
@ -28,6 +30,7 @@ import java.net.URI;
*/
public class UrlBean {
private static final Logger logger = Logger.getLogger(UrlBean.class);
private String realm;
private Theme theme;
private URI baseURI;
@ -99,6 +102,15 @@ public class UrlBean {
public String getResourcesCommonPath() {
URI uri = Urls.themeRoot(baseURI);
return uri.getPath() + "/common/keycloak";
String commonPath = "";
try {
commonPath = theme.getProperties().getProperty("import");
} catch (IOException ex) {
logger.warn("Failed to load properties", ex);
}
if (commonPath == null || commonPath.isEmpty()) {
commonPath = "/common/keycloak";
}
return uri.getPath() + "/" + commonPath;
}
}

14
services/src/main/java/org/keycloak/forms/login/freemarker/model/UrlBean.java
View File

@ -18,10 +18,12 @@ package org.keycloak.forms.login.freemarker.model;
import static org.keycloak.protocol.oidc.grants.device.DeviceGrantType.realmOAuth2DeviceVerificationAction;
import org.jboss.logging.Logger;
import org.keycloak.models.RealmModel;
import org.keycloak.services.Urls;
import org.keycloak.theme.Theme;
import java.io.IOException;
import java.net.URI;
/**
@ -29,6 +31,7 @@ import java.net.URI;
*/
public class UrlBean {
private static final Logger logger = Logger.getLogger(UrlBean.class);
private final URI actionuri;
private URI baseURI;
private Theme theme;
@ -126,6 +129,15 @@ public class UrlBean {
public String getResourcesCommonPath() {
URI uri = Urls.themeRoot(baseURI);
return uri.getPath() + "/common/keycloak";
String commonPath = "";
try {
commonPath = theme.getProperties().getProperty("import");
} catch (IOException ex) {
logger.warn("Failed to load properties", ex);
}
if (commonPath == null || commonPath.isEmpty()) {
commonPath = "/common/keycloak";
}
return uri.getPath() + "/" + commonPath;
}
}