UID2 1473 Update keycloak

Dockerfile_keycloak

@@ -1,4 +1,4 @@
-FROM quay.io/keycloak/keycloak:20.0.3
+FROM quay.io/keycloak/keycloak:22.0.1
 
 ENV KC_TRANSACTION_XA_ENABLED 'false'
 
@@ -11,4 +11,4 @@ RUN chmod -R 775 /opt/keycloak/data/import
 USER keycloak
 
 ENTRYPOINT sed -i -E "s#http://localhost:[0-9]*#$SSP_WEB_HOST#g" opt/keycloak/data/import/realm-export.json && \
-/opt/keycloak/bin/kc.sh start --hostname=$SSP_AUTH_HOST --import-realm --spi-theme-static-max-age=-1 --spi-theme-cache-themes=false --spi-theme-cache-templates=false --spi-theme-welcome-theme=uid-theme --health-enabled=true --metrics-enabled=true --features=declarative-user-profile
+/opt/keycloak/bin/kc.sh start --hostname=$SSP_AUTH_HOST --import-realm --spi-theme-static-max-age=-1 --spi-theme-cache-themes=false --spi-theme-cache-templates=false --spi-theme-welcome-theme=uid-theme --health-enabled=true --metrics-enabled=true --features=declarative-user-profile --spi-connections-jpa-legacy-migration-strategy=update

docker-compose.yml

@@ -18,7 +18,7 @@ services:
       MSSQL_SA_PASSWORD: 'D3velopmentP0'
   keycloak:
     container_name: uid2_selfserve_keycloak
-    image: quay.io/keycloak/keycloak:20.0.3
+    image: quay.io/keycloak/keycloak:22.0.1
     environment:
       KC_DB: mssql
       KC_DB_URL: jdbc:sqlserver://database:1433;DatabaseName=keycloak;encrypt=true;trustServerCertificate=true;
@@ -34,7 +34,7 @@ services:
     depends_on:
       - database
     command:
-      - start-dev --import-realm --spi-theme-static-max-age=-1 --spi-theme-cache-themes=false --spi-theme-cache-templates=false --spi-theme-welcome-theme=uid2-theme --health-enabled=true --metrics-enabled=true --features=declarative-user-profile
+      - start-dev --import-realm --spi-theme-static-max-age=-1 --spi-theme-cache-themes=false --spi-theme-cache-templates=false --spi-theme-welcome-theme=uid2-theme --health-enabled=true --metrics-enabled=true --features=declarative-user-profile --spi-connections-jpa-legacy-migration-strategy=update
     volumes:
       - ./keycloak/realm:/opt/keycloak/data/import
       - ./keycloak/themes:/opt/keycloak/themes

keycloak/themes/uid2-theme/login/login-update-password.ftl

@@ -1,5 +1,5 @@
 <#import "template.ftl" as layout>
-<@layout.registrationLayout displayMessage=false; section>
+<@layout.registrationLayout displayMessage=!messagesPerField.existsError('password','password-confirm'); section>
     <#if section = "header">
         ${msg("updatePasswordTitle")}
     <#elseif section = "form">
@@ -49,11 +49,9 @@
             <div class="${properties.kcFormGroupClass!}">
                 <div id="kc-form-options" class="${properties.kcFormOptionsClass!}">
                     <div class="${properties.kcFormOptionsWrapperClass!}">
-                        <#if isAppInitiatedAction??>
-                            <div class="checkbox">
-                                <label><input type="checkbox" id="logout-sessions" name="logout-sessions" value="on" checked> ${msg("logoutOtherSessions")}</label>
-                            </div>
-                        </#if>
+                        <div class="checkbox">
+                            <label><input type="checkbox" id="logout-sessions" name="logout-sessions" value="on" checked /><span>${msg("logoutOtherSessions")}</span></label>
+                        </div>
                     </div>
                 </div>
 

keycloak/themes/uid2-theme/login/resources/css/login.css

@@ -13,25 +13,29 @@
   --theme-action: #0459fd;
   --theme-input-border: #b8b8b8;
 }
+
 body {
-  font-family: 'Inter', sans-serif;
+  font-family: Inter, sans-serif;
 }
+
 #kc-form-login {
   display: flex;
   flex-direction: column;
 }
+
 .login-pf a {
   color: var(--theme-action);
 }
 
 .login-pf {
   background: none;
-
   background-color: var(--theme-background-content) !important;
 }
+
 .login-pf-page .card-pf {
   padding: 3rem 5rem;
 }
+
 .login-pf body {
   background-image: none;
   background-color: var(--theme-background-content) !important;
@@ -50,19 +54,39 @@ body {
   font-size: 18px;
   order: 4;
 }
-#kc-form-options {
+
+.login-pf-settings #kc-form-options {
   display: none;
 }
+
+#kc-form-options .checkbox {
+  font-size: 14px;
+}
+
+#kc-form-options .checkbox label span {
+  margin-left: 20px;
+}
+
+#kc-form-options .checkbox input {
+  accent-color: #0300a5;
+  height: 25px;
+  width: 25px;
+  margin-top: 0;
+  margin-left: -20;
+}
+
 .login-pf-page .login-pf-header {
   margin-bottom: 8px;
 }
+
 .pf-c-button {
   border-radius: 5px;
   font-weight: 700;
   font-size: 18px;
-  padding: 15px 120px 15px 120px;
+  padding: 15px 120px;
   margin: 0 auto;
 }
+
 .pf-c-button.pf-m-primary {
   background-color: var(--theme-button);
   color: var(--theme-button-border);
@@ -77,7 +101,7 @@ body {
 }
 
 h1#kc-page-title {
-  margin: 10px 0 0 0;
+  margin: 10px 0 0;
   font-weight: 700;
   line-height: 29px;
   text-align: left;
@@ -91,7 +115,6 @@ h1#kc-page-title {
 }
 
 .login-pf-page .card-pf .kc-description-text {
-  font-size: 14px;
   color: #000;
   font-size: 14px;
   line-height: 22px;
@@ -114,12 +137,15 @@ div.kc-logo-text {
   padding: 0 30px;
   margin-bottom: 0;
 }
+
 #kc-header-wrapper {
   padding: 20px;
 }
+
 #kc-header-wrapper .uid2-logo {
   height: 30px;
 }
+
 #kc-content-wrapper {
   margin-top: 0;
 }
@@ -158,7 +184,7 @@ div.kc-logo-text {
 .card-pf {
   background: var(--theme-background-content);
   border: 1px solid var(--theme-border);
-  box-shadow: 0px 4px 14px rgba(0, 0, 0, 0.15);
+  box-shadow: 0 4px 14px rgb(0 0 0 / 15%);
   border-radius: 8px;
   padding: 3rem 5rem;
   width: 623px;
@@ -178,13 +204,16 @@ div.kc-logo-text {
   align-items: center;
   justify-content: center;
 }
+
 #kc-registration {
   width: 200px;
 }
+
 .login-pf-page .login-pf-signup a {
   margin: 0;
 }
-/*phone*/
+
+/* phone */
 @media (max-width: 767px) {
   .centralize-content {
     justify-content: start;
@@ -199,11 +228,13 @@ div.kc-logo-text {
 
   .kc-social-grid {
     grid-column-end: 12;
+
     --pf-l-grid__item--GridColumnEnd: span 12;
   }
 
   .kc-social-grid .kc-social-icon-text {
     left: -15px;
   }
 }
+
 /* End Recovery codes */