Fix some bugs in start-keycloak

src/bin/start-keycloak/myrealm-realm-24.json

@@ -598,7 +598,9 @@
             "publicClient": true,
             "frontchannelLogout": false,
             "protocol": "openid-connect",
-            "attributes": {},
+            "attributes": {
+                "post.logout.redirect.uris": "+"
+            },
             "authenticationFlowBindingOverrides": {},
             "fullScopeAllowed": false,
             "nodeReRegistrationTimeout": 0,
@@ -630,7 +632,9 @@
             "publicClient": false,
             "frontchannelLogout": false,
             "protocol": "openid-connect",
-            "attributes": {},
+            "attributes": {
+                "post.logout.redirect.uris": "+"
+            },
             "authenticationFlowBindingOverrides": {},
             "fullScopeAllowed": false,
             "nodeReRegistrationTimeout": 0,
@@ -812,7 +816,9 @@
             "publicClient": false,
             "frontchannelLogout": false,
             "protocol": "openid-connect",
-            "attributes": {},
+            "attributes": {
+                "post.logout.redirect.uris": "+"
+            },
             "authenticationFlowBindingOverrides": {},
             "fullScopeAllowed": false,
             "nodeReRegistrationTimeout": 0,
@@ -955,7 +961,8 @@
                     "config": {
                         "id.token.claim": "true",
                         "introspection.token.claim": "true",
-                        "access.token.claim": "true"
+                        "access.token.claim": "true",
+                        "userinfo.token.claim": "true"
                     }
                 }
             ]
@@ -995,6 +1002,7 @@
                     "config": {
                         "introspection.token.claim": "true",
                         "multivalued": "true",
+                        "userinfo.token.claim": "true",
                         "user.attribute": "foo",
                         "id.token.claim": "true",
                         "access.token.claim": "true",
@@ -1444,7 +1452,7 @@
     },
     "smtpServer": {},
     "loginTheme": "keycloak",
-    "accountTheme": "account-v1",
+    "accountTheme": "keycloakify-starter",
     "adminTheme": "",
     "emailTheme": "",
     "eventsEnabled": false,
@@ -1493,14 +1501,14 @@
                 "subComponents": {},
                 "config": {
                     "allowed-protocol-mapper-types": [
-                        "oidc-address-mapper",
-                        "oidc-full-name-mapper",
-                        "oidc-usermodel-attribute-mapper",
-                        "saml-user-attribute-mapper",
                         "oidc-sha256-pairwise-sub-mapper",
                         "saml-role-list-mapper",
+                        "oidc-address-mapper",
+                        "oidc-usermodel-property-mapper",
+                        "saml-user-attribute-mapper",
+                        "oidc-full-name-mapper",
                         "saml-user-property-mapper",
-                        "oidc-usermodel-property-mapper"
+                        "oidc-usermodel-attribute-mapper"
                     ]
                 }
             },
@@ -1532,13 +1540,13 @@
                 "subComponents": {},
                 "config": {
                     "allowed-protocol-mapper-types": [
-                        "oidc-usermodel-attribute-mapper",
-                        "saml-user-property-mapper",
-                        "oidc-address-mapper",
-                        "saml-role-list-mapper",
                         "oidc-sha256-pairwise-sub-mapper",
-                        "saml-user-attribute-mapper",
+                        "saml-user-property-mapper",
+                        "oidc-usermodel-attribute-mapper",
+                        "oidc-address-mapper",
                         "oidc-usermodel-property-mapper",
+                        "saml-role-list-mapper",
+                        "saml-user-attribute-mapper",
                         "oidc-full-name-mapper"
                     ]
                 }
@@ -2290,8 +2298,8 @@
         "cibaExpiresIn": "120",
         "cibaAuthRequestedUserHint": "login_hint",
         "oauth2DeviceCodeLifespan": "600",
-        "oauth2DevicePollingInterval": "5",
         "clientOfflineSessionMaxLifespan": "0",
+        "oauth2DevicePollingInterval": "5",
         "clientSessionIdleTimeout": "0",
         "parRequestUriLifespan": "60",
         "clientSessionMaxLifespan": "0",

src/bin/start-keycloak/start-keycloak.ts

@@ -27,6 +27,7 @@ import { Deferred } from "evt/tools/Deferred";
 import { getAbsoluteAndInOsFormatPath } from "../tools/getAbsoluteAndInOsFormatPath";
 import cliSelect from "cli-select";
 import { isInside } from "../tools/isInside";
