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

KEYCLOAK-14547: Make New Account Console the default.

Browse source
This commit is contained in:
Václav Muzikář 2020-11-19 19:26:24 +01:00 committed by Stian Thorgersen
parent 0afd55f32c
commit e56bd9d8b8
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
services/src/main/java/org/keycloak/theme/DefaultThemeManager.java
View file

@ -45,7 +45,6 @@ import org.keycloak.common.Profile;
public class DefaultThemeManager implements ThemeManager { public class DefaultThemeManager implements ThemeManager {
private static final Logger log = Logger.getLogger(DefaultThemeManager.class); private static final Logger log = Logger.getLogger(DefaultThemeManager.class);
private static final boolean isAccount2Enabled = Profile.isFeatureEnabled(Profile.Feature.ACCOUNT2);
private final DefaultThemeManagerFactory factory; private final DefaultThemeManagerFactory factory;
private final KeycloakSession session; private final KeycloakSession session;
@ -65,7 +64,7 @@ public class DefaultThemeManager implements ThemeManager {
} }
private String typeBasedDefault(Theme.Type type) { private String typeBasedDefault(Theme.Type type) {
if ((type == Theme.Type.ACCOUNT) && isAccount2Enabled) { if ((type == Theme.Type.ACCOUNT) && isAccount2Enabled()) {
return "keycloak.v2"; return "keycloak.v2";
} }
@ -92,11 +91,11 @@ public class DefaultThemeManager implements ThemeManager {
} }
} }
if (!isAccount2Enabled && theme.getName().equals("keycloak.v2")) { if (!isAccount2Enabled() && theme.getName().equals("keycloak.v2")) {
theme = loadTheme("keycloak", type); theme = loadTheme("keycloak", type);
} }
if (!isAccount2Enabled && theme.getName().equals("rhsso.v2")) { if (!isAccount2Enabled() && theme.getName().equals("rhsso.v2")) {
theme = loadTheme("rhsso", type); theme = loadTheme("rhsso", type);
} }
@ -324,4 +323,8 @@ public class DefaultThemeManager implements ThemeManager {
return providers; return providers;
} }
private static boolean isAccount2Enabled() {
return Profile.isFeatureEnabled(Profile.Feature.ACCOUNT2);
}
} }