keycloakify 11.13.5 → 11.13.7

package/bin/97.index.js

@@ -144,16 +144,40 @@ async function getExtensionModuleMetas(params) {
         return configHash;
     })();
     const installedExtensionModules = await (async () => {
-        const installedModulesWithKeycloakifyInTheName = await (0,listInstalledModules/* listInstalledModules */.P)({
+        let installedExtensionModules = await (0,listInstalledModules/* listInstalledModules */.P)({
             packageJsonFilePath: buildContext.packageJsonFilePath,
             filter: ({ moduleName }) => moduleName.includes("keycloakify") && moduleName !== "keycloakify"
         });
-        return (await Promise.all(installedModulesWithKeycloakifyInTheName.map(async (entry) => {
+        installedExtensionModules = (await Promise.all(installedExtensionModules.map(async (entry) => {
             if (!(await (0,fs_existsAsync/* existsAsync */.o)((0,external_path_.join)(entry.dirPath, constants/* KEYCLOAK_THEME */.PC)))) {
                 return undefined;
             }
             return entry;
         }))).filter((0,exclude/* exclude */.D)(undefined));
+        maybe_exclude_login_ui: {
+            const LOGIN_UI_MODULE_NAME = "@keycloakify/login-ui";
+            if (!installedExtensionModules
+                .map(({ moduleName }) => moduleName)
+                .includes(LOGIN_UI_MODULE_NAME)) {
+                break maybe_exclude_login_ui;
+            }
+            const shouldExcludeLoginUi = await (async () => {
+                for (const entry of installedExtensionModules) {
+                    if (entry.moduleName === LOGIN_UI_MODULE_NAME) {
+                        continue;
+                    }
+                    if (await (0,fs_existsAsync/* existsAsync */.o)((0,external_path_.join)(entry.dirPath, constants/* KEYCLOAK_THEME */.PC, "login", "pages", "login"))) {
+                        return true;
+                    }
+                }
+                return false;
+            })();
+            if (!shouldExcludeLoginUi) {
+                break maybe_exclude_login_ui;
+            }
+            installedExtensionModules = installedExtensionModules.filter(({ moduleName }) => moduleName !== LOGIN_UI_MODULE_NAME);
+        }
+        return installedExtensionModules;
     })();
     const cacheContent = await (async () => {
         if (!(await (0,fs_existsAsync/* existsAsync */.o)(cacheFilePath))) {

package/login/pages/UpdateEmail.js

@@ -10,7 +10,7 @@ export default function UpdateEmail(props) {
     const { msg, msgStr } = i18n;
     const [isFormSubmittable, setIsFormSubmittable] = useState(false);
     const { url, messagesPerField, isAppInitiatedAction } = kcContext;
-    return (_jsx(Template, Object.assign({ kcContext: kcContext, i18n: i18n, doUseDefaultCss: doUseDefaultCss, classes: classes, displayMessage: messagesPerField.exists("global"), displayRequiredFields: true, headerNode: msg("updateEmailTitle") }, { children: _jsxs("form", Object.assign({ id: "kc-update-email-form", className: kcClsx("kcFormClass"), action: url.loginAction, method: "post" }, { children: [_jsx(UserProfileFormFields, { kcContext: kcContext, i18n: i18n, kcClsx: kcClsx, onIsFormSubmittableValueChange: setIsFormSubmittable, doMakeUserConfirmPassword: doMakeUserConfirmPassword }), _jsxs("div", Object.assign({ className: kcClsx("kcFormGroupClass") }, { children: [_jsx("div", Object.assign({ id: "kc-form-options", className: kcClsx("kcFormOptionsClass") }, { children: _jsx("div", { className: kcClsx("kcFormOptionsWrapperClass") }) })), _jsx(LogoutOtherSessions, { kcClsx: kcClsx, i18n: i18n }), _jsxs("div", Object.assign({ id: "kc-form-buttons", className: kcClsx("kcFormButtonsClass") }, { children: [_jsx("input", { disabled: !isFormSubmittable, className: kcClsx("kcButtonClass", "kcButtonPrimaryClass", (!isAppInitiatedAction) && "kcButtonBlockClass", "kcButtonLargeClass"), type: "submit", value: msgStr("doSubmit") }), isAppInitiatedAction && (_jsx("button", Object.assign({ className: kcClsx("kcButtonClass", "kcButtonDefaultClass", "kcButtonLargeClass"), type: "submit", name: "cancel-aia", value: "true" }, { children: msg("doCancel") })))] }))] }))] })) })));
+    return (_jsx(Template, Object.assign({ kcContext: kcContext, i18n: i18n, doUseDefaultCss: doUseDefaultCss, classes: classes, displayMessage: messagesPerField.exists("global"), displayRequiredFields: true, headerNode: msg("updateEmailTitle") }, { children: _jsxs("form", Object.assign({ id: "kc-update-email-form", className: kcClsx("kcFormClass"), action: url.loginAction, method: "post" }, { children: [_jsx(UserProfileFormFields, { kcContext: kcContext, i18n: i18n, kcClsx: kcClsx, onIsFormSubmittableValueChange: setIsFormSubmittable, doMakeUserConfirmPassword: doMakeUserConfirmPassword }), _jsxs("div", Object.assign({ className: kcClsx("kcFormGroupClass") }, { children: [_jsx("div", Object.assign({ id: "kc-form-options", className: kcClsx("kcFormOptionsClass") }, { children: _jsx("div", { className: kcClsx("kcFormOptionsWrapperClass") }) })), _jsx(LogoutOtherSessions, { kcClsx: kcClsx, i18n: i18n }), _jsxs("div", Object.assign({ id: "kc-form-buttons", className: kcClsx("kcFormButtonsClass") }, { children: [_jsx("input", { disabled: !isFormSubmittable, className: kcClsx("kcButtonClass", "kcButtonPrimaryClass", !isAppInitiatedAction && "kcButtonBlockClass", "kcButtonLargeClass"), type: "submit", value: msgStr("doSubmit") }), isAppInitiatedAction && (_jsx("button", Object.assign({ className: kcClsx("kcButtonClass", "kcButtonDefaultClass", "kcButtonLargeClass"), type: "submit", name: "cancel-aia", value: "true" }, { children: msg("doCancel") })))] }))] }))] })) })));
 }
 function LogoutOtherSessions(props) {
     const { kcClsx, i18n } = props;

package/login/pages/UpdateEmail.js.map

@@ -1 +1 @@
-{"version":3,"file":"UpdateEmail.js","sourceRoot":"","sources":["../../src/login/pages/UpdateEmail.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"UpdateEmail.js","sourceRoot":"","sources":["../../src/login/pages/UpdateEmail.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjC,OAAO,EAAE,SAAS,EAAe,MAAM,8BAA8B,CAAC;AAWtE,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,KAAuB;IACvD,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,OAAO,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,GAAG,KAAK,CAAC;IAExH,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;QACzB,eAAe;QACf,OAAO;KACV,CAAC,CAAC;IAEH,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAE7B,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAElE,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,GAAG,SAAS,CAAC;IAElE,OAAO,CACH,KAAC,QAAQ,kBACL,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,IAAI,EACV,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,EACjD,qBAAqB,QACrB,UAAU,EAAE,GAAG,CAAC,kBAAkB,CAAC,gBAEnC,8BAAM,EAAE,EAAC,sBAAsB,EAAC,SAAS,EAAE,MAAM,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,WAAW,EAAE,MAAM,EAAC,MAAM,iBACpG,KAAC,qBAAqB,IAClB,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,8BAA8B,EAAE,oBAAoB,EACpD,yBAAyB,EAAE,yBAAyB,GACtD,EAEF,6BAAK,SAAS,EAAE,MAAM,CAAC,kBAAkB,CAAC,iBACtC,4BAAK,EAAE,EAAC,iBAAiB,EAAC,SAAS,EAAE,MAAM,CAAC,oBAAoB,CAAC,gBAC7D,cAAK,SAAS,EAAE,MAAM,CAAC,2BAA2B,CAAC,GAAI,IACrD,EAEN,KAAC,mBAAmB,IAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAI,EAEnD,6BAAK,EAAE,EAAC,iBAAiB,EAAC,SAAS,EAAE,MAAM,CAAC,oBAAoB,CAAC,iBAC7D,gBACI,QAAQ,EAAE,CAAC,iBAAiB,EAC5B,SAAS,EAAE,MAAM,CACb,eAAe,EACf,sBAAsB,EACtB,CAAC,oBAAoB,IAAI,oBAAoB,EAC7C,oBAAoB,CACvB,EACD,IAAI,EAAC,QAAQ,EACb,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,GAC3B,EACD,oBAAoB,IAAI,CACrB,+BACI,SAAS,EAAE,MAAM,CAAC,eAAe,EAAE,sBAAsB,EAAE,oBAAoB,CAAC,EAChF,IAAI,EAAC,QAAQ,EACb,IAAI,EAAC,YAAY,EACjB,KAAK,EAAC,MAAM,gBAEX,GAAG,CAAC,UAAU,CAAC,IACX,CACZ,KACC,KACJ,KACH,IACA,CACd,CAAC;AACN,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAqC;IAC9D,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IAE/B,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAErB,OAAO,CACH,4BAAK,EAAE,EAAC,iBAAiB,EAAC,SAAS,EAAE,MAAM,CAAC,oBAAoB,CAAC,gBAC7D,4BAAK,SAAS,EAAE,MAAM,CAAC,2BAA2B,CAAC,gBAC/C,4BAAK,SAAS,EAAC,UAAU,gBACrB,4BACI,gBAAO,IAAI,EAAC,UAAU,EAAC,EAAE,EAAC,iBAAiB,EAAC,IAAI,EAAC,iBAAiB,EAAC,KAAK,EAAC,IAAI,EAAC,cAAc,EAAE,IAAI,GAAI,EACrG,GAAG,CAAC,qBAAqB,CAAC,IACvB,IACN,IACJ,IACJ,CACT,CAAC;AACN,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "11.13.5",
+    "version": "11.13.7",
     "description": "Framework to create custom Keycloak UIs",
     "repository": {
         "type": "git",

package/src/bin/keycloakify/generateFtl/kcContextDeclarationTemplate.ftl

@@ -206,8 +206,14 @@ function decodeHtmlEntities(htmlStr){
                     We cherry pick what we use in it in the exclusion section.
                 -->
                 <#if (
-                    xKeycloakify.pageId == "index.ftl" &&
-                    xKeycloakify.themeType == "account"
+                    (
+                        xKeycloakify.pageId == "index.ftl" &&
+                        xKeycloakify.themeType == "account"
+                    ) || (
+                        <#-- For some reason it's also the case for error.ftl -->
+                        xKeycloakify.pageId == "error.ftl" &&
+                        xKeycloakify.themeType == "login"
+                    )
                 )>
                     <#break>
                 </#if>
@@ -284,6 +290,10 @@ function decodeHtmlEntities(htmlStr){
                     areSamePath(path, []) &&
                     ["login-idp-link-confirm.ftl", "login-idp-link-email.ftl" ]?seq_contains(xKeycloakify.pageId)
                 ) ||  (
+                    <#-- NOTE: This condition is almost certainly dead code since we exclude the realm prop
+                         when it's an internal representation.
+                         And when we bypass (account index.ftl, error.ftl) we cherry pick...
+                     -->
                     ["masterAdminClient", "delegateForUpdate", "defaultRole", "smtpConfig"]?seq_contains(key) &&
                     areSamePath(path, ["realm"])
                 ) || (

package/src/bin/sync-extensions/extensionModuleMeta.ts

@@ -114,15 +114,15 @@ export async function getExtensionModuleMetas(params: {
     })();
 
     const installedExtensionModules = await (async () => {
-        const installedModulesWithKeycloakifyInTheName = await listInstalledModules({
+        let installedExtensionModules = await listInstalledModules({
             packageJsonFilePath: buildContext.packageJsonFilePath,
             filter: ({ moduleName }) =>
                 moduleName.includes("keycloakify") && moduleName !== "keycloakify"
         });
 
-        return (
+        installedExtensionModules = (
             await Promise.all(
-                installedModulesWithKeycloakifyInTheName.map(async entry => {
+                installedExtensionModules.map(async entry => {
                     if (!(await existsAsync(pathJoin(entry.dirPath, KEYCLOAK_THEME)))) {
                         return undefined;
                     }
@@ -130,6 +130,52 @@ export async function getExtensionModuleMetas(params: {
                 })
             )
         ).filter(exclude(undefined));
+
+        maybe_exclude_login_ui: {
+            const LOGIN_UI_MODULE_NAME = "@keycloakify/login-ui";
+
+            if (
+                !installedExtensionModules
+                    .map(({ moduleName }) => moduleName)
+                    .includes(LOGIN_UI_MODULE_NAME)
+            ) {
+                break maybe_exclude_login_ui;
+            }
+
+            const shouldExcludeLoginUi = await (async () => {
+                for (const entry of installedExtensionModules) {
+                    if (entry.moduleName === LOGIN_UI_MODULE_NAME) {
+                        continue;
+                    }
+
+                    if (
+                        await existsAsync(
+                            pathJoin(
+                                entry.dirPath,
+                                KEYCLOAK_THEME,
+                                "login",
+                                "pages",
+                                "login"
+                            )
+                        )
+                    ) {
+                        return true;
+                    }
+                }
+
+                return false;
+            })();
+
+            if (!shouldExcludeLoginUi) {
+                break maybe_exclude_login_ui;
+            }
+
+            installedExtensionModules = installedExtensionModules.filter(
+                ({ moduleName }) => moduleName !== LOGIN_UI_MODULE_NAME
+            );
+        }
+
+        return installedExtensionModules;
     })();
 
     const cacheContent = await (async () => {

package/src/login/pages/UpdateEmail.tsx

@@ -58,7 +58,7 @@ export default function UpdateEmail(props: UpdateEmailProps) {
                             className={kcClsx(
                                 "kcButtonClass",
                                 "kcButtonPrimaryClass",
-                                (!isAppInitiatedAction) && "kcButtonBlockClass",
+                                !isAppInitiatedAction && "kcButtonBlockClass",
                                 "kcButtonLargeClass"
                             )}
                             type="submit"