Update changelog v5.4.2

Bump version (changelog ignore)
Update evt (changelog ignore)
2022-06-01 22:21:23 +00:00 · 2022-06-02 00:15:25 +02:00 · 2022-06-02 00:15:10 +02:00 · 2022-06-02 00:14:36 +02:00 · 2022-06-01 05:51:41 +02:00 · 2022-06-01 05:51:33 +02:00
8 changed files with 81 additions and 43 deletions
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@ -25,6 +25,8 @@ jobs:
  test:
    runs-on: macos-10.15
    needs: test_formatting
+    env: 
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
    strategy:
      matrix:
        node: [ '15', '14' ]
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,22 @@
+### **5.4.2** (2022-06-01)  
+  
+- Prevent rate limite in CI by authenticating    
+  
+### **5.4.1** (2022-06-01)  
+  
+  
+  
+## **5.4.0** (2022-05-23)  
+  
+- #109    
+  
+### **5.3.2** (2022-05-04)  
+  
+- Merge pull request #101 from Romcol/bugfix/99
+
+Issue #99 - Make replace less greedy in remplaceImportFromStatic  
+- [IMP] Issue #99 - Make replace less greedy in remplaceImportFromStatic    
+  
 ### **5.3.1** (2022-04-29)  
  
 - Comment out missleading informations    
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "keycloakify",
-    "version": "5.3.1",
+    "version": "5.4.2",
    "description": "Keycloak theme generator for Reacts app",
    "repository": {
        "type": "git",
@ -57,7 +57,7 @@
    "homepage": "https://github.com/garronej/keycloakify",
    "peerDependencies": {
        "@emotion/react": "^11.4.1",
-        "react": "^16.8.0 || ^17.0.0"
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
    },
    "devDependencies": {
        "@emotion/react": "^11.4.1",
@ -77,14 +77,14 @@
        "@octokit/rest": "^18.12.0",
        "cheerio": "^1.0.0-rc.5",
        "cli-select": "^1.1.2",
-        "evt": "2.0.0-beta.39",
+        "evt": "2.0.0-beta.43",
        "memoizee": "^0.4.15",
        "minimal-polyfills": "^2.2.1",
        "path-browserify": "^1.0.1",
-        "powerhooks": "^0.14.0",
+        "powerhooks": "^0.17.1",
        "react-markdown": "^5.0.3",
        "scripting-tools": "^0.19.13",
-        "tsafe": "^0.9.0",
-        "tss-react": "^3.5.2"
+        "tsafe": "^0.10.0",
+        "tss-react": "^3.7.0"
    }
 }
