keycloakify 10.0.0-rc.60 → 10.0.0-rc.62

package/PUBLIC_URL.js

@@ -1,11 +1,11 @@
-import { nameOfTheGlobal, basenameOfTheKeycloakifyResourcesDir } from "./bin/shared/constants";
+import { basenameOfTheKeycloakifyResourcesDir } from "./bin/shared/constants";
 import { assert } from "tsafe/assert";
 /**
  * This is an equivalent of process.env.PUBLIC_URL that you can use in Webpack projects.
  * This works both in your main app and in your Keycloak theme.
  */
 export const PUBLIC_URL = (() => {
-    const kcContext = window[nameOfTheGlobal];
+    const kcContext = window.kcContext;
     if (kcContext === undefined || process.env.NODE_ENV === "development") {
         assert(process.env.PUBLIC_URL !== undefined, `If you use keycloakify/PUBLIC_URL you should be in Webpack and thus process.env.PUBLIC_URL should be defined`);
         return process.env.PUBLIC_URL;

package/PUBLIC_URL.js.map

@@ -1 +1 @@
-{"version":3,"file":"PUBLIC_URL.js","sourceRoot":"","sources":["src/PUBLIC_URL.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,eAAe,EACf,oCAAoC,EACvC,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC;;;GAGG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAAG,EAAE;IAC5B,MAAM,SAAS,GAAI,MAAc,CAAC,eAAe,CAAC,CAAC;IAEnD,IAAI,SAAS,KAAK,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE;QACnE,MAAM,CACF,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,SAAS,EACpC,8GAA8G,CACjH,CAAC;QAEF,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;KACjC;IAED,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,aAAa,IAAI,oCAAoC,EAAE,CAAC;AACpF,CAAC,CAAC,EAAE,CAAC"}
+{"version":3,"file":"PUBLIC_URL.js","sourceRoot":"","sources":["src/PUBLIC_URL.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oCAAoC,EAAE,MAAM,kCAAkC,CAAC;AACxF,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC;;;GAGG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAAG,EAAE;IAC5B,MAAM,SAAS,GAAI,MAAc,CAAC,SAAS,CAAC;IAE5C,IAAI,SAAS,KAAK,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE;QACnE,MAAM,CACF,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,SAAS,EACpC,8GAA8G,CACjH,CAAC;QAEF,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;KACjC;IAED,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,aAAa,IAAI,oCAAoC,EAAE,CAAC;AACpF,CAAC,CAAC,EAAE,CAAC"}

package/bin/190.index.js

@@ -88,7 +88,12 @@ async function getProxyFetchOptions(params) {
                     .filter(Boolean);
             }
             const cafileContent = await (0,promises_.readFile)(cafile, "utf-8");
-            return chunks(cafileContent.split(/(-----END CERTIFICATE-----)/), 2).map(ca => ca.join("").replace(/^\n/, "").replace(/\n/g, "\\n"));
+            const newLinePlaceholder = "NEW_LINE_PLACEHOLDER_xIsPsK23svt";
+            return chunks(cafileContent.split(/(-----END CERTIFICATE-----)/), 2).map(ca => ca
+                .join("")
+                .replace(/\r?\n/g, newLinePlaceholder)
+                .replace(new RegExp(`^${newLinePlaceholder}`), "")
+                .replace(new RegExp(newLinePlaceholder, "g"), "\\n"));
         })()));
     }
     return {

package/bin/538.index.js

@@ -299,7 +299,6 @@ function getBuildContext(params) {
 /* harmony export */   "M": () => (/* binding */ basenameOfTheKeycloakifyResourcesDir),
 /* harmony export */   "N$": () => (/* binding */ keycloak_resources),
 /* harmony export */   "UX": () => (/* binding */ accountThemePageIds),
-/* harmony export */   "X4": () => (/* binding */ nameOfTheGlobal),
 /* harmony export */   "fe": () => (/* binding */ vitePluginSubScriptEnvNames),
 /* harmony export */   "h6": () => (/* binding */ containerName),
 /* harmony export */   "lg": () => (/* binding */ nameOfTheLocalizationRealmOverridesUserProfileProperty),
@@ -309,7 +308,6 @@ function getBuildContext(params) {
 /* harmony export */   "y_": () => (/* binding */ accountV1ThemeName),
 /* harmony export */   "z0": () => (/* binding */ resources_common)
 /* harmony export */ });
-const nameOfTheGlobal = "kcContext";
 const nameOfTheLocalizationRealmOverridesUserProfileProperty = "__localizationRealmOverridesUserProfile";
 const keycloak_resources = "keycloak-resources";
 const resources_common = "resources-common";

package/bin/932.index.js

@@ -148,7 +148,12 @@ async function getProxyFetchOptions(params) {
                     .filter(Boolean);
             }
             const cafileContent = await (0,promises_.readFile)(cafile, "utf-8");
-            return chunks(cafileContent.split(/(-----END CERTIFICATE-----)/), 2).map(ca => ca.join("").replace(/^\n/, "").replace(/\n/g, "\\n"));
+            const newLinePlaceholder = "NEW_LINE_PLACEHOLDER_xIsPsK23svt";
+            return chunks(cafileContent.split(/(-----END CERTIFICATE-----)/), 2).map(ca => ca
+                .join("")
+                .replace(/\r?\n/g, newLinePlaceholder)
+                .replace(new RegExp(`^${newLinePlaceholder}`), "")
+                .replace(new RegExp(newLinePlaceholder, "g"), "\\n"));
         })()));
     }
     return {

package/bin/952.index.js

@@ -242,8 +242,8 @@ function replaceImportsInJsCode_vite(params) {
             .map(basenameOfAssetsFile => `${staticDir}${basenameOfAssetsFile}`)
             .forEach(relativePathOfAssetFile => {
             var _a;
-            fixedJsCode = replaceAll(fixedJsCode, `"${relativePathOfAssetFile}"`, `(window.${constants/* nameOfTheGlobal */.X4}.url.resourcesPath.substring(1) + "/${constants/* basenameOfTheKeycloakifyResourcesDir */.M}/${relativePathOfAssetFile}")`);
-            fixedJsCode = replaceAll(fixedJsCode, `"${(_a = buildContext.urlPathname) !== null && _a !== void 0 ? _a : "/"}${relativePathOfAssetFile}"`, `(window.${constants/* nameOfTheGlobal */.X4}.url.resourcesPath + "/${constants/* basenameOfTheKeycloakifyResourcesDir */.M}/${relativePathOfAssetFile}")`);
+            fixedJsCode = replaceAll(fixedJsCode, `"${relativePathOfAssetFile}"`, `(window.kcContext.url.resourcesPath.substring(1) + "/${constants/* basenameOfTheKeycloakifyResourcesDir */.M}/${relativePathOfAssetFile}")`);
+            fixedJsCode = replaceAll(fixedJsCode, `"${(_a = buildContext.urlPathname) !== null && _a !== void 0 ? _a : "/"}${relativePathOfAssetFile}"`, `(window.kcContext.url.resourcesPath + "/${constants/* basenameOfTheKeycloakifyResourcesDir */.M}/${relativePathOfAssetFile}")`);
         });
     }
     return { fixedJsCode };
@@ -284,7 +284,7 @@ function replaceImportsInJsCode_webpack(params) {
                 var pd = Object.getOwnPropertyDescriptor(${n}, "p");
                 if( pd === undefined || pd.configurable ){
                     Object.defineProperty(${n}, "p", {
-                        get: function() { return window.${constants/* nameOfTheGlobal */.X4}.url.resourcesPath; },
+                        get: function() { return window.kcContext.url.resourcesPath; },
                         set: function() {}
                     });
                 }
@@ -297,7 +297,7 @@ function replaceImportsInJsCode_webpack(params) {
     fixedJsCode = fixedJsCode
         .replace(...getReplaceArgs("js"))
         .replace(...getReplaceArgs("css"))
-        .replace(new RegExp(`[a-zA-Z]+\\.[a-zA-Z]+\\+"${staticDir.replace(/\//g, "\\/")}`, "g"), `window.${constants/* nameOfTheGlobal */.X4}.url.resourcesPath + "/${constants/* basenameOfTheKeycloakifyResourcesDir */.M}/${staticDir}`);
+        .replace(new RegExp(`[a-zA-Z]+\\.[a-zA-Z]+\\+"${staticDir.replace(/\//g, "\\/")}`, "g"), `window.kcContext.url.resourcesPath + "/${constants/* basenameOfTheKeycloakifyResourcesDir */.M}/${staticDir}`);
     return { fixedJsCode };
 }
 //# sourceMappingURL=webpack.js.map
@@ -466,9 +466,8 @@ function generateFtlFilesCodeFactory(params) {
         }
     }
     //FTL is no valid html, we can't insert with cheerio, we put placeholder for injecting later.
-    const ftlObjectToJsCodeDeclaringAnObject = external_fs_.readFileSync((0,external_path_.join)((0,getThisCodebaseRootDirPath/* getThisCodebaseRootDirPath */.e)(), "src", "bin", "keycloakify", "generateFtl", "ftl_object_to_js_code_declaring_an_object.ftl"))
+    const kcContextDeclarationTemplateFtl = external_fs_.readFileSync((0,external_path_.join)((0,getThisCodebaseRootDirPath/* getThisCodebaseRootDirPath */.e)(), "src", "bin", "keycloakify", "generateFtl", "kcContextDeclarationTemplate.ftl"))
         .toString("utf8")
-        .match(/^<script>const _=((?:.|\n)+)<\/script>[\n]?$/)[1]
         .replace("FIELD_NAMES_eKsIY4ZsZ4xeM", fieldNames.map(name => `"${name}"`).join(", "))
         .replace("KEYCLOAKIFY_VERSION_xEdKd3xEdr", keycloakifyVersion)
         .replace("KEYCLOAKIFY_THEME_VERSION_sIgKd3xEdr3dx", buildContext.themeVersion)
@@ -478,7 +477,7 @@ function generateFtlFilesCodeFactory(params) {
         .replace("lOCALIZATION_REALM_OVERRIDES_USER_PROFILE_PROPERTY_KEY_aaGLsPgGIdeeX", constants/* nameOfTheLocalizationRealmOverridesUserProfileProperty */.lg)
         .replace("USER_DEFINED_EXCLUSIONS_eKsaY4ZsZ4eMr2", (_a = buildContext.kcContextExclusionsFtlCode) !== null && _a !== void 0 ? _a : "");
     const ftlObjectToJsCodeDeclaringAnObjectPlaceholder = '{ "x": "vIdLqMeOed9sdLdIdOxdK0d" }';
-    $("head").prepend(`<script>\nwindow.${constants/* nameOfTheGlobal */.X4}=${ftlObjectToJsCodeDeclaringAnObjectPlaceholder}</script>`);
+    $("head").prepend(`<script>\n${ftlObjectToJsCodeDeclaringAnObjectPlaceholder}\n</script>`);
     // Remove part of the document marked as ignored.
     {
         const startTags = $('meta[name="keycloakify-ignore-start"]');
@@ -504,7 +503,7 @@ function generateFtlFilesCodeFactory(params) {
         const $ = esm/* default.load */.ZP.load(partiallyFixedIndexHtmlCode);
         let ftlCode = $.html();
         Object.entries({
-            [ftlObjectToJsCodeDeclaringAnObjectPlaceholder]: ftlObjectToJsCodeDeclaringAnObject,
+            [ftlObjectToJsCodeDeclaringAnObjectPlaceholder]: kcContextDeclarationTemplateFtl,
             PAGE_ID_xIgLsPgGId9D8e: pageId
         }).map(([searchValue, replaceValue]) => (ftlCode = ftlCode.replace(searchValue, replaceValue)));
         return { ftlCode };
@@ -1195,7 +1194,7 @@ async function buildJar(params) {
                 }
                 (0,assert.assert)(false);
             })();
-            const modifiedFtlFileContent = ftlFileContent.replace(`out.pageId = "\${pageId}";`, `out.pageId = "${pageId}"; out.realPageId = "${realPageId}";`);
+            const modifiedFtlFileContent = ftlFileContent.replace(`kcContext.pageId = "\${pageId}";`, `kcContext.pageId = "${pageId}"; kcContext.realPageId = "${realPageId}";`);
             (0,assert.assert)(modifiedFtlFileContent !== ftlFileContent);
             promises_.writeFile((0,external_path_.join)((0,external_path_.dirname)(ftlFilePath), realPageId), Buffer.from(modifiedFtlFileContent, "utf8"));
         }));

