From 3edb23be97fc0a4c323bf33227775af00aa35c89 Mon Sep 17 00:00:00 2001 From: garronej Date: Mon, 3 Apr 2023 20:16:38 +0200 Subject: [PATCH] #297 --- src/account/kcContext/getKcContext.ts | 4 ++- src/bin/eject-keycloak-page.ts | 2 +- .../keycloakify/generateFtl/generateFtl.ts | 31 ------------------- src/bin/keycloakify/generateFtl/index.ts | 1 + src/bin/keycloakify/generateFtl/pageId.ts | 30 ++++++++++++++++++ src/login/kcContext/getKcContext.ts | 3 +- 6 files changed, 37 insertions(+), 34 deletions(-) create mode 100644 src/bin/keycloakify/generateFtl/pageId.ts diff --git a/src/account/kcContext/getKcContext.ts b/src/account/kcContext/getKcContext.ts index 76dce92d..eab7d508 100644 --- a/src/account/kcContext/getKcContext.ts +++ b/src/account/kcContext/getKcContext.ts @@ -7,6 +7,8 @@ import { pathBasename } from "keycloakify/tools/pathBasename"; import { mockTestingResourcesCommonPath } from "keycloakify/bin/mockTestingResourcesPath"; import { symToStr } from "tsafe/symToStr"; import { kcContextMocks, kcContextCommonMock } from "keycloakify/account/kcContext/kcContextMocks"; +import { id } from "tsafe/id"; +import { accountThemePageIds } from "keycloakify/bin/keycloakify/generateFtl/pageId"; export function getKcContext(params?: { mockPageId?: ExtendKcContext["pageId"]; @@ -62,7 +64,7 @@ export function getKcContext(accountThemePageIds).indexOf(realKcContext.pageId) < 0 && !("account" in realKcContext)) { return { "kcContext": undefined }; } diff --git a/src/bin/eject-keycloak-page.ts b/src/bin/eject-keycloak-page.ts index e60737bb..3c3e5e9b 100644 --- a/src/bin/eject-keycloak-page.ts +++ b/src/bin/eject-keycloak-page.ts @@ -9,7 +9,7 @@ import { type AccountThemePageId, themeTypes, type ThemeType -} from "./keycloakify/generateFtl/generateFtl"; +} from "./keycloakify/generateFtl"; import { capitalize } from "tsafe/capitalize"; import { readFile, writeFile } from "fs/promises"; import { existsSync } from "fs"; diff --git a/src/bin/keycloakify/generateFtl/generateFtl.ts b/src/bin/keycloakify/generateFtl/generateFtl.ts index bd17bb48..0689d212 100644 --- a/src/bin/keycloakify/generateFtl/generateFtl.ts +++ b/src/bin/keycloakify/generateFtl/generateFtl.ts @@ -13,37 +13,6 @@ export const themeTypes = ["login", "account"] as const; export type ThemeType = (typeof themeTypes)[number]; -export const loginThemePageIds = [ - "login.ftl", - "login-username.ftl", - "login-password.ftl", - "webauthn-authenticate.ftl", - "register.ftl", - "register-user-profile.ftl", - "info.ftl", - "error.ftl", - "login-reset-password.ftl", - "login-verify-email.ftl", - "terms.ftl", - "login-otp.ftl", - "login-update-profile.ftl", - "login-update-password.ftl", - "login-idp-link-confirm.ftl", - "login-idp-link-email.ftl", - "login-page-expired.ftl", - "login-config-totp.ftl", - "logout-confirm.ftl", - "update-user-profile.ftl", - "idp-review-user-profile.ftl", - "update-email.ftl", - "select-authenticator.ftl" -] as const; - -export const accountThemePageIds = ["password.ftl", "account.ftl"] as const; - -export type LoginThemePageId = (typeof loginThemePageIds)[number]; -export type AccountThemePageId = (typeof accountThemePageIds)[number]; - export type BuildOptionsLike = BuildOptionsLike.Standalone | BuildOptionsLike.ExternalAssets; export namespace BuildOptionsLike { diff --git a/src/bin/keycloakify/generateFtl/index.ts b/src/bin/keycloakify/generateFtl/index.ts index 3a6d8e56..2d57d5e4 100644 --- a/src/bin/keycloakify/generateFtl/index.ts +++ b/src/bin/keycloakify/generateFtl/index.ts @@ -1 +1,2 @@ export * from "./generateFtl"; +export * from "./pageId"; diff --git a/src/bin/keycloakify/generateFtl/pageId.ts b/src/bin/keycloakify/generateFtl/pageId.ts new file mode 100644 index 00000000..a9504723 --- /dev/null +++ b/src/bin/keycloakify/generateFtl/pageId.ts @@ -0,0 +1,30 @@ +export const loginThemePageIds = [ + "login.ftl", + "login-username.ftl", + "login-password.ftl", + "webauthn-authenticate.ftl", + "register.ftl", + "register-user-profile.ftl", + "info.ftl", + "error.ftl", + "login-reset-password.ftl", + "login-verify-email.ftl", + "terms.ftl", + "login-otp.ftl", + "login-update-profile.ftl", + "login-update-password.ftl", + "login-idp-link-confirm.ftl", + "login-idp-link-email.ftl", + "login-page-expired.ftl", + "login-config-totp.ftl", + "logout-confirm.ftl", + "update-user-profile.ftl", + "idp-review-user-profile.ftl", + "update-email.ftl", + "select-authenticator.ftl" +] as const; + +export const accountThemePageIds = ["password.ftl", "account.ftl"] as const; + +export type LoginThemePageId = (typeof loginThemePageIds)[number]; +export type AccountThemePageId = (typeof accountThemePageIds)[number]; diff --git a/src/login/kcContext/getKcContext.ts b/src/login/kcContext/getKcContext.ts index 0bd877e5..82d01789 100644 --- a/src/login/kcContext/getKcContext.ts +++ b/src/login/kcContext/getKcContext.ts @@ -11,6 +11,7 @@ import { pathJoin } from "keycloakify/bin/tools/pathJoin"; import { pathBasename } from "keycloakify/tools/pathBasename"; import { mockTestingResourcesCommonPath } from "keycloakify/bin/mockTestingResourcesPath"; import { symToStr } from "tsafe/symToStr"; +import { loginThemePageIds } from "keycloakify/bin/keycloakify/generateFtl/pageId"; export function getKcContext(params?: { mockPageId?: ExtendKcContext["pageId"]; @@ -121,7 +122,7 @@ export function getKcContext(loginThemePageIds).indexOf(realKcContext.pageId) < 0 && !("login" in realKcContext)) { return { "kcContext": undefined }; }