keycloakify 6.3.5 → 6.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "6.3.5",
+    "version": "6.4.0",
     "description": "Keycloak theme generator for Reacts app",
     "repository": {
         "type": "git",
@@ -1277,12 +1277,12 @@
         "@octokit/rest": "^18.12.0",
         "cheerio": "^1.0.0-rc.5",
         "cli-select": "^1.1.2",
-        "evt": "^2.4.1",
+        "evt": "^2.4.2",
         "memoizee": "^0.4.15",
         "minimal-polyfills": "^2.2.2",
         "minimist": "^1.2.6",
         "path-browserify": "^1.0.1",
-        "powerhooks": "^0.20.16",
+        "powerhooks": "^0.20.17",
         "react-markdown": "^5.0.3",
         "scripting-tools": "^0.19.13",
         "tsafe": "^1.0.1",

package/src/lib/components/Error.tsx

@@ -4,31 +4,37 @@ import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { I18n } from "../i18n";
 
-const Error = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.Error; i18n: I18n } & KcProps) => {
-    const { message, client } = kcContext;
+const Error = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.Error; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { message, client } = kcContext;
 
-    const { msg } = i18n;
+        const { msg } = i18n;
 
-    return (
-        <Template
-            {...{ kcContext, i18n, ...props }}
-            doFetchDefaultThemeResources={true}
-            displayMessage={false}
-            headerNode={msg("errorTitle")}
-            formNode={
-                <div id="kc-error-message">
-                    <p className="instruction">{message.summary}</p>
-                    {client !== undefined && client.baseUrl !== undefined && (
-                        <p>
-                            <a id="backToApplication" href={client.baseUrl}>
-                                {msg("backToApplication")}
-                            </a>
-                        </p>
-                    )}
-                </div>
-            }
-        />
-    );
-});
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                displayMessage={false}
+                headerNode={msg("errorTitle")}
+                formNode={
+                    <div id="kc-error-message">
+                        <p className="instruction">{message.summary}</p>
+                        {client !== undefined && client.baseUrl !== undefined && (
+                            <p>
+                                <a id="backToApplication" href={client.baseUrl}>
+                                    {msg("backToApplication")}
+                                </a>
+                            </p>
+                        )}
+                    </div>
+                }
+            />
+        );
+    }
+);
 
 export default Error;

package/src/lib/components/IdpReviewUserProfile.tsx

@@ -6,41 +6,52 @@ import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 import { UserProfileFormFields } from "./shared/UserProfileCommons";
 
-const IdpReviewUserProfile = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.IdpReviewUserProfile; i18n: I18n } & KcProps) => {
-    const { cx } = useCssAndCx();
+const IdpReviewUserProfile = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.IdpReviewUserProfile; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { cx } = useCssAndCx();
 
-    const { msg, msgStr } = i18n;
+        const { msg, msgStr } = i18n;
 
-    const { url } = kcContext;
+        const { url } = kcContext;
 
-    const [isFomSubmittable, setIsFomSubmittable] = useState(false);
+        const [isFomSubmittable, setIsFomSubmittable] = useState(false);
 
-    return (
-        <Template
-            {...{ kcContext, i18n, ...props }}
-            doFetchDefaultThemeResources={true}
-            headerNode={msg("loginIdpReviewProfileTitle")}
-            formNode={
-                <form id="kc-idp-review-profile-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
-                    <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...props} />
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                headerNode={msg("loginIdpReviewProfileTitle")}
+                formNode={
+                    <form id="kc-idp-review-profile-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
+                        <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...props} />
 
-                    <div className={cx(props.kcFormGroupClass)}>
-                        <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                            <div className={cx(props.kcFormOptionsWrapperClass)} />
+                        <div className={cx(props.kcFormGroupClass)}>
+                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
+                                <div className={cx(props.kcFormOptionsWrapperClass)} />
+                            </div>
+                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
+                                <input
+                                    className={cx(
+                                        props.kcButtonClass,
+                                        props.kcButtonPrimaryClass,
+                                        props.kcButtonBlockClass,
+                                        props.kcButtonLargeClass
+                                    )}
+                                    type="submit"
+                                    value={msgStr("doSubmit")}
+                                    disabled={!isFomSubmittable}
+                                />
+                            </div>
                         </div>
-                        <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
-                            <input
-                                className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonBlockClass, props.kcButtonLargeClass)}
-                                type="submit"
-                                value={msgStr("doSubmit")}
-                                disabled={!isFomSubmittable}
-                            />
-                        </div>
-                    </div>
-                </form>
-            }
-        />
-    );
-});
+                    </form>
+                }
+            />
+        );
+    }
+);
 
 export default IdpReviewUserProfile;