--- a/src/bin/build-keycloak-theme/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl
+++ b/src/bin/build-keycloak-theme/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl
@ -124,9 +124,11 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
                    ) || (
                        <#-- https://github.com/InseeFrLab/keycloakify/pull/65#issuecomment-991896344 (reports with saml-post-form.ftl) -->
                        <#-- https://github.com/InseeFrLab/keycloakify/issues/91#issue-1212319466 (reports with error.ftl and Kc18) -->
+                        <#-- https://github.com/InseeFrLab/keycloakify/issues/109#issuecomment-1134610163 -->
                        key == "loginAction" && 
                        are_same_path(path, ["url"]) && 
-                        ["saml-post-form.ftl", "error.ftl"]?seq_contains(pageId)
+                        ["saml-post-form.ftl", "error.ftl", "info.ftl"]?seq_contains(pageId) &&
+                        !(auth?has_content && auth.showTryAnotherWayLink())
                    ) || (
                        ["contextData", "idpConfig", "idp", "authenticationSession"]?seq_contains(key) &&
                        are_same_path(path, ["brokerContext"]) &&
@ -152,6 +154,33 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
                    </#attempt>

                </#if>
+                
+                <#if key == "showUsername" && are_same_path(path, ["auth"])>
+                    <#attempt>
+                        <#return auth.showUsername()?c>
+                    <#recover>
+                        <#local out_seq += ["/*Couldn't evaluate auth.showUsername()*/"]>
+                        <#continue>
+                    </#attempt>
+                </#if>
+
+                <#if key == "showResetCredentials" && are_same_path(path, ["auth"])>
+                    <#attempt>
+                        <#return auth.showResetCredentials()?c>
+                    <#recover>
+                        <#local out_seq += ["/*Couldn't evaluate auth.showResetCredentials()*/"]>
+                        <#continue>
+                    </#attempt>
+                </#if>
+
+                <#if key == "showTryAnotherWayLink" && are_same_path(path, ["auth"])>
+                    <#attempt>
+                        <#return auth.showTryAnotherWayLink()?c>
+                    <#recover>
+                        <#local out_seq += ["/*Couldn't evaluate auth.showTryAnotherWayLink()*/"]>
+                        <#continue>
+                    </#attempt>
+                </#if>

                <#attempt>
                    <#if !object[key]??>
--- a/src/bin/build-keycloak-theme/replaceImportFromStatic.ts
+++ b/src/bin/build-keycloak-theme/replaceImportFromStatic.ts
@ -17,12 +17,12 @@ export function replaceImportsFromStaticInJsCode(params: { jsCode: string; urlOr
    const { jsCode, urlOrigin } = params;

    const fixedJsCode = jsCode
-        .replace(/(\w+\.\w+)\+"static\//g, (...[, group]) =>
+        .replace(/([a-zA-Z]+\.[a-zA-Z]+)\+"static\//g, (...[, group]) =>
            urlOrigin === undefined
                ? `window.${ftlValuesGlobalName}.url.resourcesPath + "/build/static/`
                : `("${ftlValuesGlobalName}" in window ? "${urlOrigin}" : "") + ${group} + "static/`,
        )
-        .replace(/".chunk.css",(\w)+=(\w+\.\w+)\+(\w+),/, (...[, group1, group2, group3]) =>
+        .replace(/".chunk.css",([a-zA-Z])+=([a-zA-Z]+\.[a-zA-Z]+)\+([a-zA-Z]+),/, (...[, group1, group2, group3]) =>
            urlOrigin === undefined
                ? `".chunk.css",${group1} = window.${ftlValuesGlobalName}.url.resourcesPath + "/build/" + ${group3},`
                : `".chunk.css",${group1} = ("${ftlValuesGlobalName}" in window ? "${urlOrigin}" : "") + ${group2} + ${group3},`,
--- a/src/bin/tools/createOctokit.ts
+++ b/src/bin/tools/createOctokit.ts
@ -1,7 +0,0 @@
-import { Octokit } from "@octokit/rest";
-
-export function createOctokit(params: { github_token: string }) {
-    const { github_token } = params;
-
-    return new Octokit({ ...(github_token !== "" ? { "auth": github_token } : {}) });
-}
--- a/src/lib/getKcContext/KcContextBase.ts
+++ b/src/lib/getKcContext/KcContextBase.ts
@ -52,9 +52,9 @@ export declare namespace KcContextBase {
            currentLanguageTag: KcLanguageTag;
        };
        auth?: {
-            showUsername: boolean;
-            showResetCredentials: boolean;
-            showTryAnotherWayLink: boolean;
+            showUsername?: boolean;
+            showResetCredentials?: boolean;
+            showTryAnotherWayLink?: boolean;
            attemptedUsername?: string;
        };
        scripts: string[];
--- a/yarn.lock
+++ b/yarn.lock
@ -680,10 +680,10 @@ event-emitter@^0.3.5:
    d "1"
    es5-ext "~0.10.14"

-evt@2.0.0-beta.39:
-  version "2.0.0-beta.39"
-  resolved "https://registry.yarnpkg.com/evt/-/evt-2.0.0-beta.39.tgz#3c859a83b35940f7eecfb5f148f03b7cbf3fee51"
-  integrity sha512-XxJkaHrFWBrzjTbnr5LJYXkGkADsAXReZfq2lFu3Kf1iCEw5/5ibrdXu3bQdWW6xkZ8qwAHT3STU9zYcCl09BA==
+evt@2.0.0-beta.43:
+  version "2.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/evt/-/evt-2.0.0-beta.43.tgz#971d3452ed2d0d4516ad98404f15f0c69c745340"
+  integrity sha512-CXfX3FrC9+/EjK21ZNyJFIeBt7cj6ecjrlsTTeUYhT8a+ORe0qyQiRJRweZvmrPGci1tEGYdFvEimC0BD4YBOw==
  dependencies:
    minimal-polyfills "^2.2.1"
    run-exclusive "^2.2.14"
@ -1295,15 +1295,15 @@ please-upgrade-node@^3.2.0:
  dependencies:
    semver-compare "^1.0.0"

-powerhooks@^0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/powerhooks/-/powerhooks-0.14.0.tgz#44dd201f470761362a139ae2cb51eaa658ed5e3e"
-  integrity sha512-jWrRHyqev7Lh3MId7h1mNxs+fgegr8liHN17AaHxMgrXI6KxJ14B3Pe1It4FIRWJ4Z1dxsA734FerFGZ3Vgdkg==
+powerhooks@^0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/powerhooks/-/powerhooks-0.17.1.tgz#701477631c0d937d3cef27f6ce54cd70b5e9e7e7"
+  integrity sha512-KI7vcvMEylCVUI1uL36fDkJ85P1yUXTrhh1vn7aNo1Wa+U6qkelBLtE+414VtHJZw21X8nMJaoRMRtrzTXneog==
  dependencies:
-    evt "2.0.0-beta.39"
+    evt "2.0.0-beta.43"
    memoizee "^0.4.15"
    resize-observer-polyfill "^1.5.1"
-    tsafe "^0.8.1"
+    tsafe "^0.10.0"

 prettier@^2.3.0:
  version "2.4.1"
@ -1625,21 +1625,16 @@ trough@^1.0.0:
  resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
  integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==

+tsafe@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/tsafe/-/tsafe-0.10.0.tgz#c4fba365a49467ea6167e8c9482ddb94ee51b795"
+  integrity sha512-CFfa1uJKfU0DDRbuB8bf2mfXjkOqiTsrltexzMMLxq5gjd1LttFECNGsO8dYUALJDbShb6+f3CwAppW/wf9BrA==
+
 tsafe@^0.4.1:
  version "0.4.1"
  resolved "https://registry.yarnpkg.com/tsafe/-/tsafe-0.4.1.tgz#00af1be2db82abb4be531209b90232d7954e1a03"
  integrity sha512-+OZ0gdgmwcru+MOSheCx+ymAvQz+1/ui+KFJRuaq0t2m8RNrlf7eSzEieptoPQXPY67Mdkqgkdjknn8azoD5sw==

-tsafe@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/tsafe/-/tsafe-0.8.1.tgz#9af7e1540bc04313a82d60c98056a5017c8b086b"
-  integrity sha512-EfPjxQHzndQAV/uh0SMGP26Wg3dCuaw8dRv2VPEuGHen5qzg2oqsMvZw2wkQFkiMisZq2fm95m5lheimW2Fpvg==
-
-tsafe@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/tsafe/-/tsafe-0.9.0.tgz#8394e5fdf81e690c97e2b8be4180a079a4a19bfb"
-  integrity sha512-wmbu8pI/xmW69b13HoS8WbTcSlRTDjIut9ACblBjVZVTk0vsMRXdoh1k1jMu5EzKNohBavKHhqNOOsccSR7XCA==
-
 tslib@^1.9.0:
  version "1.14.1"
  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@ -1650,10 +1645,10 @@ tslib@^2.2.0:
  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==

-tss-react@^3.5.2:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/tss-react/-/tss-react-3.5.2.tgz#1b5db1f4a71fe62c939eed5368ea7809ca2ad0a9"
-  integrity sha512-IgGizaOhbntrWdh2EISJYnhYEEWXXWf3sn5aa8LYf7e59NCM5mg0PxJuEoLx9pLG5WlJF80zTRN/Y1Jnjw9LYA==
+tss-react@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/tss-react/-/tss-react-3.7.0.tgz#664b4259c36800eb5285a583f6d8c1d5d1d1a30f"
+  integrity sha512-thvJWR+sr3ZGMcV/Ryo1F5RzjXd1gMTzYV/ckfUEBhu701uTYE3KyL9DNxv827uRFPFSLYG7bKefuc7kmYMB9Q==
  dependencies:
    "@emotion/cache" "*"
    "@emotion/serialize" "*"
Author	SHA1	Message	Date
actions	8f8857bc22	Update changelog v5.4.2	2022-06-01 22:21:23 +00:00
garronej	226247b3b6	Bump version (changelog ignore)	2022-06-02 00:15:25 +02:00
garronej	b2ea5014f3	Update evt (changelog ignore)	2022-06-02 00:15:10 +02:00
garronej	48bc416aa7	Update powerhooks (changelog ignore)	2022-06-02 00:14:36 +02:00
garronej	386e7203b2	Merge branch 'main' of https://github.com/InseeFrLab/keycloakify	2022-06-01 05:51:41 +02:00
garronej	9bdb224631	Prevent rate limite in CI by authenticating	2022-06-01 05:51:33 +02:00
actions	dd36aacbee	Update changelog v5.4.1	2022-06-01 03:45:04 +00:00
garronej	6b57b1c720	Bump version (changelog ignore)	2022-06-01 05:42:23 +02:00
garronej	9e9e6d41ff	Update dependencies (changelog ignore)	2022-06-01 05:38:12 +02:00
actions	5140389502	Update changelog v5.4.0	2022-05-23 14:59:15 +00:00
garronej	fc6328131f	Bump version (changelog ignore)	2022-05-23 16:51:58 +02:00
garronej	9de0083ca6	#109	2022-05-23 16:51:18 +02:00
actions	f5231b840d	Update changelog v5.3.2	2022-05-04 10:16:04 +00:00
Joseph Garrone	afb6596c4b	Bump version (changelog ignore)	2022-05-04 12:13:10 +02:00
Joseph Garrone	dde9afef92	Merge pull request #101 from Romcol/bugfix/99 Issue #99 - Make replace less greedy in remplaceImportFromStatic	2022-05-04 12:12:06 +02:00
Romain Colombat	6595e9c3cb	[IMP] Issue #99 - Make replace less greedy in remplaceImportFromStatic	2022-05-04 11:22:58 +02:00