Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Keycloak improvements (removed old symlink hack and added custom theme provider to fallback to openremote theme on missing theme)

Rich Turnerd52c7c64e79a
diff --git a/deployment/keycloak/themes/README.md b/deployment/keycloak/themes/README.md
new file mode 100644
index 000000000..47f945958
--- /dev/null
+++ b/deployment/keycloak/themes/README.md
@@ -0,0 +1,2 @@
+# Keycloak Custom Themes
+Each theme directory here will be volume mapped into the keycloak container, refer to the [OpenRemote Wiki](https://github.com/openremote/openremote/wiki).
diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile
index ced326546..fdc3020d5 100644
--- a/keycloak/Dockerfile
+++ b/keycloak/Dockerfile
@@ -1,13 +1,36 @@
-FROM jboss/keycloak:11.0.2
+FROM registry.access.redhat.com/ubi8-minimal
MAINTAINER [email protected]
# Add git commit label must be specified at build time using --build-arg GIT_COMMIT=dadadadadad
ARG GIT_COMMIT=unknown
LABEL git-commit=$GIT_COMMIT
+ENV KEYCLOAK_VERSION 12.0.1
+ENV JDBC_POSTGRES_VERSION 42.2.5
+ENV JDBC_MYSQL_VERSION 8.0.22
+ENV JDBC_MARIADB_VERSION 2.5.4
+ENV JDBC_MSSQL_VERSION 8.2.2.jre11
+
+ENV LAUNCH_JBOSS_IN_BACKGROUND 1
+ENV PROXY_ADDRESS_FORWARDING false
+ENV JBOSS_HOME /opt/jboss/keycloak
+ENV LANG en_US.UTF-8
+
+ARG GIT_REPO
+ARG GIT_BRANCH
+ARG KEYCLOAK_DIST=https://github.com/keycloak/keycloak/releases/download/$KEYCLOAK_VERSION/keycloak-$KEYCLOAK_VERSION.tar.gz
+
USER root
-ADD docker-entrypoint.sh /opt/jboss/
-RUN chmod +x /opt/jboss/docker-entrypoint.sh
+
+RUN microdnf update -y && microdnf install -y glibc-langpack-en gzip hostname java-11-openjdk-headless openssl tar which && microdnf clean all
+
+ADD tools /opt/jboss/tools
+RUN /opt/jboss/tools/build-keycloak.sh
+
+RUN mkdir -p /opt/jboss/keycloak/providers
+ADD build/image/themes /opt/jboss/keycloak/themes
+ADD build/image/openremote-keycloak.jar /opt/jboss/keycloak/providers
+ADD build/image/module.xml /opt/jboss/keycloak/providers
HEALTHCHECK --interval=3s --timeout=3s --start-period=600s --retries=30 CMD curl --fail --silent http://localhost:8080/auth || exit 1
@@ -15,5 +38,5 @@ USER 1000
EXPOSE 8080
-ENTRYPOINT ["/opt/jboss/docker-entrypoint.sh"]
+ENTRYPOINT ["/opt/jboss/tools/docker-entrypoint.sh"]
CMD ["-b", "0.0.0.0"]
diff --git a/keycloak/build.gradle b/keycloak/build.gradle
new file mode 100644
index 000000000..1de0a7a19
--- /dev/null
+++ b/keycloak/build.gradle
@@ -0,0 +1,23 @@
+apply plugin: "java"
+version = ""
+
+dependencies {
+ compile "org.keycloak:keycloak-core:$keycloakVersion"
+ compile "org.keycloak:keycloak-services:$keycloakVersion"
+ compile "org.keycloak:keycloak-server-spi:$keycloakVersion"
+ compile "org.keycloak:keycloak-server-spi-private:$keycloakVersion"
+}
+
+jar {
+ archivesBaseName = "openremote-${project.name}"
+}
+
+task installDist(type: Copy) {
+ into "${buildDir}/image"
+
+ from(projectDir) {
+ include "themes/**", "module.xml"
+ }
+
+ from jar.outputs
+}
diff --git a/keycloak/docker-entrypoint.sh b/keycloak/docker-entrypoint.sh
deleted file mode 100644
index 52dd1be85..000000000
--- a/keycloak/docker-entrypoint.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# Symlink each theme from deployment this preserves the default keycloak theme, reasons for this mechanism:
-# Cannot volume map a subdir of a named volume
-# Want all customisation to be in the /deployment dir and deployment-data volume
-
-# Remove any stale symlinks
-for dir in /opt/jboss/keycloak/themes/*; do
- if [ -L ${dir} ]; then
- rm ${dir}
- fi
-done
-
-# Link standard themes
-if [ -d "/deployment/keycloak/themes" ]; then
- for dir in /deployment/keycloak/themes/*; do
- if [ -d ${dir} ]; then
- echo "${dir##*/}"
- ln -s ${dir} /opt/jboss/keycloak/themes/${dir##*/}
- fi
- done
-fi
-# Additional symlinks for custom themes during dev
-if [ -d "/deployment/keycloak/customthemes" ]; then
- for dir in /deployment/keycloak/customthemes/*; do
- if [ -d ${dir} ]; then
- echo "${dir##*/}"
- ln -s ${dir} /opt/jboss/keycloak/themes/${dir##*/}
- fi
- done
-fi
-
-
-exec /opt/jboss/tools/docker-entrypoint.sh $@
-exit $?
diff --git a/keycloak/module.xml b/keycloak/module.xml
new file mode 100644
index 000000000..7107dfa92
--- /dev/null
+++ b/keycloak/module.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.3" name="org.openremote.keycloak.theme">
+ <resources>
+ <resource-root path="openremote-keycloak.jar"/>
+ </resources>
+ <dependencies>
+ <module name="org.keycloak.keycloak-core"/>
+ <module name="org.keycloak.keycloak-services"/>
+ <module name="org.keycloak.keycloak-server-spi-private"/>
+ </dependencies>
+</module>
diff --git a/keycloak/multi.Dockerfile b/keycloak/multi.Dockerfile
deleted file mode 100644
index 705631c2e..000000000
--- a/keycloak/multi.Dockerfile
+++ /dev/null
@@ -1,34 +0,0 @@
-FROM registry.access.redhat.com/ubi8-minimal
-
-ENV KEYCLOAK_VERSION 12.0.1
-ENV JDBC_POSTGRES_VERSION 42.2.5
-ENV JDBC_MYSQL_VERSION 8.0.22
-ENV JDBC_MARIADB_VERSION 2.5.4
-ENV JDBC_MSSQL_VERSION 8.2.2.jre11
-
-ENV LAUNCH_JBOSS_IN_BACKGROUND 1
-ENV PROXY_ADDRESS_FORWARDING false
-ENV JBOSS_HOME /opt/jboss/keycloak
-ENV LANG en_US.UTF-8
-
-ARG GIT_REPO
-ARG GIT_BRANCH
-ARG KEYCLOAK_DIST=https://github.com/keycloak/keycloak/releases/download/$KEYCLOAK_VERSION/keycloak-$KEYCLOAK_VERSION.tar.gz
-
-USER root
-ADD docker-entrypoint.sh /opt/jboss/
-RUN chmod +x /opt/jboss/docker-entrypoint.sh
-
-RUN microdnf update -y && microdnf install -y glibc-langpack-en gzip hostname java-11-openjdk-headless openssl tar which && microdnf clean all
-
-ADD tools /opt/jboss/tools
-RUN /opt/jboss/tools/build-keycloak.sh
-
-HEALTHCHECK --interval=3s --timeout=3s --start-period=600s --retries=30 CMD curl --fail --silent http://localhost:8080/auth || exit 1
-
-USER 1000
-
-EXPOSE 8080
-
-ENTRYPOINT ["/opt/jboss/docker-entrypoint.sh"]
-CMD ["-b", "0.0.0.0"]
diff --git a/keycloak/scripts/disable-theme-cache.cli b/keycloak/scripts/disable-theme-cache.cli
new file mode 100644
index 000000000..fde02b1be
--- /dev/null
+++ b/keycloak/scripts/disable-theme-cache.cli
@@ -0,0 +1,5 @@
+embed-server --std-out=echo --server-config=standalone-ha.xml
+/subsystem=keycloak-server/theme=defaults/:write-attribute(name=cacheThemes,value=false)
+/subsystem=keycloak-server/theme=defaults/:write-attribute(name=cacheTemplates,value=false)
+/subsystem=keycloak-server/theme=defaults/:write-attribute(name=staticMaxAge,value=-1)
+stop-embedded-server
diff --git a/keycloak/src/main/java/org/openremote/keycloak/theme/CustomThemeProvider.java b/keycloak/src/main/java/org/openremote/keycloak/theme/CustomThemeProvider.java
new file mode 100644
index 000000000..bd3932237
--- /dev/null
+++ b/keycloak/src/main/java/org/openremote/keycloak/theme/CustomThemeProvider.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2021, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.openremote.keycloak.theme;
+
+import org.keycloak.theme.FolderThemeProvider;
+import org.keycloak.theme.Theme;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * This theme provider will fallback to the openremote theme in the fallback dir if the custom theme cannot be found
+ */
+public class CustomThemeProvider extends FolderThemeProvider {
+
+ FolderThemeProvider fallbackProvider = null;
+
+ public CustomThemeProvider(File themesDir) {
+ super(themesDir);
+ }
+
+ @Override
+ public int getProviderPriority() {
+ return super.getProviderPriority() - 10;
+ }
+
+ @Override
+ public Theme getTheme(String name, Theme.Type type) throws IOException {
+ if (!super.hasTheme(name, type) && fallbackProvider != null) {
+ return fallbackProvider.getTheme("openremote", type);
+ }
+
+ return super.getTheme(name, type);
+ }
+
+ @Override
+ public boolean hasTheme(String name, Theme.Type type) {
+ if (!super.hasTheme(name, type) && fallbackProvider != null) {
+ return fallbackProvider.hasTheme("openremote", type);
+ }
+
+ return true;
+ }
+}
diff --git a/keycloak/src/main/java/org/openremote/keycloak/theme/CustomThemeProviderFactory.java b/keycloak/src/main/java/org/openremote/keycloak/theme/CustomThemeProviderFactory.java
new file mode 100644
index 000000000..29dcb02b3
--- /dev/null
+++ b/keycloak/src/main/java/org/openremote/keycloak/theme/CustomThemeProviderFactory.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2021, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.openremote.keycloak.theme;
+
+import org.keycloak.Config;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.KeycloakSessionFactory;
+import org.keycloak.theme.FolderThemeProvider;
+import org.keycloak.theme.ThemeProvider;
+import org.keycloak.theme.ThemeProviderFactory;
+
+import java.io.File;
+
+/**
+ * A theme provider to load custom themes from the deployment directory, the openremote theme is baked
+ * into the standard theme directory.
+ */
+public class CustomThemeProviderFactory implements ThemeProviderFactory {
+
+ protected CustomThemeProvider themeProvider;
+
+ @Override
+ public ThemeProvider create(KeycloakSession session) {
+ if (themeProvider.fallbackProvider == null) {
+ themeProvider.fallbackProvider = (FolderThemeProvider) session.getProvider(ThemeProvider.class, "folder");
+ }
+ return themeProvider;
+ }
+
+ @Override
+ public void init(Config.Scope config) {
+ File rootDir = new File("/deployment/keycloak/themes");
+ themeProvider = new CustomThemeProvider(rootDir);
+ }
+
+ @Override
+ public void postInit(KeycloakSessionFactory factory) {
+ }
+
+ @Override
+ public void close() {
+ }
+
+ @Override
+ public String getId() {
+ return "openremote-custom-folder";
+ }
+}
diff --git a/keycloak/src/main/resources/META-INF/services/org.keycloak.theme.ThemeProviderFactory b/keycloak/src/main/resources/META-INF/services/org.keycloak.theme.ThemeProviderFactory
new file mode 100644
index 000000000..52f404d8f
--- /dev/null
+++ b/keycloak/src/main/resources/META-INF/services/org.keycloak.theme.ThemeProviderFactory
@@ -0,0 +1 @@
+org.openremote.keycloak.theme.CustomThemeProviderFactory
diff --git a/ui/keycloak/themes/openremote/account/account.ftl b/keycloak/themes/openremote/account/account.ftl
similarity index 100%
rename from ui/keycloak/themes/openremote/account/account.ftl
rename to keycloak/themes/openremote/account/account.ftl
diff --git a/ui/keycloak/themes/openremote/account/applications.ftl b/keycloak/themes/openremote/account/applications.ftl
similarity index 100%
rename from ui/keycloak/themes/openremote/account/applications.ftl
rename to keycloak/themes/openremote/account/applications.ftl
diff --git a/ui/keycloak/themes/openremote/account/federatedIdentity.ftl b/keycloak/themes/openremote/account/federatedIdentity.ftl
similarity index 100%
rename from ui/keycloak/themes/openremote/account/federatedIdentity.ftl
rename to keycloak/themes/openremote/account/federatedIdentity.ftl
diff --git a/ui/keycloak/themes/openremote/account/log.ftl b/keycloak/themes/openremote/account/log.ftl
similarity index 100%
rename from ui/keycloak/themes/openremote/account/log.ftl
rename to keycloak/themes/openremote/account/log.ftl
diff --git a/ui/keycloak/themes/openremote/account/password.ftl b/keycloak/themes/openremote/account/password.ftl
similarity index 100%
rename from ui/keycloak/themes/openremote/account/password.ftl
rename to keycloak/themes/openremote/account/password.ftl
diff --git a/ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.eot b/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.eot
similarity index 100%
rename from ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.eot
rename to keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.eot
diff --git a/ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.ijmap b/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.ijmap
similarity index 100%
rename from ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.ijmap
rename to keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.ijmap
diff --git a/ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.svg b/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.svg
similarity index 100%
rename from ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.svg
rename to keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.svg
diff --git a/ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.ttf b/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.ttf
similarity index 100%
rename from ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.ttf
rename to keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.ttf
diff --git a/ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.woff b/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.woff
similarity index 100%
rename from ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.woff
rename to keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.woff
diff --git a/ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.woff2 b/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.woff2
similarity index 100%
rename from ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.woff2
rename to keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.woff2
diff --git a/ui/keycloak/themes/openremote/account/resources/css/materialize.min.css b/keycloak/themes/openremote/account/resources/css/materialize.min.css
similarity index 100%
rename from ui/keycloak/themes/openremote/account/resources/css/materialize.min.css
rename to keycloak/themes/openremote/account/resources/css/materialize.min.css
diff --git a/ui/keycloak/themes/openremote/account/resources/css/styles.css b/keycloak/themes/openremote/account/resources/css/styles.css
similarity index 100%
rename from ui/keycloak/themes/openremote/account/resources/css/styles.css
rename to keycloak/themes/openremote/account/resources/css/styles.css
diff --git a/ui/keycloak/themes/openremote/account/resources/img/favicon.png b/keycloak/themes/openremote/account/resources/img/favicon.png
similarity index 100%
rename from ui/keycloak/themes/openremote/account/resources/img/favicon.png
rename to keycloak/themes/openremote/account/resources/img/favicon.png
diff --git a/ui/keycloak/themes/openremote/account/resources/js/materialize.min.js b/keycloak/themes/openremote/account/resources/js/materialize.min.js
similarity index 100%
rename from ui/keycloak/themes/openremote/account/resources/js/materialize.min.js
rename to keycloak/themes/openremote/account/resources/js/materialize.min.js
diff --git a/ui/keycloak/themes/openremote/account/sessions.ftl b/keycloak/themes/openremote/account/sessions.ftl
similarity index 100%
rename from ui/keycloak/themes/openremote/account/sessions.ftl
rename to keycloak/themes/openremote/account/sessions.ftl
diff --git a/ui/keycloak/themes/openremote/account/template.ftl b/keycloak/themes/openremote/account/template.ftl
similarity index 100%
rename from ui/keycloak/themes/openremote/account/template.ftl
rename to keycloak/themes/openremote/account/template.ftl
diff --git a/ui/keycloak/themes/openremote/account/theme.properties b/keycloak/themes/openremote/account/theme.properties
similarity index 100%
rename from ui/keycloak/themes/openremote/account/theme.properties
rename to keycloak/themes/openremote/account/theme.properties
diff --git a/ui/keycloak/themes/openremote/account/totp.ftl b/keycloak/themes/openremote/account/totp.ftl
similarity index 100%
rename from ui/keycloak/themes/openremote/account/totp.ftl
rename to keycloak/themes/openremote/account/totp.ftl
diff --git a/ui/keycloak/themes/openremote/email/html/password-reset.ftl b/keycloak/themes/openremote/email/html/password-reset.ftl
similarity index 100%
rename from ui/keycloak/themes/openremote/email/html/password-reset.ftl
rename to keycloak/themes/openremote/email/html/password-reset.ftl
diff --git a/ui/keycloak/themes/openremote/email/theme.properties b/keycloak/themes/openremote/email/theme.properties
similarity index 100%
rename from ui/keycloak/themes/openremote/email/theme.properties
rename to keycloak/themes/openremote/email/theme.properties
diff --git a/ui/keycloak/themes/openremote/login/error.ftl b/keycloak/themes/openremote/login/error.ftl
similarity index 100%
rename from ui/keycloak/themes/openremote/login/error.ftl
rename to keycloak/themes/openremote/login/error.ftl
diff --git a/ui/keycloak/themes/openremote/login/login-reset-password.ftl b/keycloak/themes/openremote/login/login-reset-password.ftl
similarity index 54%
rename from ui/keycloak/themes/openremote/login/login-reset-password.ftl
rename to keycloak/themes/openremote/login/login-reset-password.ftl
index 1acb56784..01b1c97ee 100644
--- a/ui/keycloak/themes/openremote/login/login-reset-password.ftl
+++ b/keycloak/themes/openremote/login/login-reset-password.ftl
@@ -1,5 +1,5 @@
<#import "template.ftl" as layout>
-<@layout.registrationLayout displayInfo=true; section>
+<@layout.registrationLayout displayInfo=true displayMessage=!messagesPerField.existsError('username'); section>
<#if section = "title">
${msg("emailForgotTitle")}
<#elseif section = "header">
@@ -8,7 +8,18 @@
<form id="kc-reset-password-form" action="${url.loginAction}" method="post">
<div class="row">
<div class="input-field col s12">
- <input type="text" id="username" name="username" autofocus required class="validate"/>
+ <#if auth?has_content && auth.showUsername()>
+ <input type="text" id="username" name="username" class="validate" autofocus value="${auth.attemptedUsername}" aria-invalid="<#if messagesPerField.existsError('username')>true</#if>"/>
+ <#else>
+ <input type="text" id="username" name="username" class="validate" autofocus aria-invalid="<#if messagesPerField.existsError('username')>true</#if>"/>
+ </#if>
+
+ <#if messagesPerField.existsError('username')>
+ <span id="input-error-username" class="${properties.kcInputErrorMessageClass!}" aria-live="polite">
+ ${kcSanitize(messagesPerField.get('username'))?no_esc}
+ </span>
+ </#if>
+
<label for="username" class="${properties.kcLabelClass!}"><#if !realm.loginWithEmailAllowed>${msg("username")}<#elseif !realm.registrationEmailAsUsername>${msg("usernameOrEmail")}<#else>${msg("email")}</#if></label>
</div>
</div>
@@ -28,4 +39,4 @@
${msg("emailInstruction")}
</div>
</#if>
-</@layout.registrationLayout>
\ No newline at end of file
+</@layout.registrationLayout>
diff --git a/ui/keycloak/themes/openremote/login/login.ftl b/keycloak/themes/openremote/login/login.ftl
similarity index 62%
rename from ui/keycloak/themes/openremote/login/login.ftl
rename to keycloak/themes/openremote/login/login.ftl
index 7c6f1a563..6eb060ddf 100644
--- a/ui/keycloak/themes/openremote/login/login.ftl
+++ b/keycloak/themes/openremote/login/login.ftl
@@ -1,13 +1,12 @@
<#import "template.ftl" as layout>
-<@layout.registrationLayout displayInfo=social.displayInfo; section>
+<@layout.registrationLayout displayMessage=!messagesPerField.existsError('username','password') displayInfo=realm.password && realm.registrationAllowed && !registrationDisabled??; section>
<#if section = "title">
${msg("loginTitle",(realm.displayName!''))}
<#elseif section = "header">
${msg("loginTitleHtml",(realm.displayNameHtml!''))}
<#elseif section = "form">
<#if realm.password>
- <form action="${url.loginAction}" method="post">
-
+ <form onsubmit="login.disabled = true; return true;" action="${url.loginAction}" method="post">
<div class="row">
<div class="input-field col s12">
<#if usernameEditDisabled??>
@@ -29,7 +28,7 @@
</div>
<div class="input-field col s12">
- <input id="password" name="password" type="password" autocomplete="off"/>
+ <input id="password" name="password" type="password" autocomplete="off" aria-invalid="<#if messagesPerField.existsError('username','password')>true</#if>" />
<label for="password">${msg("password")}</label>
</div>
@@ -63,24 +62,31 @@
</#if>
</form>
</#if>
- <#elseif section = "info" >
+ <#elseif section = "info" >
- <#if realm.password && realm.registrationAllowed && !usernameEditDisabled??>
- <div id="kc-registration">
- <span>${msg("noAccount")} <a href="${url.registrationUrl}">${msg("doRegister")}</a></span>
- </div>
- </#if>
+ <#if realm.password && realm.registrationAllowed && !usernameEditDisabled??>
+ <div id="kc-registration">
+ <span>${msg("noAccount")} <a href="${url.registrationUrl}">${msg("doRegister")}</a></span>
+ </div>
+ </#if>
- <#if realm.password && social.providers??>
- <div id="kc-social-providers">
- <ul>
- <#list social.providers as p>
- <li><a href="${p.loginUrl}" id="zocial-${p.alias}" class="zocial ${p.providerId}"> <span
- class="text">${p.alias}</span></a></li>
- </#list>
- </ul>
- </div>
- </#if>
+ <#if realm.password && social.providers??>
+ <div id="kc-social-providers">
+ <ul>
+ <#list social.providers as p>
+ <a id="social-${p.alias}" class="${properties.kcFormSocialAccountListButtonClass!} <#if social.providers?size gt 3>${properties.kcFormSocialAccountGridItem!}</#if>"
+ type="button" href="${p.loginUrl}">
+ <#if p.iconClasses?has_content>
+ <i class="${properties.kcCommonLogoIdP!} ${p.iconClasses!}" aria-hidden="true"></i>
+ <span class="${properties.kcFormSocialAccountNameClass!} kc-social-icon-text">${p.displayName!}</span>
+ <#else>
+ <span class="${properties.kcFormSocialAccountNameClass!}">${p.displayName!}</span>
+ </#if>
+ </a>
+ </#list>
+ </ul>
+ </div>
</#if>
+ </#if>
</@layout.registrationLayout>
diff --git a/ui/keycloak/themes/openremote/login/messages/messages_en.properties b/keycloak/themes/openremote/login/messages/messages_en.properties
similarity index 100%
rename from ui/keycloak/themes/openremote/login/messages/messages_en.properties
rename to keycloak/themes/openremote/login/messages/messages_en.properties
diff --git a/ui/keycloak/themes/openremote/login/register.ftl b/keycloak/themes/openremote/login/register.ftl
similarity index 95%
rename from ui/keycloak/themes/openremote/login/register.ftl
rename to keycloak/themes/openremote/login/register.ftl
index 7ca478a36..c34dc5175 100644
--- a/ui/keycloak/themes/openremote/login/register.ftl
+++ b/keycloak/themes/openremote/login/register.ftl
@@ -1,5 +1,5 @@
<#import "template.ftl" as layout>
-<@layout.registrationLayout; section>
+<@layout.registrationLayout displayMessage=!messagesPerField.existsError('firstName','lastName','email','username','password','password-confirm'); section>
<#if section = "title">
${msg("registerWithTitle",(realm.displayName!''))}
<#elseif section = "header">
@@ -69,4 +69,4 @@
</div>
</form>
</#if>
-</@layout.registrationLayout>
\ No newline at end of file
+</@layout.registrationLayout>
diff --git a/ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.eot b/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.eot
similarity index 100%
rename from ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.eot
rename to keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.eot
diff --git a/ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.ijmap b/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.ijmap
similarity index 100%
rename from ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.ijmap
rename to keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.ijmap
diff --git a/ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.svg b/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.svg
similarity index 100%
rename from ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.svg
rename to keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.svg
diff --git a/ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.ttf b/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.ttf
similarity index 100%
rename from ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.ttf
rename to keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.ttf
diff --git a/ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.woff b/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.woff
similarity index 100%
rename from ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.woff
rename to keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.woff
diff --git a/ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.woff2 b/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.woff2
similarity index 100%
rename from ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.woff2
rename to keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.woff2
diff --git a/ui/keycloak/themes/openremote/login/resources/css/materialize.min.css b/keycloak/themes/openremote/login/resources/css/materialize.min.css
similarity index 100%
rename from ui/keycloak/themes/openremote/login/resources/css/materialize.min.css
rename to keycloak/themes/openremote/login/resources/css/materialize.min.css
diff --git a/ui/keycloak/themes/openremote/login/resources/css/styles.css b/keycloak/themes/openremote/login/resources/css/styles.css
similarity index 100%
rename from ui/keycloak/themes/openremote/login/resources/css/styles.css
rename to keycloak/themes/openremote/login/resources/css/styles.css
diff --git a/ui/keycloak/themes/openremote/login/resources/img/favicon.png b/keycloak/themes/openremote/login/resources/img/favicon.png
similarity index 100%
rename from ui/keycloak/themes/openremote/login/resources/img/favicon.png
rename to keycloak/themes/openremote/login/resources/img/favicon.png
diff --git a/ui/keycloak/themes/openremote/login/resources/js/materialize.min.js b/keycloak/themes/openremote/login/resources/js/materialize.min.js
similarity index 100%
rename from ui/keycloak/themes/openremote/login/resources/js/materialize.min.js
rename to keycloak/themes/openremote/login/resources/js/materialize.min.js
diff --git a/ui/keycloak/themes/openremote/login/template.ftl b/keycloak/themes/openremote/login/template.ftl
similarity index 100%
rename from ui/keycloak/themes/openremote/login/template.ftl
rename to keycloak/themes/openremote/login/template.ftl
diff --git a/ui/keycloak/themes/openremote/login/theme.properties b/keycloak/themes/openremote/login/theme.properties
similarity index 100%
rename from ui/keycloak/themes/openremote/login/theme.properties
rename to keycloak/themes/openremote/login/theme.properties
diff --git a/keycloak/tools/cli/databases/h2/change-database.cli b/keycloak/tools/cli/databases/h2/change-database.cli
new file mode 100644
index 000000000..21809d7c7
--- /dev/null
+++ b/keycloak/tools/cli/databases/h2/change-database.cli
@@ -0,0 +1,9 @@
+/subsystem=datasources/data-source=KeycloakDS: remove()
+/subsystem=datasources/data-source=KeycloakDS: add(jndi-name=java:jboss/datasources/KeycloakDS,enabled=true,use-java-context=true,use-ccm=true, connection-url=jdbc:h2:tcp://${env.DB_ADDR:h2}:${env.DB_PORT:9092}/${env.DB_DATABASE:keycloak};schema\=${env.DB_SCHEMA:public}${env.JDBC_PARAMS:}, driver-name=h2tcp)
+/subsystem=datasources/data-source=KeycloakDS: write-attribute(name=user-name, value=${env.DB_USER:keycloak})
+/subsystem=datasources/data-source=KeycloakDS: write-attribute(name=password, value=${env.DB_PASSWORD:password})
+/subsystem=datasources/data-source=KeycloakDS: write-attribute(name=check-valid-connection-sql, value="SELECT 1")
+/subsystem=datasources/data-source=KeycloakDS: write-attribute(name=background-validation, value=true)
+/subsystem=datasources/data-source=KeycloakDS: write-attribute(name=background-validation-millis, value=60000)
+/subsystem=datasources/data-source=KeycloakDS: write-attribute(name=flush-strategy, value=IdleConnections)
+/subsystem=datasources/jdbc-driver=h2tcp:add(driver-name=h2tcp, driver-module-name=com.h2database.h2, driver-xa-datasource-class-name=org.h2.jdbcx.JdbcDataSource)
diff --git a/keycloak/tools/cli/databases/h2/standalone-configuration.cli b/keycloak/tools/cli/databases/h2/standalone-configuration.cli
new file mode 100644
index 000000000..d47881c72
--- /dev/null
+++ b/keycloak/tools/cli/databases/h2/standalone-configuration.cli
@@ -0,0 +1,3 @@
+embed-server --server-config=standalone.xml --std-out=echo
+run-batch --file=/opt/jboss/tools/cli/databases/h2/change-database.cli
+stop-embedded-server
diff --git a/keycloak/tools/cli/databases/h2/standalone-ha-configuration.cli b/keycloak/tools/cli/databases/h2/standalone-ha-configuration.cli
new file mode 100644
index 000000000..55ea4e237
--- /dev/null
+++ b/keycloak/tools/cli/databases/h2/standalone-ha-configuration.cli
@@ -0,0 +1,3 @@
+embed-server --server-config=standalone-ha.xml --std-out=echo
+run-batch --file=/opt/jboss/tools/cli/databases/h2/change-database.cli
+stop-embedded-server
diff --git a/keycloak/tools/cli/databases/mssql/change-database.cli b/keycloak/tools/cli/databases/mssql/change-database.cli
index 1591e0eae..bdb87fc50 100644
--- a/keycloak/tools/cli/databases/mssql/change-database.cli
+++ b/keycloak/tools/cli/databases/mssql/change-database.cli
@@ -1,5 +1,5 @@
/subsystem=datasources/data-source=KeycloakDS: remove()
-/subsystem=datasources/data-source=KeycloakDS: add(jndi-name=java:jboss/datasources/KeycloakDS,enabled=true,use-java-context=true,use-ccm=true, connection-url="jdbc:sqlserver://${env.DB_ADDR:mssql}:${env.DB_PORT:1433};databaseName=${env.DB_DATABASE:keycloak};sendStringParametersAsUnicode=false;integratedSecurity=false;user=${env.DB_USER:keycloak};password=${env.DB_PASSWORD:password};${env.JDBC_PARAMS:}", driver-name=sqlserver)
+/subsystem=datasources/data-source=KeycloakDS: add(jndi-name=java:jboss/datasources/KeycloakDS,enabled=true,use-java-context=true,use-ccm=true, connection-url="jdbc:sqlserver://${env.DB_ADDR:mssql}:${env.DB_PORT:1433};databaseName=${env.DB_DATABASE:keycloak};sendStringParametersAsUnicode=false;${env.JDBC_PARAMS:}", driver-name=sqlserver)
/subsystem=datasources/data-source=KeycloakDS: write-attribute(name=user-name, value=${env.DB_USER:keycloak})
/subsystem=datasources/data-source=KeycloakDS: write-attribute(name=password, value=${env.DB_PASSWORD:password})
/subsystem=datasources/data-source=KeycloakDS: write-attribute(name=check-valid-connection-sql, value="SELECT 1")
diff --git a/keycloak/tools/cli/files-plaintext-vault.cli b/keycloak/tools/cli/files-plaintext-vault.cli
index 991d04480..1b076c2e1 100644
--- a/keycloak/tools/cli/files-plaintext-vault.cli
+++ b/keycloak/tools/cli/files-plaintext-vault.cli
@@ -2,5 +2,6 @@ embed-server --server-config=$configuration_file --std-out=discard
echo ** Adding vault spi **
/subsystem=keycloak-server/spi=vault/:add
/subsystem=keycloak-server/spi=vault/provider=files-plaintext/:add(enabled=true,properties={dir => $plaintext_vault_provider_dir})
+/subsystem=keycloak-server/spi=vault:write-attribute(name=default-provider,value=files-plaintext)
stop-embedded-server
diff --git a/keycloak/tools/cli/jgroups/discovery/JDBC_PING.cli b/keycloak/tools/cli/jgroups/discovery/JDBC_PING.cli
new file mode 100644
index 000000000..bd4c8ee7e
--- /dev/null
+++ b/keycloak/tools/cli/jgroups/discovery/JDBC_PING.cli
@@ -0,0 +1,11 @@
+embed-server --server-config=standalone-ha.xml --std-out=echo
+batch
+/subsystem=jgroups/stack=udp/protocol=PING:remove()
+/subsystem=jgroups/stack=udp/protocol=JDBC_PING:add(add-index=0, data-source=KeycloakDS, properties=$keycloak_jgroups_discovery_protocol_properties)
+
+/subsystem=jgroups/stack=tcp/protocol=MPING:remove()
+/subsystem=jgroups/stack=tcp/protocol=JDBC_PING:add(add-index=0, data-source=KeycloakDS, properties=$keycloak_jgroups_discovery_protocol_properties)
+
+/subsystem=jgroups/channel=ee:write-attribute(name="stack", value=$keycloak_jgroups_transport_stack)
+run-batch
+stop-embedded-server
diff --git a/ui/keycloak/build.gradle b/ui/keycloak/build.gradle
deleted file mode 100644
index e2216c7a0..000000000
--- a/ui/keycloak/build.gradle
+++ /dev/null
@@ -1,4 +0,0 @@
-task installDist(type: Copy) {
- from "themes"
- into "${project(':deployment').buildDir}/image/${projectDir.name}/themes"
-}