keycloak · jonkoops · Jun 12, 2024 · Jun 12, 2024
diff --git a/.github/workflows/js-ci.yml b/.github/workflows/js-ci.yml
@@ -182,8 +182,6 @@ jobs:
 
       - name: Run Playwright tests
         run: pnpm --fail-if-no-match --filter ${{ env.WORKSPACE }} test
-        env:
-          KEYCLOAK_SERVER: http://localhost:8080
 
       - name: Upload Playwright report
         uses: actions/upload-artifact@v4
@@ -285,7 +283,6 @@ jobs:
           working-directory: js/apps/admin-ui
         env:
           CYPRESS_BASE_URL: http://localhost:8080/admin/
-          CYPRESS_KEYCLOAK_SERVER: http://localhost:8080
           SPLIT: ${{ strategy.job-total }}
           SPLIT_INDEX: ${{ strategy.job-index }}
           SPLIT_RANDOM_SEED: ${{ needs.generate-test-seed.outputs.seed }}

diff --git a/common/src/main/java/org/keycloak/common/util/Environment.java b/common/src/main/java/org/keycloak/common/util/Environment.java
@@ -29,6 +29,10 @@ public class Environment {
 
     public static final int DEFAULT_JBOSS_AS_STARTUP_TIMEOUT = 300;
 
+    public static final String PROFILE = "kc.profile";
+    public static final String ENV_PROFILE = "KC_PROFILE";
+    public static final String DEV_PROFILE_VALUE = "dev";
+
     public static int getServerStartupTimeout() {
         String timeout = System.getProperty("jboss.as.management.blocking.timeout");
         if (timeout != null) {
@@ -57,4 +61,17 @@ public static boolean isJavaInFipsMode() {
         return false;
     }
 
+    public static boolean isDevMode() {
+        return DEV_PROFILE_VALUE.equalsIgnoreCase(getProfile());
+    }
+
+    public static String getProfile() {
+        String profile = System.getProperty(PROFILE);
+
+        if (profile != null) {
+            return profile;
+        }
+
+        return System.getenv(ENV_PROFILE);
+    }
 }
diff --git a/core/pom.xml b/core/pom.xml
@@ -54,6 +54,10 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jdk8</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>

diff --git a/core/src/main/java/org/keycloak/util/JsonSerialization.java b/core/src/main/java/org/keycloak/util/JsonSerialization.java
@@ -24,6 +24,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -41,6 +42,7 @@ public class JsonSerialization {
     public static final ObjectMapper sysPropertiesAwareMapper = new ObjectMapper(new SystemPropertiesJsonParserFactory());
 
     static {
+        mapper.registerModule(new Jdk8Module());
         mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
         mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
         prettyMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);

diff --git a/js/apps/account-ui/index.html b/js/apps/account-ui/index.html
diff --git a/js/apps/account-ui/maven-resources/theme/keycloak.v3/account/index.ftl b/js/apps/account-ui/maven-resources/theme/keycloak.v3/account/index.ftl
@@ -0,0 +1,139 @@
+<!doctype html>
+<html lang="${locale}">
+  <head>
+    <meta charset="utf-8">
+    <base href="${resourceUrl}/">
+    <link rel="icon" type="${properties.favIconType!'image/svg+xml'}" href="${resourceUrl}${properties.favIcon!'/favicon.svg'}">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="description" content="${properties.description!'The Account Console is a web-based interface for managing your account.'}">
+    <title>${properties.title!'Account Management'}</title>
+    <style>
+      body {
+        margin: 0;
+      }
+
+      body, #app {
+        height: 100%;
+      }
+
+      .container {
+        padding: 0;
+        margin: 0;
+        width: 100%;
+      }
+
+      .keycloak__loading-container {
+        height: 100vh;
+        width: 100%;
+        background-color: #f0f0f0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex-direction: column;
+        margin: 0;
+      }
+
+      #loading-text {
+        z-index: 1000;
+        font-size: 20px;
+        font-weight: 600;
+        padding-top: 32px;
+      }
+    </style>
+    <script type="importmap">
+      {
+        "imports": {
+          "react": "${resourceCommonUrl}/vendor/react/react.production.min.js",
+          "react/jsx-runtime": "${resourceCommonUrl}/vendor/react/react-jsx-runtime.production.min.js",
+          "react-dom": "${resourceCommonUrl}/vendor/react-dom/react-dom.production.min.js"
+        }
+      }
+    </script>
+    <#if devServerUrl?has_content>
+      <script type="module">
+        import { injectIntoGlobalHook } from "${devServerUrl}/@react-refresh";
+
+        injectIntoGlobalHook(window);
+        window.$RefreshReg$ = () => {};
+        window.$RefreshSig$ = () => (type) => type;
+      </script>
+      <script type="module">
+        import { inject } from "${devServerUrl}/@vite-plugin-checker-runtime";
+
+        inject({
+          overlayConfig: {},
+          base: "/",
+        });
+      </script>
+      <script type="module" src="${devServerUrl}/@vite/client"></script>
+      <script type="module" src="${devServerUrl}/src/main.tsx"></script>
+    </#if>
+    <#if entryStyles?has_content>
+      <#list entryStyles as style>
+        <link rel="stylesheet" href="${resourceUrl}/${style}">
+      </#list>
+    </#if>
+    <#if properties.styles?has_content>
+      <#list properties.styles?split(' ') as style>
+        <link rel="stylesheet" href="${resourceUrl}/${style}">
+      </#list>
+    </#if>
+    <#if entryScript?has_content>
+      <script type="module" src="${resourceUrl}/${entryScript}"></script>
+    </#if>
+    <#if properties.scripts?has_content>
+      <#list properties.scripts?split(' ') as script>
+        <script type="module" src="${resourceUrl}/${script}"></script>
+      </#list>
+    </#if>
+    <#if entryImports?has_content>
+      <#list entryImports as import>
+        <link rel="modulepreload" href="${resourceUrl}/${import}">
+      </#list>
+    </#if>
+  </head>
+  <body>
+    <div id="app">
+      <main class="container">
+        <div class="keycloak__loading-container">
+          <span class="pf-c-spinner pf-m-xl" role="progressbar" aria-valuetext="Loading&hellip;">
+            <span class="pf-c-spinner__clipper"></span>
+            <span class="pf-c-spinner__lead-ball"></span>
+            <span class="pf-c-spinner__tail-ball"></span>
+          </span>
+          <div>
+            <p id="loading-text">Loading the Account Console</p>
+          </div>
+        </div>
+      </main>
+    </div>
+    <noscript>JavaScript is required to use the Account Console.</noscript>
+    <script id="environment" type="application/json">
+      {
+        "authUrl": "${authUrl}",
+        "authServerUrl": "${authServerUrl}",
+        "realm": "${realm.name}",
+        "clientId": "${clientId}",
+        "resourceUrl": "${resourceUrl}",
+        "logo": "${properties.logo!""}",
+        "logoUrl": "${properties.logoUrl!""}",
+        "baseUrl": "${baseUrl}",
+        "locale": "${locale}",
+        "referrerName": "${referrerName!""}",
+        "referrerUrl": "${referrer_uri!""}",
+        "features": {
+          "isRegistrationEmailAsUsername": ${realm.registrationEmailAsUsername?c},
+          "isEditUserNameAllowed": ${realm.editUsernameAllowed?c},
+          "isInternationalizationEnabled": ${realm.isInternationalizationEnabled()?c},
+          "isLinkedAccountsEnabled": ${realm.identityFederationEnabled?c},
+          "isMyResourcesEnabled": ${(realm.userManagedAccessAllowed && isAuthorizationEnabled)?c},
+          "deleteAccountAllowed": ${deleteAccountAllowed?c},
+          "updateEmailFeatureEnabled": ${updateEmailFeatureEnabled?c},
+          "updateEmailActionEnabled": ${updateEmailActionEnabled?c},
+          "isViewGroupsEnabled": ${isViewGroupsEnabled?c},
+          "isOid4VciEnabled": ${isOid4VciEnabled?c}
+        }
+      }
+    </script>
+  </body>
+</html>
diff --git a/js/apps/account-ui/playwright.config.ts b/js/apps/account-ui/playwright.config.ts
@@ -1,5 +1,6 @@
 import { defineConfig, devices } from "@playwright/test";
-import { getRootPath } from "./src/utils/getRootPath";
+
+import { getAccountUrl } from "./test/utils";
 
 /**
  * See https://playwright.dev/docs/test-configuration.
@@ -16,7 +17,7 @@ export default defineConfig({
   },
 
   use: {
-    baseURL: `http://localhost:8080${getRootPath()}`,
+    baseURL: getAccountUrl(),
     trace: "on-first-retry",
   },