package/src/lib/components/Info.tsx

@@ -5,47 +5,53 @@ import { assert } from "../tools/assert";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { I18n } from "../i18n";
 
-const Info = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.Info; i18n: I18n } & KcProps) => {
-    const { msgStr, msg } = i18n;
+const Info = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.Info; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { msgStr, msg } = i18n;
 
-    assert(kcContext.message !== undefined);
+        assert(kcContext.message !== undefined);
 
-    const { messageHeader, message, requiredActions, skipLink, pageRedirectUri, actionUri, client } = kcContext;
+        const { messageHeader, message, requiredActions, skipLink, pageRedirectUri, actionUri, client } = kcContext;
 
-    return (
-        <Template
-            {...{ kcContext, i18n, ...props }}
-            doFetchDefaultThemeResources={true}
-            displayMessage={false}
-            headerNode={messageHeader !== undefined ? <>{messageHeader}</> : <>{message.summary}</>}
-            formNode={
-                <div id="kc-info-message">
-                    <p className="instruction">
-                        {message.summary}
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                displayMessage={false}
+                headerNode={messageHeader !== undefined ? <>{messageHeader}</> : <>{message.summary}</>}
+                formNode={
+                    <div id="kc-info-message">
+                        <p className="instruction">
+                            {message.summary}
 
-                        {requiredActions !== undefined && (
-                            <b>{requiredActions.map(requiredAction => msgStr(`requiredAction.${requiredAction}` as const)).join(",")}</b>
-                        )}
-                    </p>
-                    {!skipLink && pageRedirectUri !== undefined ? (
-                        <p>
-                            <a href={pageRedirectUri}>{msg("backToApplication")}</a>
-                        </p>
-                    ) : actionUri !== undefined ? (
-                        <p>
-                            <a href={actionUri}>{msg("proceedWithAction")}</a>
+                            {requiredActions !== undefined && (
+                                <b>{requiredActions.map(requiredAction => msgStr(`requiredAction.${requiredAction}` as const)).join(",")}</b>
+                            )}
                         </p>
-                    ) : (
-                        client.baseUrl !== undefined && (
+                        {!skipLink && pageRedirectUri !== undefined ? (
                             <p>
-                                <a href={client.baseUrl}>{msg("backToApplication")}</a>
+                                <a href={pageRedirectUri}>{msg("backToApplication")}</a>
                             </p>
-                        )
-                    )}
-                </div>
-            }
-        />
-    );
-});
+                        ) : actionUri !== undefined ? (
+                            <p>
+                                <a href={actionUri}>{msg("proceedWithAction")}</a>
+                            </p>
+                        ) : (
+                            client.baseUrl !== undefined && (
+                                <p>
+                                    <a href={client.baseUrl}>{msg("backToApplication")}</a>
+                                </p>
+                            )
+                        )}
+                    </div>
+                }
+            />
+        );
+    }
+);
 
 export default Info;

package/src/lib/components/KcApp.tsx

@@ -23,67 +23,73 @@ const LogoutConfirm = lazy(() => import("./LogoutConfirm"));
 const UpdateUserProfile = lazy(() => import("./UpdateUserProfile"));
 const IdpReviewUserProfile = lazy(() => import("./IdpReviewUserProfile"));
 