package/bin/98.index.js

@@ -299,7 +299,6 @@ function getBuildContext(params) {
 /* harmony export */   "M": () => (/* binding */ basenameOfTheKeycloakifyResourcesDir),
 /* harmony export */   "N$": () => (/* binding */ keycloak_resources),
 /* harmony export */   "UX": () => (/* binding */ accountThemePageIds),
-/* harmony export */   "X4": () => (/* binding */ nameOfTheGlobal),
 /* harmony export */   "fe": () => (/* binding */ vitePluginSubScriptEnvNames),
 /* harmony export */   "h6": () => (/* binding */ containerName),
 /* harmony export */   "lg": () => (/* binding */ nameOfTheLocalizationRealmOverridesUserProfileProperty),
@@ -309,7 +308,6 @@ function getBuildContext(params) {
 /* harmony export */   "y_": () => (/* binding */ accountV1ThemeName),
 /* harmony export */   "z0": () => (/* binding */ resources_common)
 /* harmony export */ });
-const nameOfTheGlobal = "kcContext";
 const nameOfTheLocalizationRealmOverridesUserProfileProperty = "__localizationRealmOverridesUserProfile";
 const keycloak_resources = "keycloak-resources";
 const resources_common = "resources-common";

package/bin/991.index.js

@@ -299,7 +299,6 @@ function getBuildContext(params) {
 /* harmony export */   "M": () => (/* binding */ basenameOfTheKeycloakifyResourcesDir),
 /* harmony export */   "N$": () => (/* binding */ keycloak_resources),
 /* harmony export */   "UX": () => (/* binding */ accountThemePageIds),
-/* harmony export */   "X4": () => (/* binding */ nameOfTheGlobal),
 /* harmony export */   "fe": () => (/* binding */ vitePluginSubScriptEnvNames),
 /* harmony export */   "h6": () => (/* binding */ containerName),
 /* harmony export */   "lg": () => (/* binding */ nameOfTheLocalizationRealmOverridesUserProfileProperty),
@@ -309,7 +308,6 @@ function getBuildContext(params) {
 /* harmony export */   "y_": () => (/* binding */ accountV1ThemeName),
 /* harmony export */   "z0": () => (/* binding */ resources_common)
 /* harmony export */ });
