keycloakify 10.0.0-rc.46 → 10.0.0-rc.48

package/bin/3.index.js

@@ -1129,24 +1129,10 @@ async function buildJar(params) {
     const { jarFileBasename, keycloakAccountV1Version, keycloakThemeAdditionalInfoExtensionVersion, resourcesDirPath, buildContext } = params;
     const keycloakifyBuildTmpDirPath = (0,external_path_.join)(buildContext.cacheDirPath, jarFileBasename.replace(".jar", ""));
     (0,fs_rmSync/* rmSync */.a)(keycloakifyBuildTmpDirPath, { recursive: true, force: true });
-    {
-        const transformCodebase_common = (params) => {
-            const { fileRelativePath, sourceCode } = params;
-            if (fileRelativePath ===
-                (0,shared_metaInfKeycloakThemes/* getMetaInfKeycloakThemesJsonFilePath */.KQ)({ resourcesDirPath: "." })) {
-                return { modifiedSourceCode: sourceCode };
-            }
-            for (const themeName of [...buildContext.themeNames, constants/* accountV1ThemeName */.y_]) {
-                if ((0,isInside/* isInside */.V)({
-                    dirPath: (0,external_path_.join)("theme", themeName),
-                    filePath: fileRelativePath
-                })) {
-                    return { modifiedSourceCode: sourceCode };
-                }
-            }
-            return undefined;
-        };
-        const transformCodebase_patchForUsingBuiltinAccountV1 = keycloakAccountV1Version !== null
+    (0,transformCodebase/* transformCodebase */.N)({
+        srcDirPath: resourcesDirPath,
+        destDirPath: (0,external_path_.join)(keycloakifyBuildTmpDirPath, "src", "main", "resources"),
+        transformSourceCode: keycloakAccountV1Version !== null
             ? undefined
             : (params) => {
                 const { fileRelativePath, sourceCode } = params;
@@ -1178,23 +1164,8 @@ async function buildJar(params) {
                     }
                 }
                 return { modifiedSourceCode: sourceCode };
-            };
-        (0,transformCodebase/* transformCodebase */.N)({
-            srcDirPath: resourcesDirPath,
-            destDirPath: (0,external_path_.join)(keycloakifyBuildTmpDirPath, "src", "main", "resources"),
-            transformSourceCode: params => {
-                const resultCommon = transformCodebase_common(params);
-                if (transformCodebase_patchForUsingBuiltinAccountV1 === undefined) {
-                    return resultCommon;
-                }
-                if (resultCommon === undefined) {
-                    return undefined;
-                }
-                const { modifiedSourceCode } = resultCommon;
-                return transformCodebase_patchForUsingBuiltinAccountV1(Object.assign(Object.assign({}, params), { sourceCode: modifiedSourceCode }));
             }
-        });
-    }
+    });
     route_legacy_pages: {
         // NOTE: If there's no account theme there is no special target for keycloak 24 and up so we create
         // the pages anyway. If there is an account pages, since we know that account-v1 is only support keycloak

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "10.0.0-rc.46",
+    "version": "10.0.0-rc.48",
     "description": "Create Keycloak themes using React",
     "repository": {
         "type": "git",

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

@@ -50,35 +50,10 @@ export async function buildJar(params: {
 
     rmSync(keycloakifyBuildTmpDirPath, { recursive: true, force: true });
 
-    {
-        const transformCodebase_common = (params: {
-            fileRelativePath: string;
-            sourceCode: Buffer;
-        }): { modifiedSourceCode: Buffer } | undefined => {
-            const { fileRelativePath, sourceCode } = params;
-
-            if (
-                fileRelativePath ===
-                getMetaInfKeycloakThemesJsonFilePath({ resourcesDirPath: "." })
-            ) {
-                return { modifiedSourceCode: sourceCode };
-            }
-
-            for (const themeName of [...buildContext.themeNames, accountV1ThemeName]) {
-                if (
-                    isInside({
-                        dirPath: pathJoin("theme", themeName),
-                        filePath: fileRelativePath
-                    })
-                ) {
-                    return { modifiedSourceCode: sourceCode };
-                }
-            }
-
-            return undefined;
-        };
-
-        const transformCodebase_patchForUsingBuiltinAccountV1 =
+    transformCodebase({
+        srcDirPath: resourcesDirPath,
+        destDirPath: pathJoin(keycloakifyBuildTmpDirPath, "src", "main", "resources"),
+        transformSourceCode:
             keycloakAccountV1Version !== null
                 ? undefined
                 : (params: {
@@ -145,31 +120,8 @@ export async function buildJar(params: {
                       }
 
                       return { modifiedSourceCode: sourceCode };
-                  };
-
-        transformCodebase({
-            srcDirPath: resourcesDirPath,
-            destDirPath: pathJoin(keycloakifyBuildTmpDirPath, "src", "main", "resources"),
-            transformSourceCode: params => {
-                const resultCommon = transformCodebase_common(params);
-
-                if (transformCodebase_patchForUsingBuiltinAccountV1 === undefined) {
-                    return resultCommon;
-                }
-
-                if (resultCommon === undefined) {
-                    return undefined;
-                }
-
-                const { modifiedSourceCode } = resultCommon;
-
-                return transformCodebase_patchForUsingBuiltinAccountV1({
-                    ...params,
-                    sourceCode: modifiedSourceCode
-                });
-            }
-        });
-    }
+                  }
+    });
 
     route_legacy_pages: {
         // NOTE: If there's no account theme there is no special target for keycloak 24 and up so we create

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

@@ -184,6 +184,28 @@ try {
     };
 </#if>
 
+attributes_to_attributesByName: {
+
+    if( !out["profile"] ){
+        break attributes_to_attributesByName;
+    }
+
+    if( !out["profile"]["attributes"] ){
+        break attributes_to_attributesByName;
+    }
+
+    var attributes =  out["profile"]["attributes"];
+
+    delete out["profile"]["attributes"];
+
+    out["profile"]["attributesByName"] = {};
+
+    attributes.forEach(function(attribute){
+        out["profile"]["attributesByName"][attribute.name] = attribute;
+    });
+
+}
+
 return out;
 
 function decodeHtmlEntities(htmlStr){
@@ -287,8 +309,8 @@ function decodeHtmlEntities(htmlStr){
                         key == "realmAttributes" &&
                         are_same_path(path, [])
                     ) || (
-                        <#-- attributesByName adds a lot of noise to the output and is not needed -->
-                        key == "attributes" &&
+                        <#-- attributesByName adds a lot of noise to the output and is not needed, we already have profile.attributes -->
+                        key == "attributesByName" &&
                         are_same_path(path, ["profile"]) 
                     ) || (
                         <#-- We already have the attributes in profile speedup the rendering by filtering it out from the register object -->