-const KcApp = memo(({ kcContext, i18n: userProvidedI18n, ...kcProps }: { kcContext: KcContextBase; i18n?: I18n } & KcProps) => {
-    const i18n = (function useClosure() {
-        const i18n = useI18n({
-            kcContext,
-            "extraMessages": {},
-            "doSkip": userProvidedI18n !== undefined
-        });
+const KcApp = memo(
+    ({
+        kcContext,
+        i18n: userProvidedI18n,
+        ...kcProps
+    }: { kcContext: KcContextBase; i18n?: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const i18n = (function useClosure() {
+            const i18n = useI18n({
+                kcContext,
+                "extraMessages": {},
+                "doSkip": userProvidedI18n !== undefined
+            });
 
-        return userProvidedI18n ?? i18n;
-    })();
+            return userProvidedI18n ?? i18n;
+        })();
 
-    if (i18n === null) {
-        return null;
-    }
+        if (i18n === null) {
+            return null;
+        }
 
-    const props = { i18n, ...kcProps };
+        const props = { i18n, ...kcProps };
 
-    return (
-        <Suspense>
-            {(() => {
-                switch (kcContext.pageId) {
-                    case "login.ftl":
-                        return <Login {...{ kcContext, ...props }} />;
-                    case "register.ftl":
-                        return <Register {...{ kcContext, ...props }} />;
-                    case "register-user-profile.ftl":
-                        return <RegisterUserProfile {...{ kcContext, ...props }} />;
-                    case "info.ftl":
-                        return <Info {...{ kcContext, ...props }} />;
-                    case "error.ftl":
-                        return <Error {...{ kcContext, ...props }} />;
-                    case "login-reset-password.ftl":
-                        return <LoginResetPassword {...{ kcContext, ...props }} />;
-                    case "login-verify-email.ftl":
-                        return <LoginVerifyEmail {...{ kcContext, ...props }} />;
-                    case "terms.ftl":
-                        return <Terms {...{ kcContext, ...props }} />;
-                    case "login-otp.ftl":
-                        return <LoginOtp {...{ kcContext, ...props }} />;
-                    case "login-update-password.ftl":
-                        return <LoginUpdatePassword {...{ kcContext, ...props }} />;
-                    case "login-update-profile.ftl":
-                        return <LoginUpdateProfile {...{ kcContext, ...props }} />;
-                    case "login-idp-link-confirm.ftl":
-                        return <LoginIdpLinkConfirm {...{ kcContext, ...props }} />;
-                    case "login-idp-link-email.ftl":
-                        return <LoginIdpLinkEmail {...{ kcContext, ...props }} />;
-                    case "login-page-expired.ftl":
-                        return <LoginPageExpired {...{ kcContext, ...props }} />;
-                    case "login-config-totp.ftl":
-                        return <LoginConfigTotp {...{ kcContext, ...props }} />;
-                    case "logout-confirm.ftl":
-                        return <LogoutConfirm {...{ kcContext, ...props }} />;
-                    case "update-user-profile.ftl":
-                        return <UpdateUserProfile {...{ kcContext, ...props }} />;
-                    case "idp-review-user-profile.ftl":
-                        return <IdpReviewUserProfile {...{ kcContext, ...props }} />;
-                }
-            })()}
-        </Suspense>
-    );
-});
+        return (
+            <Suspense>
+                {(() => {
+                    switch (kcContext.pageId) {
+                        case "login.ftl":
+                            return <Login {...{ kcContext, ...props }} />;
+                        case "register.ftl":
+                            return <Register {...{ kcContext, ...props }} />;
+                        case "register-user-profile.ftl":
+                            return <RegisterUserProfile {...{ kcContext, ...props }} />;
+                        case "info.ftl":
+                            return <Info {...{ kcContext, ...props }} />;
+                        case "error.ftl":
+                            return <Error {...{ kcContext, ...props }} />;
+                        case "login-reset-password.ftl":
+                            return <LoginResetPassword {...{ kcContext, ...props }} />;
+                        case "login-verify-email.ftl":
+                            return <LoginVerifyEmail {...{ kcContext, ...props }} />;
+                        case "terms.ftl":
+                            return <Terms {...{ kcContext, ...props }} />;
+                        case "login-otp.ftl":
+                            return <LoginOtp {...{ kcContext, ...props }} />;
+                        case "login-update-password.ftl":
+                            return <LoginUpdatePassword {...{ kcContext, ...props }} />;
+                        case "login-update-profile.ftl":
+                            return <LoginUpdateProfile {...{ kcContext, ...props }} />;
+                        case "login-idp-link-confirm.ftl":
+                            return <LoginIdpLinkConfirm {...{ kcContext, ...props }} />;
+                        case "login-idp-link-email.ftl":
+                            return <LoginIdpLinkEmail {...{ kcContext, ...props }} />;
+                        case "login-page-expired.ftl":
+                            return <LoginPageExpired {...{ kcContext, ...props }} />;
+                        case "login-config-totp.ftl":
+                            return <LoginConfigTotp {...{ kcContext, ...props }} />;
+                        case "logout-confirm.ftl":
+                            return <LogoutConfirm {...{ kcContext, ...props }} />;
+                        case "update-user-profile.ftl":
+                            return <UpdateUserProfile {...{ kcContext, ...props }} />;
+                        case "idp-review-user-profile.ftl":
+                            return <IdpReviewUserProfile {...{ kcContext, ...props }} />;
+                    }
+                })()}
+            </Suspense>
+        );
+    }
+);
 
 export default KcApp;