-const nameOfTheGlobal = "kcContext";
 const nameOfTheLocalizationRealmOverridesUserProfileProperty = "__localizationRealmOverridesUserProfile";
 const keycloak_resources = "keycloak-resources";
 const resources_common = "resources-common";
@@ -546,7 +544,7 @@ async function extractArchive(params) {
     zipFile.on("entry", async (entry) => {
         handle_file: {
             // NOTE: Skip directories
-            if (entry.fileName.endsWith(path__WEBPACK_IMPORTED_MODULE_5__.sep)) {
+            if (entry.fileName.endsWith("/")) {
                 break handle_file;
             }
             let hasEarlyExitBeenCalled = false;

package/bin/shared/constants.d.ts

@@ -1,4 +1,3 @@
-export declare const nameOfTheGlobal = "kcContext";
 export declare const nameOfTheLocalizationRealmOverridesUserProfileProperty = "__localizationRealmOverridesUserProfile";
 export declare const keycloak_resources = "keycloak-resources";
 export declare const resources_common = "resources-common";

package/bin/shared/constants.js

@@ -1,4 +1,3 @@
-export const nameOfTheGlobal = "kcContext";
 export const nameOfTheLocalizationRealmOverridesUserProfileProperty = "__localizationRealmOverridesUserProfile";
 export const keycloak_resources = "keycloak-resources";
 export const resources_common = "resources-common";

package/bin/shared/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/bin/shared/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,WAAW,CAAC;AAC3C,MAAM,CAAC,MAAM,sDAAsD,GAC/D,yCAAyC,CAAC;AAC9C,MAAM,CAAC,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AACvD,MAAM,CAAC,MAAM,gBAAgB,GAAG,kBAAkB,CAAC;AACnD,MAAM,CAAC,MAAM,gCAAgC,GAAG,QAAQ,CAAC;AACzD,MAAM,CAAC,MAAM,oCAAoC,GAAG,OAAO,CAAC;AAE5D,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,OAAO,EAAE,SAAS,CAAU,CAAC;AACxD,MAAM,CAAC,MAAM,kBAAkB,GAAG,YAAY,CAAC;AAI/C,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACvC,kBAAkB,EAAE,mCAAmC;IACvD,iBAAiB,EAAE,iCAAiC;CAC9C,CAAC;AAEX,MAAM,CAAC,MAAM,+BAA+B,GAAG,0CAA0C,CAAC;AAE1F,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC7B,WAAW;IACX,oBAAoB;IACpB,oBAAoB;IACpB,2BAA2B;IAC3B,uBAAuB;IACvB,cAAc;IACd,UAAU;IACV,WAAW;IACX,0BAA0B;IAC1B,wBAAwB;IACxB,WAAW;IACX,0CAA0C;IAC1C,uBAAuB;IACvB,eAAe;IACf,0BAA0B;IAC1B,2BAA2B;IAC3B,4BAA4B;IAC5B,0BAA0B;IAC1B,wBAAwB;IACxB,uBAAuB;IACvB,oBAAoB;IACpB,6BAA6B;IAC7B,kBAAkB;IAClB,0BAA0B;IAC1B,oBAAoB;IACpB,uBAAuB;IACvB,UAAU;IACV,4BAA4B;IAC5B,yBAAyB;IACzB,sCAAsC;IACtC,qCAAqC;IACrC,qBAAqB;IACrB,qBAAqB;IACrB,oBAAoB;CACd,CAAC;AAEX,MAAM,CAAC,MAAM,mBAAmB,GAAG;IAC/B,cAAc;IACd,aAAa;IACb,cAAc;IACd,UAAU;IACV,kBAAkB;IAClB,SAAS;IACT,uBAAuB;CACjB,CAAC;AAKX,MAAM,CAAC,MAAM,aAAa,GAAG,sBAAsB,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/bin/shared/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,sDAAsD,GAC/D,yCAAyC,CAAC;AAC9C,MAAM,CAAC,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AACvD,MAAM,CAAC,MAAM,gBAAgB,GAAG,kBAAkB,CAAC;AACnD,MAAM,CAAC,MAAM,gCAAgC,GAAG,QAAQ,CAAC;AACzD,MAAM,CAAC,MAAM,oCAAoC,GAAG,OAAO,CAAC;AAE5D,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,OAAO,EAAE,SAAS,CAAU,CAAC;AACxD,MAAM,CAAC,MAAM,kBAAkB,GAAG,YAAY,CAAC;AAI/C,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACvC,kBAAkB,EAAE,mCAAmC;IACvD,iBAAiB,EAAE,iCAAiC;CAC9C,CAAC;AAEX,MAAM,CAAC,MAAM,+BAA+B,GAAG,0CAA0C,CAAC;AAE1F,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC7B,WAAW;IACX,oBAAoB;IACpB,oBAAoB;IACpB,2BAA2B;IAC3B,uBAAuB;IACvB,cAAc;IACd,UAAU;IACV,WAAW;IACX,0BAA0B;IAC1B,wBAAwB;IACxB,WAAW;IACX,0CAA0C;IAC1C,uBAAuB;IACvB,eAAe;IACf,0BAA0B;IAC1B,2BAA2B;IAC3B,4BAA4B;IAC5B,0BAA0B;IAC1B,wBAAwB;IACxB,uBAAuB;IACvB,oBAAoB;IACpB,6BAA6B;IAC7B,kBAAkB;IAClB,0BAA0B;IAC1B,oBAAoB;IACpB,uBAAuB;IACvB,UAAU;IACV,4BAA4B;IAC5B,yBAAyB;IACzB,sCAAsC;IACtC,qCAAqC;IACrC,qBAAqB;IACrB,qBAAqB;IACrB,oBAAoB;CACd,CAAC;AAEX,MAAM,CAAC,MAAM,mBAAmB,GAAG;IAC/B,cAAc;IACd,aAAa;IACb,cAAc;IACd,UAAU;IACV,kBAAkB;IAClB,SAAS;IACT,uBAAuB;CACjB,CAAC;AAKX,MAAM,CAAC,MAAM,aAAa,GAAG,sBAAsB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "10.0.0-rc.60",
+    "version": "10.0.0-rc.62",
     "description": "Create Keycloak themes using React",
     "repository": {
         "type": "git",
@@ -464,9 +464,9 @@
         "src/bin/keycloakify/buildJars/generatePom.ts",
         "src/bin/keycloakify/buildJars/getKeycloakVersionRangeForJar.ts",
         "src/bin/keycloakify/buildJars/index.ts",
-        "src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl",
         "src/bin/keycloakify/generateFtl/generateFtl.ts",
         "src/bin/keycloakify/generateFtl/index.ts",
+        "src/bin/keycloakify/generateFtl/kcContextDeclarationTemplate.ftl",
         "src/bin/keycloakify/generateResources/bringInAccountV1.ts",
         "src/bin/keycloakify/generateResources/generateMessageProperties.ts",
         "src/bin/keycloakify/generateResources/generateResources.ts",
@@ -517,7 +517,6 @@
         "src/bin/tools/downloadAndExtractArchive/index.ts",
         "src/bin/tools/escapeStringForPropertiesFile.ts",
         "src/bin/tools/extractArchive.ts",
-        "src/bin/tools/fetchProxyOptions.ts",
         "src/bin/tools/fs.existsAsync.ts",
         "src/bin/tools/fs.rm.ts",
         "src/bin/tools/fs.rmSync.ts",

package/src/PUBLIC_URL.ts

@@ -1,7 +1,4 @@
-import {
-    nameOfTheGlobal,
-    basenameOfTheKeycloakifyResourcesDir
-} from "keycloakify/bin/shared/constants";
+import { basenameOfTheKeycloakifyResourcesDir } from "keycloakify/bin/shared/constants";
 import { assert } from "tsafe/assert";
 
 /**
@@ -9,7 +6,7 @@ import { assert } from "tsafe/assert";
  * This works both in your main app and in your Keycloak theme.
  */
 export const PUBLIC_URL = (() => {
-    const kcContext = (window as any)[nameOfTheGlobal];
+    const kcContext = (window as any).kcContext;
 
     if (kcContext === undefined || process.env.NODE_ENV === "development") {
         assert(

package/src/bin/keycloakify/buildJars/buildJar.ts

@@ -168,8 +168,8 @@ export async function buildJar(params: {
                 })();
 
                 const modifiedFtlFileContent = ftlFileContent.replace(
-                    `out.pageId = "\${pageId}";`,
-                    `out.pageId = "${pageId}"; out.realPageId = "${realPageId}";`
+                    `kcContext.pageId = "\${pageId}";`,
+                    `kcContext.pageId = "${pageId}"; kcContext.realPageId = "${realPageId}";`
                 );
 
                 assert(modifiedFtlFileContent !== ftlFileContent);

package/src/bin/keycloakify/generateFtl/generateFtl.ts

@@ -8,7 +8,6 @@ import type { BuildContext } from "../../shared/buildContext";
 import { assert } from "tsafe/assert";
 import {
     type ThemeType,
-    nameOfTheGlobal,
     basenameOfTheKeycloakifyResourcesDir,
     resources_common,
     nameOfTheLocalizationRealmOverridesUserProfileProperty
@@ -116,7 +115,7 @@ export function generateFtlFilesCodeFactory(params: {
     }
 
     //FTL is no valid html, we can't insert with cheerio, we put placeholder for injecting later.
-    const ftlObjectToJsCodeDeclaringAnObject = fs
+    const kcContextDeclarationTemplateFtl = fs
         .readFileSync(
             pathJoin(
                 getThisCodebaseRootDirPath(),
@@ -124,11 +123,10 @@ export function generateFtlFilesCodeFactory(params: {
                 "bin",
                 "keycloakify",
                 "generateFtl",
-                "ftl_object_to_js_code_declaring_an_object.ftl"
+                "kcContextDeclarationTemplate.ftl"
             )
         )
         .toString("utf8")
-        .match(/^<script>const _=((?:.|\n)+)<\/script>[\n]?$/)![1]
         .replace(
             "FIELD_NAMES_eKsIY4ZsZ4xeM",
             fieldNames.map(name => `"${name}"`).join(", ")
@@ -150,7 +148,7 @@ export function generateFtlFilesCodeFactory(params: {
         '{ "x": "vIdLqMeOed9sdLdIdOxdK0d" }';
 
     $("head").prepend(
-        `<script>\nwindow.${nameOfTheGlobal}=${ftlObjectToJsCodeDeclaringAnObjectPlaceholder}</script>`
+        `<script>\n${ftlObjectToJsCodeDeclaringAnObjectPlaceholder}\n</script>`
     );
 
     // Remove part of the document marked as ignored.
@@ -189,7 +187,7 @@ export function generateFtlFilesCodeFactory(params: {
 
         Object.entries({
             [ftlObjectToJsCodeDeclaringAnObjectPlaceholder]:
-                ftlObjectToJsCodeDeclaringAnObject,
+                kcContextDeclarationTemplateFtl,
             PAGE_ID_xIgLsPgGId9D8e: pageId
         }).map(
             ([searchValue, replaceValue]) =>

package/src/bin/keycloakify/generateFtl/{ftl_object_to_js_code_declaring_an_object.ftl → kcContextDeclarationTemplate.ftl}

@@ -1,10 +1,8 @@
-<script>const _= 
-(()=>{
 <#assign pageId="PAGE_ID_xIgLsPgGId9D8e">
-const out = ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
-if( out.messagesPerField ){
-    var existsError_singleFieldName = out.messagesPerField.existsError;
-    out.messagesPerField.existsError = function (){
+const kcContext = ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
+if( kcContext.messagesPerField ){
+    var existsError_singleFieldName = kcContext.messagesPerField.existsError;
+    kcContext.messagesPerField.existsError = function (){
         for( let i = 0; i < arguments.length; i++ ){
             if( existsError_singleFieldName(arguments[i]) ){
                 return true;
@@ -12,31 +10,31 @@ if( out.messagesPerField ){
         }
         return false;
     };
-    out.messagesPerField.exists = function (fieldName) {
-        return out.messagesPerField.get(fieldName) !== "";
+    kcContext.messagesPerField.exists = function (fieldName) {
+        return kcContext.messagesPerField.get(fieldName) !== "";
     };
-    out.messagesPerField.printIfExists = function (fieldName, text) {
-        return out.messagesPerField.exists(fieldName) ? text : undefined;
+    kcContext.messagesPerField.printIfExists = function (fieldName, text) {
+        return kcContext.messagesPerField.exists(fieldName) ? text : undefined;
     };
-    out.messagesPerField.getFirstError = function () {
+    kcContext.messagesPerField.getFirstError = function () {
         for( let i = 0; i < arguments.length; i++ ){
             const fieldName = arguments[i];
-            if( out.messagesPerField.existsError(fieldName) ){
-                return out.messagesPerField.get(fieldName);
+            if( kcContext.messagesPerField.existsError(fieldName) ){
+                return kcContext.messagesPerField.get(fieldName);
             }
         }
     };
 }
-out.keycloakifyVersion = "KEYCLOAKIFY_VERSION_xEdKd3xEdr";
-out.themeVersion = "KEYCLOAKIFY_THEME_VERSION_sIgKd3xEdr3dx";
-out.themeType = "KEYCLOAKIFY_THEME_TYPE_dExKd3xEdr";
-out.themeName = "KEYCLOAKIFY_THEME_NAME_cXxKd3xEer";
-out.pageId = "${pageId}";
-if( out.url && out.url.resourcesPath ){
-    out.url.resourcesCommonPath = out.url.resourcesPath + "/" + "RESOURCES_COMMON_cLsLsMrtDkpVv";
+kcContext.keycloakifyVersion = "KEYCLOAKIFY_VERSION_xEdKd3xEdr";
+kcContext.themeVersion = "KEYCLOAKIFY_THEME_VERSION_sIgKd3xEdr3dx";
+kcContext.themeType = "KEYCLOAKIFY_THEME_TYPE_dExKd3xEdr";
+kcContext.themeName = "KEYCLOAKIFY_THEME_NAME_cXxKd3xEer";
+kcContext.pageId = "${pageId}";
+if( kcContext.url && kcContext.url.resourcesPath ){
+    kcContext.url.resourcesCommonPath = kcContext.url.resourcesPath + "/" + "RESOURCES_COMMON_cLsLsMrtDkpVv";
 }
 <#if profile?? && profile.attributes??>
-    out.lOCALIZATION_REALM_OVERRIDES_USER_PROFILE_PROPERTY_KEY_aaGLsPgGIdeeX = {
+    kcContext.lOCALIZATION_REALM_OVERRIDES_USER_PROFILE_PROPERTY_KEY_aaGLsPgGIdeeX = {
         <#list profile.attributes as attribute>
             <#if attribute.annotations?? && attribute.displayName??>
                 "${attribute.displayName}": decodeHtmlEntities("${advancedMsg(attribute.displayName)?js_string}"),
@@ -64,21 +62,20 @@ if( out.url && out.url.resourcesPath ){
     };
 </#if>
 attributes_to_attributesByName: {
-    if( !out.profile ){
+    if( !kcContext.profile ){
         break attributes_to_attributesByName;
     }
-    if( !out.profile.attributes ){
+    if( !kcContext.profile.attributes ){
         break attributes_to_attributesByName;
     }
-    var attributes =  out.profile.attributes;
-    delete out.profile.attributes;
-    out.profile.attributesByName = {};
+    var attributes =  kcContext.profile.attributes;
+    delete kcContext.profile.attributes;
+    kcContext.profile.attributesByName = {};
     attributes.forEach(function(attribute){
-        out.profile.attributesByName[attribute.name] = attribute;
+        kcContext.profile.attributesByName[attribute.name] = attribute;
     });
 }
-return out;
-
+window.kcContext = kcContext;
 function decodeHtmlEntities(htmlStr){
     var element = decodeHtmlEntities.element;
     if (!element) {
@@ -88,7 +85,7 @@ function decodeHtmlEntities(htmlStr){
     element.innerHTML = htmlStr;
     return element.value;
 }
-})();
+
 <#function ftl_object_to_js_code_declaring_an_object object path>
 
         <#local isHash = "">
@@ -341,7 +338,7 @@ function decodeHtmlEntities(htmlStr){
                             <#local jsFunctionCode += "if(fieldName === 'username' || fieldName === 'password' ){ ">
 
                             <#if messagesPerField.exists('username') || messagesPerField.exists('password')>
-                                <#local jsFunctionCode += "return out.message && out.message.summary ? out.message.summary : 'error'; ">
+                                <#local jsFunctionCode += "return kcContext.message && kcContext.message.summary ? kcContext.message.summary : 'error'; ">
                             <#else>
                                 <#local jsFunctionCode += "return ''; ">
                             </#if>
@@ -551,5 +548,4 @@ function decodeHtmlEntities(htmlStr){
 
 <#function are_same_path path searchedPath>
     <#return path?size == searchedPath?size && is_subpath(path, searchedPath)>
-</#function>
-</script>
+</#function>

package/src/bin/keycloakify/replacers/replaceImportsInJsCode/vite.ts

@@ -1,7 +1,4 @@
-import {
-    nameOfTheGlobal,
-    basenameOfTheKeycloakifyResourcesDir
-} from "../../../shared/constants";
+import { basenameOfTheKeycloakifyResourcesDir } from "../../../shared/constants";
 import { assert } from "tsafe/assert";
 import type { BuildContext } from "../../../shared/buildContext";
 import * as nodePath from "path";
@@ -88,13 +85,13 @@ export function replaceImportsInJsCode_vite(params: {
                 fixedJsCode = replaceAll(
                     fixedJsCode,
                     `"${relativePathOfAssetFile}"`,
-                    `(window.${nameOfTheGlobal}.url.resourcesPath.substring(1) + "/${basenameOfTheKeycloakifyResourcesDir}/${relativePathOfAssetFile}")`
+                    `(window.kcContext.url.resourcesPath.substring(1) + "/${basenameOfTheKeycloakifyResourcesDir}/${relativePathOfAssetFile}")`
                 );
 
                 fixedJsCode = replaceAll(
                     fixedJsCode,
                     `"${buildContext.urlPathname ?? "/"}${relativePathOfAssetFile}"`,
-                    `(window.${nameOfTheGlobal}.url.resourcesPath + "/${basenameOfTheKeycloakifyResourcesDir}/${relativePathOfAssetFile}")`
+                    `(window.kcContext.url.resourcesPath + "/${basenameOfTheKeycloakifyResourcesDir}/${relativePathOfAssetFile}")`
                 );
             });
     }

package/src/bin/keycloakify/replacers/replaceImportsInJsCode/webpack.ts

@@ -1,7 +1,4 @@
-import {
-    nameOfTheGlobal,
-    basenameOfTheKeycloakifyResourcesDir
-} from "../../../shared/constants";
+import { basenameOfTheKeycloakifyResourcesDir } from "../../../shared/constants";
 import { assert } from "tsafe/assert";
 import type { BuildContext } from "../../../shared/buildContext";
 import * as nodePath from "path";
@@ -86,7 +83,7 @@ export function replaceImportsInJsCode_webpack(params: {
                 var pd = Object.getOwnPropertyDescriptor(${n}, "p");
                 if( pd === undefined || pd.configurable ){
                     Object.defineProperty(${n}, "p", {
-                        get: function() { return window.${nameOfTheGlobal}.url.resourcesPath; },
+                        get: function() { return window.kcContext.url.resourcesPath; },
                         set: function() {}
                     });
                 }
@@ -107,7 +104,7 @@ export function replaceImportsInJsCode_webpack(params: {
                 `[a-zA-Z]+\\.[a-zA-Z]+\\+"${staticDir.replace(/\//g, "\\/")}`,
                 "g"
             ),
-            `window.${nameOfTheGlobal}.url.resourcesPath + "/${basenameOfTheKeycloakifyResourcesDir}/${staticDir}`
+            `window.kcContext.url.resourcesPath + "/${basenameOfTheKeycloakifyResourcesDir}/${staticDir}`
         );
 
     return { fixedJsCode };

package/src/bin/shared/constants.ts

@@ -1,4 +1,3 @@
-export const nameOfTheGlobal = "kcContext";
 export const nameOfTheLocalizationRealmOverridesUserProfileProperty =
     "__localizationRealmOverridesUserProfile";
 export const keycloak_resources = "keycloak-resources";

package/src/bin/tools/downloadAndExtractArchive/fetchProxyOptions.ts

@@ -79,8 +79,16 @@ export async function getProxyFetchOptions(params: {
                 }
 
                 const cafileContent = await readFile(cafile, "utf-8");
+
+                const newLinePlaceholder = "NEW_LINE_PLACEHOLDER_xIsPsK23svt";
+
                 return chunks(cafileContent.split(/(-----END CERTIFICATE-----)/), 2).map(
-                    ca => ca.join("").replace(/^\n/, "").replace(/\n/g, "\\n")
+                    ca =>
+                        ca
+                            .join("")
+                            .replace(/\r?\n/g, newLinePlaceholder)
+                            .replace(new RegExp(`^${newLinePlaceholder}`), "")
+                            .replace(new RegExp(newLinePlaceholder, "g"), "\\n")
                 );
             })())
         );

package/src/bin/tools/extractArchive.ts

@@ -109,7 +109,7 @@ export async function extractArchive(params: {
     zipFile.on("entry", async (entry: yauzl.Entry) => {
         handle_file: {
             // NOTE: Skip directories
-            if (entry.fileName.endsWith(pathSep)) {
+            if (entry.fileName.endsWith("/")) {
                 break handle_file;
             }
 

package/src/vite-plugin/vite-plugin.ts

@@ -1,7 +1,6 @@
 import { join as pathJoin, relative as pathRelative, sep as pathSep } from "path";
 import type { Plugin } from "vite";
 import {
-    nameOfTheGlobal,
     basenameOfTheKeycloakifyResourcesDir,
     keycloak_resources,
     vitePluginSubScriptEnvNames
@@ -170,9 +169,9 @@ export function keycloakify(params?: Params) {
                 /import\.meta\.env(?:(?:\.BASE_URL)|(?:\["BASE_URL"\]))/g,
                 [
                     `(`,
-                    `(window.${nameOfTheGlobal} === undefined || import.meta.env.MODE === "development")?`,
+                    `(window.kcContext === undefined || import.meta.env.MODE === "development")?`,
                     `"${urlPathname ?? "/"}":`,
-                    `(window.${nameOfTheGlobal}.url.resourcesPath + "/${basenameOfTheKeycloakifyResourcesDir}/")`,
+                    `(window.kcContext.url.resourcesPath + "/${basenameOfTheKeycloakifyResourcesDir}/")`,
                     `)`
                 ].join("")
             );

package/vite-plugin/index.js

@@ -4276,14 +4276,12 @@ __nccwpck_require__.r(__webpack_exports__);
 /* harmony export */   "keycloak_resources": () => (/* binding */ keycloak_resources),
 /* harmony export */   "lastKeycloakVersionWithAccountV1": () => (/* binding */ lastKeycloakVersionWithAccountV1),
 /* harmony export */   "loginThemePageIds": () => (/* binding */ loginThemePageIds),
-/* harmony export */   "nameOfTheGlobal": () => (/* binding */ nameOfTheGlobal),
 /* harmony export */   "nameOfTheLocalizationRealmOverridesUserProfileProperty": () => (/* binding */ nameOfTheLocalizationRealmOverridesUserProfileProperty),
 /* harmony export */   "onlyBuildJarFileBasenameEnvName": () => (/* binding */ onlyBuildJarFileBasenameEnvName),
 /* harmony export */   "resources_common": () => (/* binding */ resources_common),
 /* harmony export */   "themeTypes": () => (/* binding */ themeTypes),
 /* harmony export */   "vitePluginSubScriptEnvNames": () => (/* binding */ vitePluginSubScriptEnvNames)
 /* harmony export */ });
-const nameOfTheGlobal = "kcContext";
 const nameOfTheLocalizationRealmOverridesUserProfileProperty = "__localizationRealmOverridesUserProfile";
 const keycloak_resources = "keycloak-resources";
 const resources_common = "resources-common";
@@ -4542,7 +4540,7 @@ async function extractArchive(params) {
     zipFile.on("entry", async (entry) => {
         handle_file: {
             // NOTE: Skip directories
-            if (entry.fileName.endsWith(external_path_.sep)) {
+            if (entry.fileName.endsWith("/")) {
                 break handle_file;
             }
             let hasEarlyExitBeenCalled = false;
@@ -4627,7 +4625,12 @@ async function getProxyFetchOptions(params) {
                     .filter(Boolean);
             }
             const cafileContent = await (0,promises_.readFile)(cafile, "utf-8");
-            return chunks(cafileContent.split(/(-----END CERTIFICATE-----)/), 2).map(ca => ca.join("").replace(/^\n/, "").replace(/\n/g, "\\n"));
+            const newLinePlaceholder = "NEW_LINE_PLACEHOLDER_xIsPsK23svt";
+            return chunks(cafileContent.split(/(-----END CERTIFICATE-----)/), 2).map(ca => ca
+                .join("")
+                .replace(/\r?\n/g, newLinePlaceholder)
+                .replace(new RegExp(`^${newLinePlaceholder}`), "")
+                .replace(new RegExp(newLinePlaceholder, "g"), "\\n"));
         })()));
     }
     return {
@@ -5520,9 +5523,9 @@ function keycloakify(params) {
             const transformedCode = new magic_string_1.default(code);
             transformedCode.replaceAll(/import\.meta\.env(?:(?:\.BASE_URL)|(?:\["BASE_URL"\]))/g, [
                 `(`,
-                `(window.${constants_1.nameOfTheGlobal} === undefined || import.meta.env.MODE === "development")?`,
+                `(window.kcContext === undefined || import.meta.env.MODE === "development")?`,
                 `"${urlPathname !== null && urlPathname !== void 0 ? urlPathname : "/"}":`,
-                `(window.${constants_1.nameOfTheGlobal}.url.resourcesPath + "/${constants_1.basenameOfTheKeycloakifyResourcesDir}/")`,
+                `(window.kcContext.url.resourcesPath + "/${constants_1.basenameOfTheKeycloakifyResourcesDir}/")`,
                 `)`
             ].join(""));
             if (!transformedCode.hasChanged()) {

package/src/bin/tools/fetchProxyOptions.ts

@@ -1,96 +0,0 @@
-import { exec as execCallback } from "child_process";
-import { readFile } from "fs/promises";
-import { type FetchOptions } from "make-fetch-happen";
-import { promisify } from "util";
-
-function ensureArray<T>(arg0: T | T[]) {
-    return Array.isArray(arg0) ? arg0 : typeof arg0 === "undefined" ? [] : [arg0];
-}
-
-function ensureSingleOrNone<T>(arg0: T | T[]) {
-    if (!Array.isArray(arg0)) return arg0;
-    if (arg0.length === 0) return undefined;
-    if (arg0.length === 1) return arg0[0];
-    throw new Error(
-        "Illegal configuration, expected a single value but found multiple: " +
-            arg0.map(String).join(", ")
-    );
-}
-
-type NPMConfig = Record<string, string | string[]>;
-
-/**
- * Get npm configuration as map
- */
-async function getNmpConfig(params: { npmWorkspaceRootDirPath: string }) {
-    const { npmWorkspaceRootDirPath } = params;
-
-    const exec = promisify(execCallback);
-
-    const stdout = await exec("npm config get", {
-        encoding: "utf8",
-        cwd: npmWorkspaceRootDirPath
-    }).then(({ stdout }) => stdout);
-
-    const npmConfigReducer = (cfg: NPMConfig, [key, value]: [string, string]) =>
-        key in cfg
-            ? { ...cfg, [key]: [...ensureArray(cfg[key]), value] }
-            : { ...cfg, [key]: value };
-
-    return stdout
-        .split("\n")
-        .filter(line => !line.startsWith(";"))
-        .map(line => line.trim())
-        .map(line => line.split("=", 2) as [string, string])
-        .reduce(npmConfigReducer, {} as NPMConfig);
-}
-
-export type ProxyFetchOptions = Pick<
-    FetchOptions,
-    "proxy" | "noProxy" | "strictSSL" | "cert" | "ca"
->;
-
-export async function getProxyFetchOptions(params: {
-    npmWorkspaceRootDirPath: string;
-}): Promise<ProxyFetchOptions> {
-    const { npmWorkspaceRootDirPath } = params;
-
-    const cfg = await getNmpConfig({ npmWorkspaceRootDirPath });
-
-    const proxy = ensureSingleOrNone(cfg["https-proxy"] ?? cfg["proxy"]);
-    const noProxy = cfg["noproxy"] ?? cfg["no-proxy"];
-
-    function maybeBoolean(arg0: string | undefined) {
-        return typeof arg0 === "undefined" ? undefined : Boolean(arg0);
-    }
-
-    const strictSSL = maybeBoolean(ensureSingleOrNone(cfg["strict-ssl"]));
-    const cert = cfg["cert"];
-    const ca = ensureArray(cfg["ca"] ?? cfg["ca[]"]);
-    const cafile = ensureSingleOrNone(cfg["cafile"]);
-
-    if (typeof cafile !== "undefined" && cafile !== "null") {
-        ca.push(
-            ...(await (async () => {
-                function chunks<T>(arr: T[], size: number = 2) {
-                    return arr
-                        .map((_, i) => i % size == 0 && arr.slice(i, i + size))
-                        .filter(Boolean) as T[][];
-                }
-
-                const cafileContent = await readFile(cafile, "utf-8");
-                return chunks(cafileContent.split(/(-----END CERTIFICATE-----)/), 2).map(
-                    ca => ca.join("").replace(/^\n/, "").replace(/\n/g, "\\n")
-                );
-            })())
-        );
-    }
-
-    return {
-        proxy,
-        noProxy,
-        strictSSL,
-        cert,
-        ca: ca.length === 0 ? undefined : ca
-    };
-}