diff --git a/src/account/kcContext/KcContext.ts b/src/account/kcContext/KcContext.ts index f65a0a7f..6baf524c 100644 --- a/src/account/kcContext/KcContext.ts +++ b/src/account/kcContext/KcContext.ts @@ -164,21 +164,6 @@ export declare namespace KcContext { }; mode?: "qr" | "manual" | undefined | null; isAppInitiatedAction: boolean; - url: { - accountUrl: string; - passwordUrl: string; - totpUrl: string; - socialUrl: string; - sessionsUrl: string; - applicationsUrl: string; - logUrl: string; - resourceUrl: string; - resourcesCommonPath: string; - resourcesPath: string; - /** @deprecated, not present in recent keycloak version apparently, use kcContext.referrer instead */ - referrerURI?: string; - getLogoutUrl: () => string; - }; stateChecker: string; }; diff --git a/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl b/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl index bb9a4afc..87ca5aa9 100644 --- a/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl +++ b/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl @@ -249,26 +249,6 @@ } }; - <#if account??> - out["url"]["getLogoutUrl"] = function () { - <#attempt> - return "${url.getLogoutUrl()}"; - <#recover> - throw new Error("Failed to invoke url.getLogoutUrl() in the FreeMarker template"); - - }; - - - <#if pageId === "login-config-totp.ftl"> - out["totp"]["policy"]["getAlgorithmKey"] = function () { - <#attempt> - return "${totp.policy.getAlgorithmKey()}"; - <#recover> - throw new Error("Failed to invoke totp.policy.getAlgorithmKey() in the FreeMarker template"); - - }; - - out["keycloakifyVersion"] = "KEYCLOAKIFY_VERSION_xEdKd3xEdr"; out["themeVersion"] = "KEYCLOAKIFY_THEME_VERSION_sIgKd3xEdr3dx"; out["themeType"] = "KEYCLOAKIFY_THEME_TYPE_dExKd3xEdr"; @@ -470,6 +450,26 @@ + <#if are_same_path(path, ["url", "getLogoutUrl"])> + <#local returnValue = ""> + <#attempt> + <#local returnValue = auth.getLogoutUrl()> + <#recover> + <#return "ABORT: Couldn't evaluate url.getLogoutUrl()"> + + <#return 'function(){ return "' + returnValue + '"; }'> + + + <#if are_same_path(path, ["totp", "policy", "getAlgorithmKey"])> + <#local returnValue = ""> + <#attempt> + <#local returnValue = totp.policy.getAlgorithmKey()> + <#recover> + <#return "ABORT: Couldn't evaluate totp.policy.getAlgorithmKey()"> + + <#return 'function(){ return "' + returnValue + '"; }'> + + <#return "ABORT: It's a method">