+import * as runExclusive from "run-exclusive";
 
 export type CliCommandOptions = CliCommandOptions_common & {
     port: number;
@@ -396,6 +397,70 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
     }
 
     {
+        const runBuildKeycloakTheme = runExclusive.build(async () => {
+            console.log(chalk.cyan("Detected changes in the theme. Rebuilding ..."));
+
+            {
+                const dResult = new Deferred<{ isSuccess: boolean }>();
+
+                const child = child_process.spawn("npx", ["vite", "build"], {
+                    cwd: buildOptions.reactAppRootDirPath,
+                    env: process.env
+                });
+
+                child.stdout.on("data", data => {
+                    if (data.toString("utf8").includes("gzip:")) {
+                        return;
+                    }
+
+                    process.stdout.write(data);
+                });
+
+                child.stderr.on("data", data => process.stderr.write(data));
+
+                child.on("exit", code => dResult.resolve({ isSuccess: code === 0 }));
+
+                const { isSuccess } = await dResult.pr;
+
+                if (!isSuccess) {
+                    return;
+                }
+            }
+
+            {
+                const dResult = new Deferred<{ isSuccess: boolean }>();
+
+                const child = child_process.spawn("npx", ["keycloakify", "build"], {
+                    cwd: buildOptions.reactAppRootDirPath,
+                    env: {
+                        ...process.env,
+                        [skipBuildJarsEnvName]: "true"
+                    }
+                });
+
+                child.stdout.on("data", data => process.stdout.write(data));
+
+                child.stderr.on("data", data => process.stderr.write(data));
+
+                child.on("exit", code => {
+                    if (code !== 0) {
+                        console.log(chalk.yellow("Theme not updated, build failed"));
+                        return;
+                    }
+
+                    console.log(chalk.green("Rebuild done"));
+                });
+
+                child.on("exit", code => dResult.resolve({ isSuccess: code === 0 }));
+
+                const { isSuccess } = await dResult.pr;
+
+                if (!isSuccess) {
+                    return;
+                }
+            }
+        });
+
         const { waitForDebounce } = waitForDebounceFactory({ delay: 400 });
 
         chokidar
@@ -403,72 +468,26 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
                 ignoreInitial: true
             })
             .on("all", async (...[, filePath]) => {
-                if (
+                for (const dir1 of ["src", "."]) {
-                    isInside({
+                    for (const dir2 of ["bin", "vite-plugin"]) {
-                        dirPath: pathJoin(getThisCodebaseRootDirPath(), "src", "bin"),
+                        if (
-                        filePath
+                            isInside({
-                    }) ||
+                                dirPath: pathJoin(
-                    isInside({
+                                    getThisCodebaseRootDirPath(),
-                        dirPath: pathJoin(getThisCodebaseRootDirPath(), "bin"),
+                                    dir1,
-                        filePath
+                                    dir2
-                    })
+                                ),
-                ) {
+                                filePath
-                    return;
+                            })
+                        ) {
+                            return;
+                        }
+                    }
                 }
 
                 await waitForDebounce();
 
-                console.log(chalk.cyan("Detected changes in the theme. Rebuilding ..."));
+                runBuildKeycloakTheme();
-
-                const dViteBuildDone = new Deferred<void>();
-
-                {
-                    const child = child_process.spawn("npx", ["vite", "build"], {
-                        cwd: buildOptions.reactAppRootDirPath,
-                        env: process.env
-                    });
-
-                    child.stdout.on("data", data => {
-                        if (data.toString("utf8").includes("gzip:")) {
-                            return;
-                        }
-
-                        process.stdout.write(data);
-                    });
-
-                    child.stderr.on("data", data => process.stderr.write(data));
-
-                    child.on("exit", code => {
-                        if (code === 0) {
-                            dViteBuildDone.resolve();
-                        }
-                    });
-                }
-
-                await dViteBuildDone.pr;
-
-                {
-                    const child = child_process.spawn("npx", ["keycloakify", "build"], {
-                        cwd: buildOptions.reactAppRootDirPath,
-                        env: {
-                            ...process.env,
-                            [skipBuildJarsEnvName]: "true"
-                        }
-                    });
-
-                    child.stdout.on("data", data => process.stdout.write(data));
-
-                    child.stderr.on("data", data => process.stderr.write(data));
-
-                    child.on("exit", code => {
-                        if (code !== 0) {
-                            console.log(chalk.yellow("Theme not updated, build failed"));
-                            return;
-                        }
-
-                        console.log(chalk.green("Rebuild done"));
-                    });
-                }
             });
     }
 }