keycloakify 4.2.14-beta.1 → 4.2.17
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 +29 -0
- package/README.md +17 -31
- package/bin/build-keycloak-theme/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl +64 -4
- package/bin/build-keycloak-theme/generateFtl/generateFtl.js +3 -4
- package/bin/build-keycloak-theme/generateFtl/generateFtl.js.map +1 -1
- package/lib/components/LoginOtp.js +2 -2
- package/lib/components/LoginOtp.js.map +1 -1
- package/lib/components/Template.js +3 -3
- package/lib/components/Template.js.map +1 -1
- package/lib/getKcContext/kcContextMocks/kcContextMocks.js +3 -3
- package/lib/getKcContext/kcContextMocks/kcContextMocks.js.map +1 -1
- package/lib/getKcContext/kcContextMocks/urlResourcesPath.js +3 -3
- package/lib/getKcContext/kcContextMocks/urlResourcesPath.js.map +1 -1
- package/lib/tools/pathJoin.d.ts +1 -0
- package/lib/tools/pathJoin.js +15 -0
- package/lib/tools/pathJoin.js.map +1 -0
- package/package.json +5 -1
- package/src/bin/build-keycloak-theme/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl +64 -4
- package/src/bin/build-keycloak-theme/generateFtl/generateFtl.ts +2 -4
- package/src/lib/components/LoginOtp.tsx +1 -1
- package/src/lib/components/Template.tsx +1 -1
- package/src/lib/getKcContext/kcContextMocks/kcContextMocks.ts +1 -1
- package/src/lib/getKcContext/kcContextMocks/urlResourcesPath.ts +3 -3
- package/src/lib/tools/pathJoin.ts +6 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,32 @@
|
|
|
1
|
+
### **4.2.17** (2021-12-16)
|
|
2
|
+
|
|
3
|
+
- Fix path.join polyfill
|
|
4
|
+
|
|
5
|
+
### **4.2.16** (2021-12-16)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### **4.2.15** (2021-12-16)
|
|
10
|
+
|
|
11
|
+
- use custom polyfill for path.join (fix webpack 5 build)
|
|
12
|
+
|
|
13
|
+
### **4.2.14** (2021-12-12)
|
|
14
|
+
|
|
15
|
+
- Merge pull request #65 from InseeFrLab/doge_ftl_errors
|
|
16
|
+
|
|
17
|
+
Prevent ftl errors in Keycloak log
|
|
18
|
+
- Encourage users to report errors in logs
|
|
19
|
+
- Fix ftl error related to url.loginAction in saml-post-form.ftl
|
|
20
|
+
- Ftl prevent error with updateProfileCtx
|
|
21
|
+
- Ftl prevent error with auth.attemptedUsername
|
|
22
|
+
- Fix ftl error as comment formatting
|
|
23
|
+
- Merge remote-tracking branch 'origin/main' into doge_ftl_errors
|
|
24
|
+
- Update README, remove all instruction about errors in logs
|
|
25
|
+
- Avoid error in Keycloak logs, fix long template loading time
|
|
26
|
+
- Add missing collon in README sample code
|
|
27
|
+
|
|
28
|
+
Add miss ','
|
|
29
|
+
|
|
1
30
|
### **4.2.13** (2021-12-08)
|
|
2
31
|
|
|
3
32
|
- Fix broken link about how to import fonts #62
|
package/README.md
CHANGED
|
@@ -20,10 +20,10 @@
|
|
|
20
20
|
<img src="https://user-images.githubusercontent.com/6702424/110260457-a1c3d380-7fac-11eb-853a-80459b65626b.png">
|
|
21
21
|
</p>
|
|
22
22
|
|
|
23
|
-
**NEW in
|
|
23
|
+
**NEW in 4.2.14**
|
|
24
24
|
|
|
25
|
-
-
|
|
26
|
-
-
|
|
25
|
+
- No more error in Keycloak logs 🍾
|
|
26
|
+
- Templates now load in fraction of a second 🏎
|
|
27
27
|
|
|
28
28
|
# Motivations
|
|
29
29
|
|
|
@@ -71,13 +71,12 @@ If you already have a Keycloak custom theme, it can be easily ported to Keycloak
|
|
|
71
71
|
- [GitHub Actions](#github-actions)
|
|
72
72
|
- [Limitations](#limitations)
|
|
73
73
|
- [`process.env.PUBLIC_URL` not supported.](#processenvpublic_url-not-supported)
|
|
74
|
-
- [`@font-face` importing fonts from the
|
|
74
|
+
- [`@font-face` importing fonts from the `src/` dir](#font-face-importing-fonts-from-the-src-dir)
|
|
75
75
|
- [Example of setup that **won't** work](#example-of-setup-that-wont-work)
|
|
76
76
|
- [Possible workarounds](#possible-workarounds)
|
|
77
77
|
- [Implement context persistence (optional)](#implement-context-persistence-optional)
|
|
78
78
|
- [Kickstart video](#kickstart-video)
|
|
79
|
-
- [
|
|
80
|
-
- [The pages take too long to load ? (soon to be fixed too)](#the-pages-take-too-long-to-load-)
|
|
79
|
+
- [FTL errors related to `ftl_object_to_js_code_declaring_an_object` in Keycloak logs.](#ftl-errors-related-to-ftl_object_to_js_code_declaring_an_object-in-keycloak-logs)
|
|
81
80
|
- [Adding custom message (to `i18n/useKcMessage.tsx`)](#adding-custom-message-to-i18nusekcmessagetsx)
|
|
82
81
|
- [Email domain whitelist](#email-domain-whitelist)
|
|
83
82
|
- [Changelog highlights](#changelog-highlights)
|
|
@@ -107,7 +106,7 @@ For more information see [this issue](https://github.com/InseeFrLab/keycloakify/
|
|
|
107
106
|
**All this is defaults with [`create-react-app`](https://create-react-app.dev)** (tested with 4.0.3)
|
|
108
107
|
|
|
109
108
|
- `mvn` ([Maven](https://maven.apache.org/)), `rm`, `mkdir`, `curl`, `unzip` are assumed to be available.
|
|
110
|
-
- `docker` must be up and running when running `yarn keycloak
|
|
109
|
+
- `docker` must be up and running when running `start_keycloak_testing_container.sh` (Instructions provided after running `yarn keycloak`).
|
|
111
110
|
|
|
112
111
|
## My framework doesn’t seem to be supported, what can I do?
|
|
113
112
|
|
|
@@ -354,7 +353,7 @@ the building and publishing of the theme (the .jar file).
|
|
|
354
353
|
You won't be able to [import things from your public directory **in your JavaScript code**](https://create-react-app.dev/docs/using-the-public-folder/#adding-assets-outside-of-the-module-system).
|
|
355
354
|
(This isn't recommended anyway).
|
|
356
355
|
|
|
357
|
-
## `@font-face` importing fonts from the
|
|
356
|
+
## `@font-face` importing fonts from the `src/` dir
|
|
358
357
|
|
|
359
358
|
If you are building the theme with [--external-assets](#enable-loading-in-a-blink-of-a-eye-of-login-pages-)
|
|
360
359
|
this limitation doesn't apply, you can import fonts however you see fit.
|
|
@@ -438,35 +437,22 @@ flash of the blank html before the js bundle have been evaluated
|
|
|
438
437
|
_NOTE: keycloak-react-theming was renamed keycloakify since this video was recorded_
|
|
439
438
|
[](https://youtu.be/xTz0Rj7i2v8)
|
|
440
439
|
|
|
441
|
-
#
|
|
440
|
+
# FTL errors related to `ftl_object_to_js_code_declaring_an_object` in Keycloak logs.
|
|
442
441
|
|
|
443
|
-
|
|
442
|
+
If you ever encounter one of these errors:
|
|
444
443
|
|
|
445
444
|
```log
|
|
446
445
|
FTL stack trace ("~" means nesting-related):
|
|
447
|
-
- Failed at: #local value = object[key] [in template "login.ftl" in macro "
|
|
448
|
-
- Reached through: @compress [in template "login.ftl" in macro "
|
|
449
|
-
- Reached through: @
|
|
450
|
-
- Reached through: @compress [in template "login.ftl" in macro "
|
|
451
|
-
- Reached through: @
|
|
446
|
+
- Failed at: #local value = object[key] [in template "login.ftl" in macro "ftl_object_to_js_code_declaring_an_object" at line 70, column 21]
|
|
447
|
+
- Reached through: @compress [in template "login.ftl" in macro "ftl_object_to_js_code_declaring_an_object" at line 36, column 5]
|
|
448
|
+
- Reached through: @ftl_object_to_js_code_declaring_an_object object=value depth=(dep... [in template "login.ftl" in macro "ftl_object_to_js_code_declaring_an_object" at line 81, column 27]
|
|
449
|
+
- Reached through: @compress [in template "login.ftl" in macro "ftl_object_to_js_code_declaring_an_object" at line 36, column 5]
|
|
450
|
+
- Reached through: @ftl_object_to_js_code_declaring_an_object object=(.data_model) de... [in template "login.ftl" at line 163, column 43]
|
|
452
451
|
```
|
|
453
452
|
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
To [converts the `.ftl` values into a JavaScript object](https://github.com/InseeFrLab/keycloakify/blob/main/src/bin/build-keycloak-theme/generateFtl/common.ftl)
|
|
459
|
-
without making assumptions on the `.data_model` we have to do things that throws.
|
|
460
|
-
It's all-right because every statement that can fail is inside an `<#attempt><#recorver>` block but it results in errors being printed to the logs.
|
|
461
|
-
|
|
462
|
-
# The pages take too long to load ?
|
|
463
|
-
|
|
464
|
-
The problem of templates taking a long time to load only happens in the test environment, when you have a console logging all the above-mentioned `.ftl` warnings in real time. Logging all those warnings is what takes time. Once in production page load is way faster.
|
|
465
|
-
|
|
466
|
-
If you run the docker container locally we acknowledge that the loading time is getting out of hand.
|
|
467
|
-
We are [in the process](https://github.com/InseeFrLab/keycloakify/pull/63) of resolving this issue.
|
|
468
|
-
|
|
469
|
-
In the meantime we recommend [to run the docker container as a background task](https://youtu.be/F29Z1GaH-jk).
|
|
453
|
+
It's just noise, they can be safely ignored.
|
|
454
|
+
You can, however, and are encouraged to, report any that you would spot.
|
|
455
|
+
Just open an issue about it and I will release a patched version of Keycloakify in the better delays.
|
|
470
456
|
|
|
471
457
|
# Adding custom message (to `i18n/useKcMessage.tsx`)
|
|
472
458
|
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
<script>const _=
|
|
2
|
+
<#assign pageId="PAGE_ID_xIgLsPgGId9D8e">
|
|
2
3
|
(()=>{
|
|
3
4
|
|
|
4
5
|
const out =
|
|
@@ -76,9 +77,11 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
|
|
|
76
77
|
}
|
|
77
78
|
};
|
|
78
79
|
|
|
80
|
+
out["pageId"] = "${pageId}";
|
|
81
|
+
|
|
79
82
|
return out;
|
|
80
83
|
|
|
81
|
-
})()
|
|
84
|
+
})()
|
|
82
85
|
<#function ftl_object_to_js_code_declaring_an_object object path>
|
|
83
86
|
|
|
84
87
|
<#local isHash = "">
|
|
@@ -112,13 +115,35 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
|
|
|
112
115
|
</#if>
|
|
113
116
|
|
|
114
117
|
<#if
|
|
115
|
-
|
|
116
|
-
|
|
118
|
+
(
|
|
119
|
+
["loginUpdatePasswordUrl", "loginUpdateProfileUrl", "loginUsernameReminderUrl", "loginUpdateTotpUrl"]?seq_contains(key) &&
|
|
120
|
+
are_same_path(path, ["url"])
|
|
121
|
+
) || (
|
|
122
|
+
key == "updateProfileCtx" &&
|
|
123
|
+
are_same_path(path, [])
|
|
124
|
+
) || (
|
|
125
|
+
<#-- https://github.com/InseeFrLab/keycloakify/pull/65#issuecomment-991896344 -->
|
|
126
|
+
key == "loginAction" &&
|
|
127
|
+
are_same_path(path, ["url"]) &&
|
|
128
|
+
pageId == "saml-post-form.ftl"
|
|
129
|
+
)
|
|
117
130
|
>
|
|
118
|
-
<#local out_seq += ["/*If you need" + key + " please submit an issue to the Keycloakify repo*/"]>
|
|
131
|
+
<#local out_seq += ["/*If you need '" + key + "' on " + pageId + ", please submit an issue to the Keycloakify repo*/"]>
|
|
119
132
|
<#continue>
|
|
120
133
|
</#if>
|
|
121
134
|
|
|
135
|
+
<#if key == "attemptedUsername" && are_same_path(path, ["auth"])>
|
|
136
|
+
|
|
137
|
+
<#attempt>
|
|
138
|
+
<#-- https://github.com/keycloak/keycloak/blob/3a2bf0c04bcde185e497aaa32d0bb7ab7520cf4a/themes/src/main/resources/theme/base/login/template.ftl#L63 -->
|
|
139
|
+
<#if !(auth?has_content && auth.showUsername() && !auth.showResetCredentials())>
|
|
140
|
+
<#continue>
|
|
141
|
+
</#if>
|
|
142
|
+
<#recover>
|
|
143
|
+
</#attempt>
|
|
144
|
+
|
|
145
|
+
</#if>
|
|
146
|
+
|
|
122
147
|
<#attempt>
|
|
123
148
|
<#if !object[key]??>
|
|
124
149
|
<#continue>
|
|
@@ -226,5 +251,40 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
|
|
|
226
251
|
|
|
227
252
|
<#return "ABORT: Couldn't convert into string non hash, non method, non boolean, non enumerable object">
|
|
228
253
|
|
|
254
|
+
</#function>
|
|
255
|
+
<#function are_same_path path searchedPath>
|
|
256
|
+
|
|
257
|
+
<#if path?size != path?size>
|
|
258
|
+
<#return false>
|
|
259
|
+
</#if>
|
|
260
|
+
|
|
261
|
+
<#local i=0>
|
|
262
|
+
|
|
263
|
+
<#list path as property>
|
|
264
|
+
|
|
265
|
+
<#local searchedProperty=searchedPath[i]>
|
|
266
|
+
|
|
267
|
+
<#if searchedProperty?is_string && searchedProperty == "*">
|
|
268
|
+
<#continue>
|
|
269
|
+
</#if>
|
|
270
|
+
|
|
271
|
+
<#if searchedProperty?is_string && !property?is_string>
|
|
272
|
+
<#return false>
|
|
273
|
+
</#if>
|
|
274
|
+
|
|
275
|
+
<#if searchedProperty?is_number && !property?is_number>
|
|
276
|
+
<#return false>
|
|
277
|
+
</#if>
|
|
278
|
+
|
|
279
|
+
<#if searchedProperty?string != property?string>
|
|
280
|
+
<#return false>
|
|
281
|
+
</#if>
|
|
282
|
+
|
|
283
|
+
<#local i+= 1>
|
|
284
|
+
|
|
285
|
+
</#list>
|
|
286
|
+
|
|
287
|
+
<#return true>
|
|
288
|
+
|
|
229
289
|
</#function>
|
|
230
290
|
</script>
|
|
@@ -121,7 +121,6 @@ function generateFtlFilesCodeFactory(params) {
|
|
|
121
121
|
"</#if>",
|
|
122
122
|
].join("\n"),
|
|
123
123
|
};
|
|
124
|
-
var pageIdSearchValue = "PAGE_ID_xIgLsPgGId9D8e";
|
|
125
124
|
$("head").prepend(__spreadArray(__spreadArray([], __read((Object.keys(cssGlobalsToDefine).length === 0
|
|
126
125
|
? []
|
|
127
126
|
: [
|
|
@@ -136,18 +135,18 @@ function generateFtlFilesCodeFactory(params) {
|
|
|
136
135
|
])), false), [
|
|
137
136
|
"<script>",
|
|
138
137
|
" window." + ftlValuesGlobalName_1.ftlValuesGlobalName + "= " + (0, objectKeys_1.objectKeys)(replaceValueBySearchValue)[0] + ";",
|
|
139
|
-
" window." + ftlValuesGlobalName_1.ftlValuesGlobalName + "[\"pageId\"]= \"" + pageIdSearchValue + "\";",
|
|
140
138
|
"</script>",
|
|
141
139
|
"",
|
|
142
140
|
(0, objectKeys_1.objectKeys)(replaceValueBySearchValue)[1],
|
|
143
141
|
], false).join("\n"));
|
|
144
142
|
var partiallyFixedIndexHtmlCode = $.html();
|
|
145
143
|
function generateFtlFilesCode(params) {
|
|
146
|
-
var _a;
|
|
147
144
|
var pageId = params.pageId;
|
|
148
145
|
var $ = cheerio_1.default.load(partiallyFixedIndexHtmlCode);
|
|
149
146
|
var ftlCode = $.html();
|
|
150
|
-
Object.entries(__assign(__assign({}, replaceValueBySearchValue),
|
|
147
|
+
Object.entries(__assign(__assign({}, replaceValueBySearchValue), {
|
|
148
|
+
//If updated, don't forget to change in the ftl script as well.
|
|
149
|
+
"PAGE_ID_xIgLsPgGId9D8e": pageId })).map(function (_a) {
|
|
151
150
|
var _b = __read(_a, 2), searchValue = _b[0], replaceValue = _b[1];
|
|
152
151
|
return (ftlCode = ftlCode.replace(searchValue, replaceValue));
|
|
153
152
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateFtl.js","sourceRoot":"","sources":["../../../src/bin/build-keycloak-theme/generateFtl/generateFtl.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generateFtl.js","sourceRoot":"","sources":["../../../src/bin/build-keycloak-theme/generateFtl/generateFtl.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ var react_1 = require("react");
|
|
|
28
28
|
var Template_1 = require("./Template");
|
|
29
29
|
var useKcMessage_1 = require("../i18n/useKcMessage");
|
|
30
30
|
var headInsert_1 = require("../tools/headInsert");
|
|
31
|
-
var
|
|
31
|
+
var pathJoin_1 = require("../tools/pathJoin");
|
|
32
32
|
var tss_react_1 = require("tss-react");
|
|
33
33
|
exports.LoginOtp = (0, react_1.memo)(function (_a) {
|
|
34
34
|
var kcContext = _a.kcContext, props = __rest(_a, ["kcContext"]);
|
|
@@ -39,7 +39,7 @@ exports.LoginOtp = (0, react_1.memo)(function (_a) {
|
|
|
39
39
|
var isCleanedUp = false;
|
|
40
40
|
(0, headInsert_1.headInsert)({
|
|
41
41
|
"type": "javascript",
|
|
42
|
-
"src": (0,
|
|
42
|
+
"src": (0, pathJoin_1.pathJoin)(kcContext.url.resourcesCommonPath, "node_modules/jquery/dist/jquery.min.js"),
|
|
43
43
|
}).then(function () {
|
|
44
44
|
if (isCleanedUp)
|
|
45
45
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginOtp.js","sourceRoot":"","sources":["../../src/lib/components/LoginOtp.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAAwC;AACxC,uCAAsC;AAGtC,qDAAoD;AACpD,kDAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"LoginOtp.js","sourceRoot":"","sources":["../../src/lib/components/LoginOtp.tsx"],"names":[],"mappings":"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"}
|
|
@@ -46,7 +46,7 @@ var KcLanguageTag_1 = require("../i18n/KcLanguageTag");
|
|
|
46
46
|
var KcLanguageTag_2 = require("../i18n/KcLanguageTag");
|
|
47
47
|
var useCallbackFactory_1 = require("powerhooks/useCallbackFactory");
|
|
48
48
|
var headInsert_1 = require("../tools/headInsert");
|
|
49
|
-
var
|
|
49
|
+
var pathJoin_1 = require("../tools/pathJoin");
|
|
50
50
|
var useConstCallback_1 = require("powerhooks/useConstCallback");
|
|
51
51
|
var tss_react_1 = require("tss-react");
|
|
52
52
|
exports.Template = (0, react_1.memo)(function (props) {
|
|
@@ -85,7 +85,7 @@ exports.Template = (0, react_1.memo)(function (props) {
|
|
|
85
85
|
var isUnmounted = false;
|
|
86
86
|
var cleanups = [];
|
|
87
87
|
var toArr = function (x) { return (typeof x === "string" ? x.split(" ") : x !== null && x !== void 0 ? x : []); };
|
|
88
|
-
Promise.all(__spreadArray(__spreadArray([], __read(toArr(props.stylesCommon).map(function (relativePath) { return (0,
|
|
88
|
+
Promise.all(__spreadArray(__spreadArray([], __read(toArr(props.stylesCommon).map(function (relativePath) { return (0, pathJoin_1.pathJoin)(url.resourcesCommonPath, relativePath); })), false), __read(toArr(props.styles).map(function (relativePath) { return (0, pathJoin_1.pathJoin)(url.resourcesPath, relativePath); })), false).reverse()
|
|
89
89
|
.map(function (href) {
|
|
90
90
|
return (0, headInsert_1.headInsert)({
|
|
91
91
|
"type": "css",
|
|
@@ -101,7 +101,7 @@ exports.Template = (0, react_1.memo)(function (props) {
|
|
|
101
101
|
toArr(props.scripts).forEach(function (relativePath) {
|
|
102
102
|
return (0, headInsert_1.headInsert)({
|
|
103
103
|
"type": "javascript",
|
|
104
|
-
"src": (0,
|
|
104
|
+
"src": (0, pathJoin_1.pathJoin)(url.resourcesPath, relativePath),
|
|
105
105
|
});
|
|
106
106
|
});
|
|
107
107
|
if (props.kcHtmlClass !== undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Template.js","sourceRoot":"","sources":["../../src/lib/components/Template.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAAoD;AAEpD,qDAAoD;AACpD,6DAA4D;AAE5D,0CAAyC;AAEzC,uDAAuE;AACvE,uDAA8D;AAC9D,oEAAmE;AACnE,kDAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"Template.js","sourceRoot":"","sources":["../../src/lib/components/Template.tsx"],"names":[],"mappings":"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"}
|
|
@@ -44,13 +44,13 @@ var KcLanguageTag_1 = require("../../i18n/KcLanguageTag");
|
|
|
44
44
|
//NOTE: Aside because we want to be able to import them from node
|
|
45
45
|
var urlResourcesPath_1 = require("./urlResourcesPath");
|
|
46
46
|
var id_1 = require("tsafe/id");
|
|
47
|
-
var
|
|
47
|
+
var pathJoin_1 = require("../../tools/pathJoin");
|
|
48
48
|
var PUBLIC_URL = (_a = process.env["PUBLIC_URL"]) !== null && _a !== void 0 ? _a : "/";
|
|
49
49
|
exports.kcContextCommonMock = {
|
|
50
50
|
"url": {
|
|
51
51
|
"loginAction": "#",
|
|
52
|
-
"resourcesPath": (0,
|
|
53
|
-
"resourcesCommonPath": (0,
|
|
52
|
+
"resourcesPath": (0, pathJoin_1.pathJoin)(PUBLIC_URL, urlResourcesPath_1.resourcesPath),
|
|
53
|
+
"resourcesCommonPath": (0, pathJoin_1.pathJoin)(PUBLIC_URL, urlResourcesPath_1.resourcesCommonPath),
|
|
54
54
|
"loginRestartFlowUrl": "/auth/realms/myrealm/login-actions/restart?client_id=account&tab_id=HoAx28ja4xg",
|
|
55
55
|
"loginUrl": "/auth/realms/myrealm/login-actions/authenticate?client_id=account&tab_id=HoAx28ja4xg",
|
|
56
56
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kcContextMocks.js","sourceRoot":"","sources":["../../../src/lib/getKcContext/kcContextMocks/kcContextMocks.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA8C;AAE9C,gEAA+D;AAC/D,0DAAiE;AACjE,iEAAiE;AACjE,uDAAwE;AACxE,+BAA8B;AAC9B,
|
|
1
|
+
{"version":3,"file":"kcContextMocks.js","sourceRoot":"","sources":["../../../src/lib/getKcContext/kcContextMocks/kcContextMocks.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.resourcesCommonPath = exports.resourcesPath = exports.subDirOfPublicDirBasename = void 0;
|
|
4
|
-
var
|
|
4
|
+
var pathJoin_1 = require("../../tools/pathJoin");
|
|
5
5
|
exports.subDirOfPublicDirBasename = "keycloak_static";
|
|
6
|
-
exports.resourcesPath = (0,
|
|
7
|
-
exports.resourcesCommonPath = (0,
|
|
6
|
+
exports.resourcesPath = (0, pathJoin_1.pathJoin)(exports.subDirOfPublicDirBasename, "resources");
|
|
7
|
+
exports.resourcesCommonPath = (0, pathJoin_1.pathJoin)(exports.subDirOfPublicDirBasename, "resources_common");
|
|
8
8
|
//# sourceMappingURL=urlResourcesPath.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"urlResourcesPath.js","sourceRoot":"","sources":["../../../src/lib/getKcContext/kcContextMocks/urlResourcesPath.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"urlResourcesPath.js","sourceRoot":"","sources":["../../../src/lib/getKcContext/kcContextMocks/urlResourcesPath.ts"],"names":[],"mappings":";;;AAAA,iDAAgD;AAEnC,QAAA,yBAAyB,GAAG,iBAAiB,CAAC;AAC9C,QAAA,aAAa,GAAG,IAAA,mBAAQ,EAAC,iCAAyB,EAAE,WAAW,CAAC,CAAC;AACjE,QAAA,mBAAmB,GAAG,IAAA,mBAAQ,EAAC,iCAAyB,EAAE,kBAAkB,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function pathJoin(...path: string[]): string;
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.pathJoin = void 0;
|
|
4
|
+
function pathJoin() {
|
|
5
|
+
var path = [];
|
|
6
|
+
for (var _i = 0; _i < arguments.length; _i++) {
|
|
7
|
+
path[_i] = arguments[_i];
|
|
8
|
+
}
|
|
9
|
+
return path
|
|
10
|
+
.map(function (part, i) { return (i === 0 ? part : part.replace(/^\/+/, "")); })
|
|
11
|
+
.map(function (part, i) { return (i === path.length - 1 ? part : part.replace(/\/+$/, "")); })
|
|
12
|
+
.join("/");
|
|
13
|
+
}
|
|
14
|
+
exports.pathJoin = pathJoin;
|
|
15
|
+
//# sourceMappingURL=pathJoin.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pathJoin.js","sourceRoot":"","sources":["../../src/lib/tools/pathJoin.ts"],"names":[],"mappings":";;;AAAA,SAAgB,QAAQ;IAAC,cAAiB;SAAjB,UAAiB,EAAjB,qBAAiB,EAAjB,IAAiB;QAAjB,yBAAiB;;IACtC,OAAO,IAAI;SACN,GAAG,CAAC,UAAC,IAAI,EAAE,CAAC,IAAK,OAAA,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,EAA3C,CAA2C,CAAC;SAC7D,GAAG,CAAC,UAAC,IAAI,EAAE,CAAC,IAAK,OAAA,CAAC,CAAC,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,EAAzD,CAAyD,CAAC;SAC3E,IAAI,CAAC,GAAG,CAAC,CAAC;AACnB,CAAC;AALD,4BAKC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "keycloakify",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.17",
|
|
4
4
|
"description": "Keycloak theme generator for Reacts app",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -95,6 +95,7 @@
|
|
|
95
95
|
"src/lib/tools/deepClone.ts",
|
|
96
96
|
"src/lib/tools/emailRegExp.ts",
|
|
97
97
|
"src/lib/tools/headInsert.ts",
|
|
98
|
+
"src/lib/tools/pathJoin.ts",
|
|
98
99
|
"src/lib/useFormValidationSlice.tsx",
|
|
99
100
|
"bin/KeycloakVersion.d.ts",
|
|
100
101
|
"bin/KeycloakVersion.js",
|
|
@@ -300,6 +301,9 @@
|
|
|
300
301
|
"lib/tools/headInsert.d.ts",
|
|
301
302
|
"lib/tools/headInsert.js",
|
|
302
303
|
"lib/tools/headInsert.js.map",
|
|
304
|
+
"lib/tools/pathJoin.d.ts",
|
|
305
|
+
"lib/tools/pathJoin.js",
|
|
306
|
+
"lib/tools/pathJoin.js.map",
|
|
303
307
|
"lib/useFormValidationSlice.d.ts",
|
|
304
308
|
"lib/useFormValidationSlice.js",
|
|
305
309
|
"lib/useFormValidationSlice.js.map"
|
package/src/bin/build-keycloak-theme/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
<script>const _=
|
|
2
|
+
<#assign pageId="PAGE_ID_xIgLsPgGId9D8e">
|
|
2
3
|
(()=>{
|
|
3
4
|
|
|
4
5
|
const out =
|
|
@@ -76,9 +77,11 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
|
|
|
76
77
|
}
|
|
77
78
|
};
|
|
78
79
|
|
|
80
|
+
out["pageId"] = "${pageId}";
|
|
81
|
+
|
|
79
82
|
return out;
|
|
80
83
|
|
|
81
|
-
})()
|
|
84
|
+
})()
|
|
82
85
|
<#function ftl_object_to_js_code_declaring_an_object object path>
|
|
83
86
|
|
|
84
87
|
<#local isHash = "">
|
|
@@ -112,13 +115,35 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
|
|
|
112
115
|
</#if>
|
|
113
116
|
|
|
114
117
|
<#if
|
|
115
|
-
|
|
116
|
-
|
|
118
|
+
(
|
|
119
|
+
["loginUpdatePasswordUrl", "loginUpdateProfileUrl", "loginUsernameReminderUrl", "loginUpdateTotpUrl"]?seq_contains(key) &&
|
|
120
|
+
are_same_path(path, ["url"])
|
|
121
|
+
) || (
|
|
122
|
+
key == "updateProfileCtx" &&
|
|
123
|
+
are_same_path(path, [])
|
|
124
|
+
) || (
|
|
125
|
+
<#-- https://github.com/InseeFrLab/keycloakify/pull/65#issuecomment-991896344 -->
|
|
126
|
+
key == "loginAction" &&
|
|
127
|
+
are_same_path(path, ["url"]) &&
|
|
128
|
+
pageId == "saml-post-form.ftl"
|
|
129
|
+
)
|
|
117
130
|
>
|
|
118
|
-
<#local out_seq += ["/*If you need" + key + " please submit an issue to the Keycloakify repo*/"]>
|
|
131
|
+
<#local out_seq += ["/*If you need '" + key + "' on " + pageId + ", please submit an issue to the Keycloakify repo*/"]>
|
|
119
132
|
<#continue>
|
|
120
133
|
</#if>
|
|
121
134
|
|
|
135
|
+
<#if key == "attemptedUsername" && are_same_path(path, ["auth"])>
|
|
136
|
+
|
|
137
|
+
<#attempt>
|
|
138
|
+
<#-- https://github.com/keycloak/keycloak/blob/3a2bf0c04bcde185e497aaa32d0bb7ab7520cf4a/themes/src/main/resources/theme/base/login/template.ftl#L63 -->
|
|
139
|
+
<#if !(auth?has_content && auth.showUsername() && !auth.showResetCredentials())>
|
|
140
|
+
<#continue>
|
|
141
|
+
</#if>
|
|
142
|
+
<#recover>
|
|
143
|
+
</#attempt>
|
|
144
|
+
|
|
145
|
+
</#if>
|
|
146
|
+
|
|
122
147
|
<#attempt>
|
|
123
148
|
<#if !object[key]??>
|
|
124
149
|
<#continue>
|
|
@@ -226,5 +251,40 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
|
|
|
226
251
|
|
|
227
252
|
<#return "ABORT: Couldn't convert into string non hash, non method, non boolean, non enumerable object">
|
|
228
253
|
|
|
254
|
+
</#function>
|
|
255
|
+
<#function are_same_path path searchedPath>
|
|
256
|
+
|
|
257
|
+
<#if path?size != path?size>
|
|
258
|
+
<#return false>
|
|
259
|
+
</#if>
|
|
260
|
+
|
|
261
|
+
<#local i=0>
|
|
262
|
+
|
|
263
|
+
<#list path as property>
|
|
264
|
+
|
|
265
|
+
<#local searchedProperty=searchedPath[i]>
|
|
266
|
+
|
|
267
|
+
<#if searchedProperty?is_string && searchedProperty == "*">
|
|
268
|
+
<#continue>
|
|
269
|
+
</#if>
|
|
270
|
+
|
|
271
|
+
<#if searchedProperty?is_string && !property?is_string>
|
|
272
|
+
<#return false>
|
|
273
|
+
</#if>
|
|
274
|
+
|
|
275
|
+
<#if searchedProperty?is_number && !property?is_number>
|
|
276
|
+
<#return false>
|
|
277
|
+
</#if>
|
|
278
|
+
|
|
279
|
+
<#if searchedProperty?string != property?string>
|
|
280
|
+
<#return false>
|
|
281
|
+
</#if>
|
|
282
|
+
|
|
283
|
+
<#local i+= 1>
|
|
284
|
+
|
|
285
|
+
</#list>
|
|
286
|
+
|
|
287
|
+
<#return true>
|
|
288
|
+
|
|
229
289
|
</#function>
|
|
230
290
|
</script>
|
|
@@ -87,8 +87,6 @@ export function generateFtlFilesCodeFactory(params: {
|
|
|
87
87
|
].join("\n"),
|
|
88
88
|
};
|
|
89
89
|
|
|
90
|
-
const pageIdSearchValue = "PAGE_ID_xIgLsPgGId9D8e";
|
|
91
|
-
|
|
92
90
|
$("head").prepend(
|
|
93
91
|
[
|
|
94
92
|
...(Object.keys(cssGlobalsToDefine).length === 0
|
|
@@ -105,7 +103,6 @@ export function generateFtlFilesCodeFactory(params: {
|
|
|
105
103
|
]),
|
|
106
104
|
"<script>",
|
|
107
105
|
` window.${ftlValuesGlobalName}= ${objectKeys(replaceValueBySearchValue)[0]};`,
|
|
108
|
-
` window.${ftlValuesGlobalName}["pageId"]= "${pageIdSearchValue}";`,
|
|
109
106
|
"</script>",
|
|
110
107
|
"",
|
|
111
108
|
objectKeys(replaceValueBySearchValue)[1],
|
|
@@ -125,7 +122,8 @@ export function generateFtlFilesCodeFactory(params: {
|
|
|
125
122
|
|
|
126
123
|
Object.entries({
|
|
127
124
|
...replaceValueBySearchValue,
|
|
128
|
-
|
|
125
|
+
//If updated, don't forget to change in the ftl script as well.
|
|
126
|
+
"PAGE_ID_xIgLsPgGId9D8e": pageId,
|
|
129
127
|
}).map(([searchValue, replaceValue]) => (ftlCode = ftlCode.replace(searchValue, replaceValue)));
|
|
130
128
|
|
|
131
129
|
return { ftlCode };
|
|
@@ -4,7 +4,7 @@ import type { KcProps } from "./KcProps";
|
|
|
4
4
|
import type { KcContextBase } from "../getKcContext/KcContextBase";
|
|
5
5
|
import { useKcMessage } from "../i18n/useKcMessage";
|
|
6
6
|
import { headInsert } from "../tools/headInsert";
|
|
7
|
-
import {
|
|
7
|
+
import { pathJoin } from "../tools/pathJoin";
|
|
8
8
|
import { useCssAndCx } from "tss-react";
|
|
9
9
|
|
|
10
10
|
export const LoginOtp = memo(({ kcContext, ...props }: { kcContext: KcContextBase.LoginOtp } & KcProps) => {
|
|
@@ -9,7 +9,7 @@ import { getBestMatchAmongKcLanguageTag } from "../i18n/KcLanguageTag";
|
|
|
9
9
|
import { getKcLanguageTagLabel } from "../i18n/KcLanguageTag";
|
|
10
10
|
import { useCallbackFactory } from "powerhooks/useCallbackFactory";
|
|
11
11
|
import { headInsert } from "../tools/headInsert";
|
|
12
|
-
import {
|
|
12
|
+
import { pathJoin } from "../tools/pathJoin";
|
|
13
13
|
import { useConstCallback } from "powerhooks/useConstCallback";
|
|
14
14
|
import type { KcTemplateProps } from "./KcProps";
|
|
15
15
|
import { useCssAndCx } from "tss-react";
|
|
@@ -5,7 +5,7 @@ import { getKcLanguageTagLabel } from "../../i18n/KcLanguageTag";
|
|
|
5
5
|
//NOTE: Aside because we want to be able to import them from node
|
|
6
6
|
import { resourcesCommonPath, resourcesPath } from "./urlResourcesPath";
|
|
7
7
|
import { id } from "tsafe/id";
|
|
8
|
-
import {
|
|
8
|
+
import { pathJoin } from "../../tools/pathJoin";
|
|
9
9
|
|
|
10
10
|
const PUBLIC_URL = process.env["PUBLIC_URL"] ?? "/";
|
|
11
11
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { pathJoin } from "../../tools/pathJoin";
|
|
2
2
|
|
|
3
3
|
export const subDirOfPublicDirBasename = "keycloak_static";
|
|
4
|
-
export const resourcesPath = pathJoin(subDirOfPublicDirBasename, "
|
|
5
|
-
export const resourcesCommonPath = pathJoin(subDirOfPublicDirBasename, "
|
|
4
|
+
export const resourcesPath = pathJoin(subDirOfPublicDirBasename, "resources");
|
|
5
|
+
export const resourcesCommonPath = pathJoin(subDirOfPublicDirBasename, "resources_common");
|