8000 Stop adding .v2 to default theme if set in server config by stianst · Pull Request #15501 · keycloak/keycloak · GitHub
[go: up one dir, main page]

Skip to content
8000
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,16 @@

import org.keycloak.Config;
import org.keycloak.common.Profile;
import org.keycloak.common.Version;
import org.keycloak.provider.Provider;

/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
*/
public interface ThemeSelectorProvider extends Provider {

String DEFAULT = "keycloak";
String DEFAULT_V2 = "keycloak.v2";

/**
* Return the theme name to use for the specified type
*
Expand All @@ -36,13 +38,20 @@ public interface ThemeSelectorProvider extends Provider {
String getThemeName(Theme.Type type);

default String getDefaultThemeName(Theme.Type type) {
String name = Config.scope("theme").get("default", Version.NAME.toLowerCase());
String name = Config.scope("theme").get("default");
if (name != null && !name.isEmpty()) {
return name;
}

if ((type == Theme.Type.ACCOUNT) && Profile.isFeatureEnabled(Profile.Feature.ACCOUNT2)) {
name = name.concat(".v2");
} else if ((type == Theme.Type.ADMIN) && Profile.isFeatureEnabled(Profile.Feature.ADMIN2)) {
name = name.concat(".v2");
return DEFAULT_V2;
}
return name;

if ((type == Theme.Type.ADMIN) && Profile.isFeatureEnabled(Profile.Feature.ADMIN2)) {
return DEFAULT_V2;
}

return DEFAULT;
}

}
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package org.keycloak.theme;

import org.keycloak.Config;
import org.keycloak.common.Profile;
import org.keycloak.common.Version;
import org.keycloak.models.ClientModel;
import org.keycloak.models.KeycloakSession;

Expand Down
0