keycloakify 5.3.1 → 5.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +15 -0
- package/bin/build-keycloak-theme/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl +30 -1
- package/bin/build-keycloak-theme/replaceImportFromStatic.js +2 -2
- package/bin/build-keycloak-theme/replaceImportFromStatic.js.map +1 -1
- package/lib/getKcContext/KcContextBase.d.ts +3 -3
- package/package.json +6 -6
- package/src/bin/build-keycloak-theme/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl +30 -1
- package/src/bin/build-keycloak-theme/replaceImportFromStatic.ts +2 -2
- package/src/lib/getKcContext/KcContextBase.ts +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,18 @@
|
|
|
1
|
+
### **5.4.1** (2022-06-01)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
## **5.4.0** (2022-05-23)
|
|
6
|
+
|
|
7
|
+
- #109
|
|
8
|
+
|
|
9
|
+
### **5.3.2** (2022-05-04)
|
|
10
|
+
|
|
11
|
+
- Merge pull request #101 from Romcol/bugfix/99
|
|
12
|
+
|
|
13
|
+
Issue #99 - Make replace less greedy in remplaceImportFromStatic
|
|
14
|
+
- [IMP] Issue #99 - Make replace less greedy in remplaceImportFromStatic
|
|
15
|
+
|
|
1
16
|
### **5.3.1** (2022-04-29)
|
|
2
17
|
|
|
3
18
|
- Comment out missleading informations
|
|
@@ -124,9 +124,11 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
|
|
|
124
124
|
) || (
|
|
125
125
|
<#-- https://github.com/InseeFrLab/keycloakify/pull/65#issuecomment-991896344 (reports with saml-post-form.ftl) -->
|
|
126
126
|
<#-- https://github.com/InseeFrLab/keycloakify/issues/91#issue-1212319466 (reports with error.ftl and Kc18) -->
|
|
127
|
+
<#-- https://github.com/InseeFrLab/keycloakify/issues/109#issuecomment-1134610163 -->
|
|
127
128
|
key == "loginAction" &&
|
|
128
129
|
are_same_path(path, ["url"]) &&
|
|
129
|
-
["saml-post-form.ftl", "error.ftl"]?seq_contains(pageId)
|
|
130
|
+
["saml-post-form.ftl", "error.ftl", "info.ftl"]?seq_contains(pageId) &&
|
|
131
|
+
!(auth?has_content && auth.showTryAnotherWayLink())
|
|
130
132
|
) || (
|
|
131
133
|
["contextData", "idpConfig", "idp", "authenticationSession"]?seq_contains(key) &&
|
|
132
134
|
are_same_path(path, ["brokerContext"]) &&
|
|
@@ -152,6 +154,33 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
|
|
|
152
154
|
</#attempt>
|
|
153
155
|
|
|
154
156
|
</#if>
|
|
157
|
+
|
|
158
|
+
<#if key == "showUsername" && are_same_path(path, ["auth"])>
|
|
159
|
+
<#attempt>
|
|
160
|
+
<#return auth.showUsername()?c>
|
|
161
|
+
<#recover>
|
|
162
|
+
<#local out_seq += ["/*Couldn't evaluate auth.showUsername()*/"]>
|
|
163
|
+
<#continue>
|
|
164
|
+
</#attempt>
|
|
165
|
+
</#if>
|
|
166
|
+
|
|
167
|
+
<#if key == "showResetCredentials" && are_same_path(path, ["auth"])>
|
|
168
|
+
<#attempt>
|
|
169
|
+
<#return auth.showResetCredentials()?c>
|
|
170
|
+
<#recover>
|
|
171
|
+
<#local out_seq += ["/*Couldn't evaluate auth.showResetCredentials()*/"]>
|
|
172
|
+
<#continue>
|
|
173
|
+
</#attempt>
|
|
174
|
+
</#if>
|
|
175
|
+
|
|
176
|
+
<#if key == "showTryAnotherWayLink" && are_same_path(path, ["auth"])>
|
|
177
|
+
<#attempt>
|
|
178
|
+
<#return auth.showTryAnotherWayLink()?c>
|
|
179
|
+
<#recover>
|
|
180
|
+
<#local out_seq += ["/*Couldn't evaluate auth.showTryAnotherWayLink()*/"]>
|
|
181
|
+
<#continue>
|
|
182
|
+
</#attempt>
|
|
183
|
+
</#if>
|
|
155
184
|
|
|
156
185
|
<#attempt>
|
|
157
186
|
<#if !object[key]??>
|
|
@@ -61,7 +61,7 @@ function replaceImportsFromStaticInJsCode(params) {
|
|
|
61
61
|
*/
|
|
62
62
|
var jsCode = params.jsCode, urlOrigin = params.urlOrigin;
|
|
63
63
|
var fixedJsCode = jsCode
|
|
64
|
-
.replace(/(
|
|
64
|
+
.replace(/([a-zA-Z]+\.[a-zA-Z]+)\+"static\//g, function () {
|
|
65
65
|
var _a = [];
|
|
66
66
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
67
67
|
_a[_i] = arguments[_i];
|
|
@@ -71,7 +71,7 @@ function replaceImportsFromStaticInJsCode(params) {
|
|
|
71
71
|
? "window." + ftlValuesGlobalName_1.ftlValuesGlobalName + ".url.resourcesPath + \"/build/static/"
|
|
72
72
|
: "(\"" + ftlValuesGlobalName_1.ftlValuesGlobalName + "\" in window ? \"" + urlOrigin + "\" : \"\") + " + group + " + \"static/";
|
|
73
73
|
})
|
|
74
|
-
.replace(/".chunk.css",(
|
|
74
|
+
.replace(/".chunk.css",([a-zA-Z])+=([a-zA-Z]+\.[a-zA-Z]+)\+([a-zA-Z]+),/, function () {
|
|
75
75
|
var _a = [];
|
|
76
76
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
77
77
|
_a[_i] = arguments[_i];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replaceImportFromStatic.js","sourceRoot":"","sources":["../../src/bin/build-keycloak-theme/replaceImportFromStatic.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAiC;AACjC,6DAA4D;AAE5D,SAAgB,gCAAgC,CAAC,MAAyD;IACtG;;;;;;;;;;MAUE;IAEM,IAAA,MAAM,GAAgB,MAAM,OAAtB,EAAE,SAAS,GAAK,MAAM,UAAX,CAAY;IAErC,IAAM,WAAW,GAAG,MAAM;SACrB,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"replaceImportFromStatic.js","sourceRoot":"","sources":["../../src/bin/build-keycloak-theme/replaceImportFromStatic.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,9 +32,9 @@ export declare namespace KcContextBase {
|
|
|
32
32
|
currentLanguageTag: KcLanguageTag;
|
|
33
33
|
};
|
|
34
34
|
auth?: {
|
|
35
|
-
showUsername
|
|
36
|
-
showResetCredentials
|
|
37
|
-
showTryAnotherWayLink
|
|
35
|
+
showUsername?: boolean;
|
|
36
|
+
showResetCredentials?: boolean;
|
|
37
|
+
showTryAnotherWayLink?: boolean;
|
|
38
38
|
attemptedUsername?: string;
|
|
39
39
|
};
|
|
40
40
|
scripts: string[];
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "keycloakify",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.4.1",
|
|
4
4
|
"description": "Keycloak theme generator for Reacts app",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -338,7 +338,7 @@
|
|
|
338
338
|
"homepage": "https://github.com/garronej/keycloakify",
|
|
339
339
|
"peerDependencies": {
|
|
340
340
|
"@emotion/react": "^11.4.1",
|
|
341
|
-
"react": "^16.8.0 || ^17.0.0"
|
|
341
|
+
"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
|
|
342
342
|
},
|
|
343
343
|
"devDependencies": {
|
|
344
344
|
"@emotion/react": "^11.4.1",
|
|
@@ -358,14 +358,14 @@
|
|
|
358
358
|
"@octokit/rest": "^18.12.0",
|
|
359
359
|
"cheerio": "^1.0.0-rc.5",
|
|
360
360
|
"cli-select": "^1.1.2",
|
|
361
|
-
"evt": "2.0.0-beta.
|
|
361
|
+
"evt": "2.0.0-beta.42",
|
|
362
362
|
"memoizee": "^0.4.15",
|
|
363
363
|
"minimal-polyfills": "^2.2.1",
|
|
364
364
|
"path-browserify": "^1.0.1",
|
|
365
|
-
"powerhooks": "^0.
|
|
365
|
+
"powerhooks": "^0.17.0",
|
|
366
366
|
"react-markdown": "^5.0.3",
|
|
367
367
|
"scripting-tools": "^0.19.13",
|
|
368
|
-
"tsafe": "^0.
|
|
369
|
-
"tss-react": "^3.
|
|
368
|
+
"tsafe": "^0.10.0",
|
|
369
|
+
"tss-react": "^3.7.0"
|
|
370
370
|
}
|
|
371
371
|
}
|
package/src/bin/build-keycloak-theme/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl
CHANGED
|
@@ -124,9 +124,11 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
|
|
|
124
124
|
) || (
|
|
125
125
|
<#-- https://github.com/InseeFrLab/keycloakify/pull/65#issuecomment-991896344 (reports with saml-post-form.ftl) -->
|
|
126
126
|
<#-- https://github.com/InseeFrLab/keycloakify/issues/91#issue-1212319466 (reports with error.ftl and Kc18) -->
|
|
127
|
+
<#-- https://github.com/InseeFrLab/keycloakify/issues/109#issuecomment-1134610163 -->
|
|
127
128
|
key == "loginAction" &&
|
|
128
129
|
are_same_path(path, ["url"]) &&
|
|
129
|
-
["saml-post-form.ftl", "error.ftl"]?seq_contains(pageId)
|
|
130
|
+
["saml-post-form.ftl", "error.ftl", "info.ftl"]?seq_contains(pageId) &&
|
|
131
|
+
!(auth?has_content && auth.showTryAnotherWayLink())
|
|
130
132
|
) || (
|
|
131
133
|
["contextData", "idpConfig", "idp", "authenticationSession"]?seq_contains(key) &&
|
|
132
134
|
are_same_path(path, ["brokerContext"]) &&
|
|
@@ -152,6 +154,33 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
|
|
|
152
154
|
</#attempt>
|
|
153
155
|
|
|
154
156
|
</#if>
|
|
157
|
+
|
|
158
|
+
<#if key == "showUsername" && are_same_path(path, ["auth"])>
|
|
159
|
+
<#attempt>
|
|
160
|
+
<#return auth.showUsername()?c>
|
|
161
|
+
<#recover>
|
|
162
|
+
<#local out_seq += ["/*Couldn't evaluate auth.showUsername()*/"]>
|
|
163
|
+
<#continue>
|
|
164
|
+
</#attempt>
|
|
165
|
+
</#if>
|
|
166
|
+
|
|
167
|
+
<#if key == "showResetCredentials" && are_same_path(path, ["auth"])>
|
|
168
|
+
<#attempt>
|
|
169
|
+
<#return auth.showResetCredentials()?c>
|
|
170
|
+
<#recover>
|
|
171
|
+
<#local out_seq += ["/*Couldn't evaluate auth.showResetCredentials()*/"]>
|
|
172
|
+
<#continue>
|
|
173
|
+
</#attempt>
|
|
174
|
+
</#if>
|
|
175
|
+
|
|
176
|
+
<#if key == "showTryAnotherWayLink" && are_same_path(path, ["auth"])>
|
|
177
|
+
<#attempt>
|
|
178
|
+
<#return auth.showTryAnotherWayLink()?c>
|
|
179
|
+
<#recover>
|
|
180
|
+
<#local out_seq += ["/*Couldn't evaluate auth.showTryAnotherWayLink()*/"]>
|
|
181
|
+
<#continue>
|
|
182
|
+
</#attempt>
|
|
183
|
+
</#if>
|
|
155
184
|
|
|
156
185
|
<#attempt>
|
|
157
186
|
<#if !object[key]??>
|
|
@@ -17,12 +17,12 @@ export function replaceImportsFromStaticInJsCode(params: { jsCode: string; urlOr
|
|
|
17
17
|
const { jsCode, urlOrigin } = params;
|
|
18
18
|
|
|
19
19
|
const fixedJsCode = jsCode
|
|
20
|
-
.replace(/(
|
|
20
|
+
.replace(/([a-zA-Z]+\.[a-zA-Z]+)\+"static\//g, (...[, group]) =>
|
|
21
21
|
urlOrigin === undefined
|
|
22
22
|
? `window.${ftlValuesGlobalName}.url.resourcesPath + "/build/static/`
|
|
23
23
|
: `("${ftlValuesGlobalName}" in window ? "${urlOrigin}" : "") + ${group} + "static/`,
|
|
24
24
|
)
|
|
25
|
-
.replace(/".chunk.css",(
|
|
25
|
+
.replace(/".chunk.css",([a-zA-Z])+=([a-zA-Z]+\.[a-zA-Z]+)\+([a-zA-Z]+),/, (...[, group1, group2, group3]) =>
|
|
26
26
|
urlOrigin === undefined
|
|
27
27
|
? `".chunk.css",${group1} = window.${ftlValuesGlobalName}.url.resourcesPath + "/build/" + ${group3},`
|
|
28
28
|
: `".chunk.css",${group1} = ("${ftlValuesGlobalName}" in window ? "${urlOrigin}" : "") + ${group2} + ${group3},`,
|
|
@@ -52,9 +52,9 @@ export declare namespace KcContextBase {
|
|
|
52
52
|
currentLanguageTag: KcLanguageTag;
|
|
53
53
|
};
|
|
54
54
|
auth?: {
|
|
55
|
-
showUsername
|
|
56
|
-
showResetCredentials
|
|
57
|
-
showTryAnotherWayLink
|
|
55
|
+
showUsername?: boolean;
|
|
56
|
+
showResetCredentials?: boolean;
|
|
57
|
+
showTryAnotherWayLink?: boolean;
|
|
58
58
|
attemptedUsername?: string;
|
|
59
59
|
};
|
|
60
60
|
scripts: string[];
|