keycloakify 7.6.2 → 7.6.3
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/account/kcContext/getKcContext.js +3 -1
- package/account/kcContext/getKcContext.js.map +1 -1
- package/bin/eject-keycloak-page.js +1 -1
- package/bin/eject-keycloak-page.js.map +1 -1
- package/bin/keycloakify/generateFtl/generateFtl.d.ts +0 -4
- package/bin/keycloakify/generateFtl/generateFtl.js +1 -27
- package/bin/keycloakify/generateFtl/generateFtl.js.map +1 -1
- package/bin/keycloakify/generateFtl/index.d.ts +1 -0
- package/bin/keycloakify/generateFtl/index.js +1 -0
- package/bin/keycloakify/generateFtl/index.js.map +1 -1
- package/bin/keycloakify/generateFtl/pageId.d.ts +4 -0
- package/bin/keycloakify/generateFtl/pageId.js +30 -0
- package/bin/keycloakify/generateFtl/pageId.js.map +1 -0
- package/login/kcContext/getKcContext.js +2 -1
- package/login/kcContext/getKcContext.js.map +1 -1
- package/login/lib/useDownloadTerms.d.ts +1 -2
- package/login/pages/Terms.js +3 -2
- package/login/pages/Terms.js.map +1 -1
- package/package.json +5 -1
- package/src/account/kcContext/getKcContext.ts +3 -1
- package/src/bin/eject-keycloak-page.ts +1 -1
- package/src/bin/keycloakify/generateFtl/generateFtl.ts +0 -31
- package/src/bin/keycloakify/generateFtl/index.ts +1 -0
- package/src/bin/keycloakify/generateFtl/pageId.ts +30 -0
- package/src/login/kcContext/getKcContext.ts +2 -1
- package/src/login/lib/useDownloadTerms.ts +1 -1
- package/src/login/pages/Terms.tsx +6 -2
|
@@ -5,6 +5,8 @@ import { pathBasename } from "../../tools/pathBasename";
|
|
|
5
5
|
import { mockTestingResourcesCommonPath } from "../../bin/mockTestingResourcesPath";
|
|
6
6
|
import { symToStr } from "tsafe/symToStr";
|
|
7
7
|
import { kcContextMocks, kcContextCommonMock } from "../../account/kcContext/kcContextMocks";
|
|
8
|
+
import { id } from "tsafe/id";
|
|
9
|
+
import { accountThemePageIds } from "../../bin/keycloakify/generateFtl/pageId";
|
|
8
10
|
export function getKcContext(params) {
|
|
9
11
|
const { mockPageId, mockData } = params !== null && params !== void 0 ? params : {};
|
|
10
12
|
const realKcContext = getKcContextFromWindow();
|
|
@@ -39,7 +41,7 @@ export function getKcContext(params) {
|
|
|
39
41
|
if (realKcContext === undefined) {
|
|
40
42
|
return { "kcContext": undefined };
|
|
41
43
|
}
|
|
42
|
-
if (!("account" in realKcContext)) {
|
|
44
|
+
if (id(accountThemePageIds).indexOf(realKcContext.pageId) < 0 && !("account" in realKcContext)) {
|
|
43
45
|
return { "kcContext": undefined };
|
|
44
46
|
}
|
|
45
47
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getKcContext.js","sourceRoot":"","sources":["../../src/account/kcContext/getKcContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,8BAA8B,EAAE,MAAM,0CAA0C,CAAC;AAC1F,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;
|
|
1
|
+
{"version":3,"file":"getKcContext.js","sourceRoot":"","sources":["../../src/account/kcContext/getKcContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,8BAA8B,EAAE,MAAM,0CAA0C,CAAC;AAC1F,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnG,OAAO,EAAE,EAAE,EAAE,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AAErF,MAAM,UAAU,YAAY,CAAwD,MAGnF;IACG,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;IAE9C,MAAM,aAAa,GAAG,sBAAsB,EAAsB,CAAC;IAEnE,IAAI,UAAU,KAAK,SAAS,IAAI,aAAa,KAAK,SAAS,EAAE;QACzD,2CAA2C;QAE3C,OAAO,CAAC,GAAG,CACP;YACI,kBAAkB,QAAQ,CAAC,EAAE,UAAU,EAAE,CAAC,WAAW,UAAU,GAAG;YAClE,mFAAmF;SACtF,CAAC,IAAI,CAAC,GAAG,CAAC,EACX,mDAAmD,CACtD,CAAC;QAEF,MAAM,oBAAoB,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC;QAExF,MAAM,0BAA0B,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC;QAEzF,IAAI,oBAAoB,KAAK,SAAS,IAAI,0BAA0B,KAAK,SAAS,EAAE;YAChF,OAAO,CAAC,IAAI,CACR;gBACI,+CAA+C,UAAU,kBAAkB;gBAC3E,6FAA6F;gBAC7F,6DAA6D;aAChE,CAAC,IAAI,CAAC,IAAI,CAAC,CACf,CAAC;SACL;QAED,MAAM,SAAS,GAAQ,EAAE,CAAC;QAE1B,UAAU,CAAC;YACP,QAAQ,EAAE,SAAS;YACnB,QAAQ,EAAE,oBAAoB,KAAK,SAAS,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,iBAAG,QAAQ,EAAE,UAAU,IAAK,mBAAmB,CAAE;SACzH,CAAC,CAAC;QAEH,IAAI,0BAA0B,KAAK,SAAS,EAAE;YAC1C,UAAU,CAAC;gBACP,QAAQ,EAAE,SAAS;gBACnB,QAAQ,EAAE,0BAA0B;aACvC,CAAC,CAAC;SACN;QAED,OAAO,EAAE,SAAS,EAAE,CAAC;KACxB;IAED,IAAI,aAAa,KAAK,SAAS,EAAE;QAC7B,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC;KACrC;IAED,IAAI,EAAE,CAAoB,mBAAmB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,SAAS,IAAI,aAAa,CAAC,EAAE;QAC/G,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC;KACrC;IAED;QACI,MAAM,EAAE,GAAG,EAAE,GAAG,aAAa,CAAC;QAE9B,GAAG,CAAC,mBAAmB,GAAG,QAAQ,CAAC,GAAG,CAAC,aAAa,EAAE,YAAY,CAAC,8BAA8B,CAAC,CAAC,CAAC;KACvG;IAED,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC;AAC1C,CAAC"}
|
|
@@ -67,7 +67,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
67
67
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
68
68
|
var getProjectRoot_1 = require("./tools/getProjectRoot");
|
|
69
69
|
var cli_select_1 = __importDefault(require("cli-select"));
|
|
70
|
-
var generateFtl_1 = require("./keycloakify/generateFtl
|
|
70
|
+
var generateFtl_1 = require("./keycloakify/generateFtl");
|
|
71
71
|
var capitalize_1 = require("tsafe/capitalize");
|
|
72
72
|
var promises_1 = require("fs/promises");
|
|
73
73
|
var fs_1 = require("fs");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eject-keycloak-page.js","sourceRoot":"","sources":["../src/bin/eject-keycloak-page.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,yDAAwD;AACxD,0DAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"eject-keycloak-page.js","sourceRoot":"","sources":["../src/bin/eject-keycloak-page.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,yDAAwD;AACxD,0DAAmC;AACnC,yDAOmC;AACnC,+CAA8C;AAC9C,wCAAkD;AAClD,yBAAgC;AAChC,6BAAkE;AAClE,qEAAoE;AACpE,uCAA8C;AAC9C,iDAAqD;AAErD,CAAC;;;;;gBACS,cAAc,GAAG,IAAA,+BAAc,GAAE,CAAC;gBAExC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;gBAEN,qBAAM,IAAA,oBAAS,EAAY;wBACpD,QAAQ,2BAAM,wBAAU,SAAC;qBAC5B,CAAC,CAAC,KAAK,CAAC;wBACL,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;wBAExB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;oBACrB,CAAC,CAAC,EAAA;;gBANa,SAAS,GAAK,CAAA,SAM3B,CAAA,MANsB;gBAQxB,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;gBAE3B,qBAAM,IAAA,oBAAS,EAAwC;wBAC7E,QAAQ,EAAE,CAAC;4BACP,QAAQ,SAAS,EAAE;gCACf,KAAK,OAAO;oCACR,gCAAW,+BAAiB,UAAE;gCAClC,KAAK,SAAS;oCACV,gCAAW,iCAAmB,UAAE;6BACvC;4BACD,IAAA,eAAM,EAAkC,KAAK,CAAC,CAAC;wBACnD,CAAC,CAAC,EAAE;qBACP,CAAC,CAAC,KAAK,CAAC;wBACL,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;wBAExB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;oBACrB,CAAC,CAAC,EAAA;;gBAda,MAAM,GAAK,CAAA,SAcxB,CAAA,MAdmB;gBAgBf,YAAY,GAAG,IAAA,uBAAU,EAAC,IAAA,2CAAoB,EAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBAE7E,eAAe,GAAK,IAAA,kCAAkB,EAAC,EAAE,gBAAgB,EAAE,cAAc,EAAE,CAAC,gBAA7D,CAA8D;gBAErF,IAAI,eAAe,KAAK,SAAS,EAAE;oBAC/B,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;iBACzD;gBAEK,cAAc,GAAG,IAAA,WAAQ,EAAC,eAAe,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;gBAEnF,IAAI,IAAA,eAAU,EAAC,cAAc,CAAC,EAAE;oBAC5B,OAAO,CAAC,GAAG,CAAC,UAAG,MAAM,kCAAwB,IAAA,eAAY,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,oBAAiB,CAAC,CAAC;oBAE3G,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;iBACpB;gBAED,KAAA,oBAAS,CAAA;sBAAC,cAAc;gBAAE,qBAAM,IAAA,mBAAQ,EAAC,IAAA,WAAQ,EAAC,cAAc,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC,EAAA;;gBAA3G,4BAA0B,SAAiF,GAAC,CAAC;gBAE7G,OAAO,CAAC,GAAG,CAAC,UAAG,IAAA,eAAY,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,aAAU,CAAC,CAAC;;;;KACzE,CAAC,EAAE,CAAC"}
|
|
@@ -1,9 +1,5 @@
|
|
|
1
1
|
export declare const themeTypes: readonly ["login", "account"];
|
|
2
2
|
export type ThemeType = (typeof themeTypes)[number];
|
|
3
|
-
export declare const loginThemePageIds: readonly ["login.ftl", "login-username.ftl", "login-password.ftl", "webauthn-authenticate.ftl", "register.ftl", "register-user-profile.ftl", "info.ftl", "error.ftl", "login-reset-password.ftl", "login-verify-email.ftl", "terms.ftl", "login-otp.ftl", "login-update-profile.ftl", "login-update-password.ftl", "login-idp-link-confirm.ftl", "login-idp-link-email.ftl", "login-page-expired.ftl", "login-config-totp.ftl", "logout-confirm.ftl", "update-user-profile.ftl", "idp-review-user-profile.ftl", "update-email.ftl", "select-authenticator.ftl"];
|
|
4
|
-
export declare const accountThemePageIds: readonly ["password.ftl", "account.ftl"];
|
|
5
|
-
export type LoginThemePageId = (typeof loginThemePageIds)[number];
|
|
6
|
-
export type AccountThemePageId = (typeof accountThemePageIds)[number];
|
|
7
3
|
export type BuildOptionsLike = BuildOptionsLike.Standalone | BuildOptionsLike.ExternalAssets;
|
|
8
4
|
export declare namespace BuildOptionsLike {
|
|
9
5
|
type Common = {
|
|
@@ -53,7 +53,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
53
53
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
54
54
|
};
|
|
55
55
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
56
|
-
exports.generateFtlFilesCodeFactory = exports.
|
|
56
|
+
exports.generateFtlFilesCodeFactory = exports.themeTypes = void 0;
|
|
57
57
|
var cheerio_1 = __importDefault(require("cheerio"));
|
|
58
58
|
var replaceImportsFromStaticInJsCode_1 = require("../replacers/replaceImportsFromStaticInJsCode");
|
|
59
59
|
var replaceImportsInCssCode_1 = require("../replacers/replaceImportsInCssCode");
|
|
@@ -64,32 +64,6 @@ var objectKeys_1 = require("tsafe/objectKeys");
|
|
|
64
64
|
var ftlValuesGlobalName_1 = require("../ftlValuesGlobalName");
|
|
65
65
|
var assert_1 = require("tsafe/assert");
|
|
66
66
|
exports.themeTypes = ["login", "account"];
|
|
67
|
-
exports.loginThemePageIds = [
|
|
68
|
-
"login.ftl",
|
|
69
|
-
"login-username.ftl",
|
|
70
|
-
"login-password.ftl",
|
|
71
|
-
"webauthn-authenticate.ftl",
|
|
72
|
-
"register.ftl",
|
|
73
|
-
"register-user-profile.ftl",
|
|
74
|
-
"info.ftl",
|
|
75
|
-
"error.ftl",
|
|
76
|
-
"login-reset-password.ftl",
|
|
77
|
-
"login-verify-email.ftl",
|
|
78
|
-
"terms.ftl",
|
|
79
|
-
"login-otp.ftl",
|
|
80
|
-
"login-update-profile.ftl",
|
|
81
|
-
"login-update-password.ftl",
|
|
82
|
-
"login-idp-link-confirm.ftl",
|
|
83
|
-
"login-idp-link-email.ftl",
|
|
84
|
-
"login-page-expired.ftl",
|
|
85
|
-
"login-config-totp.ftl",
|
|
86
|
-
"logout-confirm.ftl",
|
|
87
|
-
"update-user-profile.ftl",
|
|
88
|
-
"idp-review-user-profile.ftl",
|
|
89
|
-
"update-email.ftl",
|
|
90
|
-
"select-authenticator.ftl"
|
|
91
|
-
];
|
|
92
|
-
exports.accountThemePageIds = ["password.ftl", "account.ftl"];
|
|
93
67
|
(0, assert_1.assert)();
|
|
94
68
|
function generateFtlFilesCodeFactory(params) {
|
|
95
69
|
var cssGlobalsToDefine = params.cssGlobalsToDefine, indexHtmlCode = params.indexHtmlCode, buildOptions = params.buildOptions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateFtl.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateFtl/generateFtl.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA8B;AAC9B,kGAAiG;AACjG,gFAAsF;AACtF,4FAA2F;AAC3F,qCAAyB;AACzB,6BAAwC;AACxC,+CAA8C;AAC9C,8DAA6D;AAE7D,uCAAsC;AAEzB,QAAA,UAAU,GAAG,CAAC,OAAO,EAAE,SAAS,CAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"generateFtl.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateFtl/generateFtl.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./generateFtl"), exports);
|
|
18
|
+
__exportStar(require("./pageId"), exports);
|
|
18
19
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateFtl/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateFtl/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,2CAAyB"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
export declare const loginThemePageIds: readonly ["login.ftl", "login-username.ftl", "login-password.ftl", "webauthn-authenticate.ftl", "register.ftl", "register-user-profile.ftl", "info.ftl", "error.ftl", "login-reset-password.ftl", "login-verify-email.ftl", "terms.ftl", "login-otp.ftl", "login-update-profile.ftl", "login-update-password.ftl", "login-idp-link-confirm.ftl", "login-idp-link-email.ftl", "login-page-expired.ftl", "login-config-totp.ftl", "logout-confirm.ftl", "update-user-profile.ftl", "idp-review-user-profile.ftl", "update-email.ftl", "select-authenticator.ftl"];
|
|
2
|
+
export declare const accountThemePageIds: readonly ["password.ftl", "account.ftl"];
|
|
3
|
+
export type LoginThemePageId = (typeof loginThemePageIds)[number];
|
|
4
|
+
export type AccountThemePageId = (typeof accountThemePageIds)[number];
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.accountThemePageIds = exports.loginThemePageIds = void 0;
|
|
4
|
+
exports.loginThemePageIds = [
|
|
5
|
+
"login.ftl",
|
|
6
|
+
"login-username.ftl",
|
|
7
|
+
"login-password.ftl",
|
|
8
|
+
"webauthn-authenticate.ftl",
|
|
9
|
+
"register.ftl",
|
|
10
|
+
"register-user-profile.ftl",
|
|
11
|
+
"info.ftl",
|
|
12
|
+
"error.ftl",
|
|
13
|
+
"login-reset-password.ftl",
|
|
14
|
+
"login-verify-email.ftl",
|
|
15
|
+
"terms.ftl",
|
|
16
|
+
"login-otp.ftl",
|
|
17
|
+
"login-update-profile.ftl",
|
|
18
|
+
"login-update-password.ftl",
|
|
19
|
+
"login-idp-link-confirm.ftl",
|
|
20
|
+
"login-idp-link-email.ftl",
|
|
21
|
+
"login-page-expired.ftl",
|
|
22
|
+
"login-config-totp.ftl",
|
|
23
|
+
"logout-confirm.ftl",
|
|
24
|
+
"update-user-profile.ftl",
|
|
25
|
+
"idp-review-user-profile.ftl",
|
|
26
|
+
"update-email.ftl",
|
|
27
|
+
"select-authenticator.ftl"
|
|
28
|
+
];
|
|
29
|
+
exports.accountThemePageIds = ["password.ftl", "account.ftl"];
|
|
30
|
+
//# sourceMappingURL=pageId.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pageId.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateFtl/pageId.ts"],"names":[],"mappings":";;;AAAa,QAAA,iBAAiB,GAAG;IAC7B,WAAW;IACX,oBAAoB;IACpB,oBAAoB;IACpB,2BAA2B;IAC3B,cAAc;IACd,2BAA2B;IAC3B,UAAU;IACV,WAAW;IACX,0BAA0B;IAC1B,wBAAwB;IACxB,WAAW;IACX,eAAe;IACf,0BAA0B;IAC1B,2BAA2B;IAC3B,4BAA4B;IAC5B,0BAA0B;IAC1B,wBAAwB;IACxB,uBAAuB;IACvB,oBAAoB;IACpB,yBAAyB;IACzB,6BAA6B;IAC7B,kBAAkB;IAClB,0BAA0B;CACpB,CAAC;AAEE,QAAA,mBAAmB,GAAG,CAAC,cAAc,EAAE,aAAa,CAAU,CAAC"}
|
|
@@ -8,6 +8,7 @@ import { pathJoin } from "../../bin/tools/pathJoin";
|
|
|
8
8
|
import { pathBasename } from "../../tools/pathBasename";
|
|
9
9
|
import { mockTestingResourcesCommonPath } from "../../bin/mockTestingResourcesPath";
|
|
10
10
|
import { symToStr } from "tsafe/symToStr";
|
|
11
|
+
import { loginThemePageIds } from "../../bin/keycloakify/generateFtl/pageId";
|
|
11
12
|
export function getKcContext(params) {
|
|
12
13
|
var _a, _b;
|
|
13
14
|
const { mockPageId, mockData } = params !== null && params !== void 0 ? params : {};
|
|
@@ -81,7 +82,7 @@ export function getKcContext(params) {
|
|
|
81
82
|
if (realKcContext === undefined) {
|
|
82
83
|
return { "kcContext": undefined };
|
|
83
84
|
}
|
|
84
|
-
if (!("login" in realKcContext)) {
|
|
85
|
+
if (id(loginThemePageIds).indexOf(realKcContext.pageId) < 0 && !("login" in realKcContext)) {
|
|
85
86
|
return { "kcContext": undefined };
|
|
86
87
|
}
|
|
87
88
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getKcContext.js","sourceRoot":"","sources":["../../src/login/kcContext/getKcContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvE,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,EAAE,EAAE,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,8BAA8B,EAAE,MAAM,0CAA0C,CAAC;AAC1F,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"getKcContext.js","sourceRoot":"","sources":["../../src/login/kcContext/getKcContext.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import { KcContext } from "../kcContext";
|
|
2
1
|
export declare const evtTermMarkdown: import("evt/lib/types").StatefulEvt<string | undefined>;
|
|
3
2
|
export type KcContextLike = {
|
|
4
|
-
pageId:
|
|
3
|
+
pageId: string;
|
|
5
4
|
locale?: {
|
|
6
5
|
currentLanguageTag: string;
|
|
7
6
|
};
|
package/login/pages/Terms.js
CHANGED
|
@@ -13,9 +13,10 @@ export default function Terms(props) {
|
|
|
13
13
|
const { msg, msgStr } = i18n;
|
|
14
14
|
useRerenderOnStateChange(evtTermMarkdown);
|
|
15
15
|
const { url } = kcContext;
|
|
16
|
-
|
|
16
|
+
const termMarkdown = evtTermMarkdown.state;
|
|
17
|
+
if (termMarkdown === undefined) {
|
|
17
18
|
return null;
|
|
18
19
|
}
|
|
19
|
-
return (_jsxs(Template, Object.assign({}, { kcContext, i18n, doUseDefaultCss, classes }, { displayMessage: false, headerNode: msg("termsTitle") }, { children: [_jsx("div", Object.assign({ id: "kc-terms-text" }, { children:
|
|
20
|
+
return (_jsxs(Template, Object.assign({}, { kcContext, i18n, doUseDefaultCss, classes }, { displayMessage: false, headerNode: msg("termsTitle") }, { children: [_jsx("div", Object.assign({ id: "kc-terms-text" }, { children: _jsx(Markdown, { children: termMarkdown }) })), _jsxs("form", Object.assign({ className: "form-actions", action: url.loginAction, method: "POST" }, { children: [_jsx("input", { className: clsx(getClassName("kcButtonClass"), getClassName("kcButtonClass"), getClassName("kcButtonClass"), getClassName("kcButtonPrimaryClass"), getClassName("kcButtonLargeClass")), name: "accept", id: "kc-accept", type: "submit", value: msgStr("doAccept") }), _jsx("input", { className: clsx(getClassName("kcButtonClass"), getClassName("kcButtonDefaultClass"), getClassName("kcButtonLargeClass")), name: "cancel", id: "kc-decline", type: "submit", value: msgStr("doDecline") })] })), _jsx("div", { className: "clearfix" })] })));
|
|
20
21
|
}
|
|
21
22
|
//# sourceMappingURL=Terms.js.map
|
package/login/pages/Terms.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Terms.js","sourceRoot":"","sources":["../../src/login/pages/Terms.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAIzE,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,KAAmE;IAC7F,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAEtE,MAAM,EAAE,YAAY,EAAE,GAAG,eAAe,CAAC;QACrC,eAAe;QACf,OAAO;KACV,CAAC,CAAC;IAEH,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAE7B,wBAAwB,CAAC,eAAe,CAAC,CAAC;IAE1C,MAAM,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;IAE1B,
|
|
1
|
+
{"version":3,"file":"Terms.js","sourceRoot":"","sources":["../../src/login/pages/Terms.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAIzE,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,KAAmE;IAC7F,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAEtE,MAAM,EAAE,YAAY,EAAE,GAAG,eAAe,CAAC;QACrC,eAAe;QACf,OAAO;KACV,CAAC,CAAC;IAEH,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAE7B,wBAAwB,CAAC,eAAe,CAAC,CAAC;IAE1C,MAAM,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;IAE1B,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,CAAC;IAE3C,IAAI,YAAY,KAAK,SAAS,EAAE;QAC5B,OAAO,IAAI,CAAC;KACf;IAED,OAAO,CACH,MAAC,QAAQ,oBAAK,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,IAAE,cAAc,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,CAAC,YAAY,CAAC,iBAC7G,4BAAK,EAAE,EAAC,eAAe,gBACnB,KAAC,QAAQ,cAAE,YAAY,GAAY,IACjC,EACN,8BAAM,SAAS,EAAC,cAAc,EAAC,MAAM,EAAE,GAAG,CAAC,WAAW,EAAE,MAAM,EAAC,MAAM,iBACjE,gBACI,SAAS,EAAE,IAAI,CACX,YAAY,CAAC,eAAe,CAAC,EAC7B,YAAY,CAAC,eAAe,CAAC,EAC7B,YAAY,CAAC,eAAe,CAAC,EAC7B,YAAY,CAAC,sBAAsB,CAAC,EACpC,YAAY,CAAC,oBAAoB,CAAC,CACrC,EACD,IAAI,EAAC,QAAQ,EACb,EAAE,EAAC,WAAW,EACd,IAAI,EAAC,QAAQ,EACb,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,GAC3B,EACF,gBACI,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE,YAAY,CAAC,sBAAsB,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,CAAC,EACxH,IAAI,EAAC,QAAQ,EACb,EAAE,EAAC,YAAY,EACf,IAAI,EAAC,QAAQ,EACb,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,GAC5B,KACC,EACP,cAAK,SAAS,EAAC,UAAU,GAAG,KACrB,CACd,CAAC;AACN,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "keycloakify",
|
|
3
|
-
"version": "7.6.
|
|
3
|
+
"version": "7.6.3",
|
|
4
4
|
"description": "Create Keycloak themes using React",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -75,6 +75,7 @@
|
|
|
75
75
|
"src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl",
|
|
76
76
|
"src/bin/keycloakify/generateFtl/generateFtl.ts",
|
|
77
77
|
"src/bin/keycloakify/generateFtl/index.ts",
|
|
78
|
+
"src/bin/keycloakify/generateFtl/pageId.ts",
|
|
78
79
|
"src/bin/keycloakify/generateJavaStackFiles.ts",
|
|
79
80
|
"src/bin/keycloakify/generateKeycloakThemeResources.ts",
|
|
80
81
|
"src/bin/keycloakify/generateStartKeycloakTestingContainer.ts",
|
|
@@ -334,6 +335,9 @@
|
|
|
334
335
|
"bin/keycloakify/generateFtl/index.d.ts",
|
|
335
336
|
"bin/keycloakify/generateFtl/index.js",
|
|
336
337
|
"bin/keycloakify/generateFtl/index.js.map",
|
|
338
|
+
"bin/keycloakify/generateFtl/pageId.d.ts",
|
|
339
|
+
"bin/keycloakify/generateFtl/pageId.js",
|
|
340
|
+
"bin/keycloakify/generateFtl/pageId.js.map",
|
|
337
341
|
"bin/keycloakify/generateJavaStackFiles.d.ts",
|
|
338
342
|
"bin/keycloakify/generateJavaStackFiles.js",
|
|
339
343
|
"bin/keycloakify/generateJavaStackFiles.js.map",
|
|
@@ -7,6 +7,8 @@ import { pathBasename } from "keycloakify/tools/pathBasename";
|
|
|
7
7
|
import { mockTestingResourcesCommonPath } from "keycloakify/bin/mockTestingResourcesPath";
|
|
8
8
|
import { symToStr } from "tsafe/symToStr";
|
|
9
9
|
import { kcContextMocks, kcContextCommonMock } from "keycloakify/account/kcContext/kcContextMocks";
|
|
10
|
+
import { id } from "tsafe/id";
|
|
11
|
+
import { accountThemePageIds } from "keycloakify/bin/keycloakify/generateFtl/pageId";
|
|
10
12
|
|
|
11
13
|
export function getKcContext<KcContextExtension extends { pageId: string } = never>(params?: {
|
|
12
14
|
mockPageId?: ExtendKcContext<KcContextExtension>["pageId"];
|
|
@@ -62,7 +64,7 @@ export function getKcContext<KcContextExtension extends { pageId: string } = nev
|
|
|
62
64
|
return { "kcContext": undefined };
|
|
63
65
|
}
|
|
64
66
|
|
|
65
|
-
if (!("account" in realKcContext)) {
|
|
67
|
+
if (id<readonly string[]>(accountThemePageIds).indexOf(realKcContext.pageId) < 0 && !("account" in realKcContext)) {
|
|
66
68
|
return { "kcContext": undefined };
|
|
67
69
|
}
|
|
68
70
|
|
|
@@ -9,7 +9,7 @@ import {
|
|
|
9
9
|
type AccountThemePageId,
|
|
10
10
|
themeTypes,
|
|
11
11
|
type ThemeType
|
|
12
|
-
} from "./keycloakify/generateFtl
|
|
12
|
+
} from "./keycloakify/generateFtl";
|
|
13
13
|
import { capitalize } from "tsafe/capitalize";
|
|
14
14
|
import { readFile, writeFile } from "fs/promises";
|
|
15
15
|
import { existsSync } from "fs";
|
|
@@ -13,37 +13,6 @@ export const themeTypes = ["login", "account"] as const;
|
|
|
13
13
|
|
|
14
14
|
export type ThemeType = (typeof themeTypes)[number];
|
|
15
15
|
|
|
16
|
-
export const loginThemePageIds = [
|
|
17
|
-
"login.ftl",
|
|
18
|
-
"login-username.ftl",
|
|
19
|
-
"login-password.ftl",
|
|
20
|
-
"webauthn-authenticate.ftl",
|
|
21
|
-
"register.ftl",
|
|
22
|
-
"register-user-profile.ftl",
|
|
23
|
-
"info.ftl",
|
|
24
|
-
"error.ftl",
|
|
25
|
-
"login-reset-password.ftl",
|
|
26
|
-
"login-verify-email.ftl",
|
|
27
|
-
"terms.ftl",
|
|
28
|
-
"login-otp.ftl",
|
|
29
|
-
"login-update-profile.ftl",
|
|
30
|
-
"login-update-password.ftl",
|
|
31
|
-
"login-idp-link-confirm.ftl",
|
|
32
|
-
"login-idp-link-email.ftl",
|
|
33
|
-
"login-page-expired.ftl",
|
|
34
|
-
"login-config-totp.ftl",
|
|
35
|
-
"logout-confirm.ftl",
|
|
36
|
-
"update-user-profile.ftl",
|
|
37
|
-
"idp-review-user-profile.ftl",
|
|
38
|
-
"update-email.ftl",
|
|
39
|
-
"select-authenticator.ftl"
|
|
40
|
-
] as const;
|
|
41
|
-
|
|
42
|
-
export const accountThemePageIds = ["password.ftl", "account.ftl"] as const;
|
|
43
|
-
|
|
44
|
-
export type LoginThemePageId = (typeof loginThemePageIds)[number];
|
|
45
|
-
export type AccountThemePageId = (typeof accountThemePageIds)[number];
|
|
46
|
-
|
|
47
16
|
export type BuildOptionsLike = BuildOptionsLike.Standalone | BuildOptionsLike.ExternalAssets;
|
|
48
17
|
|
|
49
18
|
export namespace BuildOptionsLike {
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
export const loginThemePageIds = [
|
|
2
|
+
"login.ftl",
|
|
3
|
+
"login-username.ftl",
|
|
4
|
+
"login-password.ftl",
|
|
5
|
+
"webauthn-authenticate.ftl",
|
|
6
|
+
"register.ftl",
|
|
7
|
+
"register-user-profile.ftl",
|
|
8
|
+
"info.ftl",
|
|
9
|
+
"error.ftl",
|
|
10
|
+
"login-reset-password.ftl",
|
|
11
|
+
"login-verify-email.ftl",
|
|
12
|
+
"terms.ftl",
|
|
13
|
+
"login-otp.ftl",
|
|
14
|
+
"login-update-profile.ftl",
|
|
15
|
+
"login-update-password.ftl",
|
|
16
|
+
"login-idp-link-confirm.ftl",
|
|
17
|
+
"login-idp-link-email.ftl",
|
|
18
|
+
"login-page-expired.ftl",
|
|
19
|
+
"login-config-totp.ftl",
|
|
20
|
+
"logout-confirm.ftl",
|
|
21
|
+
"update-user-profile.ftl",
|
|
22
|
+
"idp-review-user-profile.ftl",
|
|
23
|
+
"update-email.ftl",
|
|
24
|
+
"select-authenticator.ftl"
|
|
25
|
+
] as const;
|
|
26
|
+
|
|
27
|
+
export const accountThemePageIds = ["password.ftl", "account.ftl"] as const;
|
|
28
|
+
|
|
29
|
+
export type LoginThemePageId = (typeof loginThemePageIds)[number];
|
|
30
|
+
export type AccountThemePageId = (typeof accountThemePageIds)[number];
|
|
@@ -11,6 +11,7 @@ import { pathJoin } from "keycloakify/bin/tools/pathJoin";
|
|
|
11
11
|
import { pathBasename } from "keycloakify/tools/pathBasename";
|
|
12
12
|
import { mockTestingResourcesCommonPath } from "keycloakify/bin/mockTestingResourcesPath";
|
|
13
13
|
import { symToStr } from "tsafe/symToStr";
|
|
14
|
+
import { loginThemePageIds } from "keycloakify/bin/keycloakify/generateFtl/pageId";
|
|
14
15
|
|
|
15
16
|
export function getKcContext<KcContextExtension extends { pageId: string } = never>(params?: {
|
|
16
17
|
mockPageId?: ExtendKcContext<KcContextExtension>["pageId"];
|
|
@@ -121,7 +122,7 @@ export function getKcContext<KcContextExtension extends { pageId: string } = nev
|
|
|
121
122
|
return { "kcContext": undefined };
|
|
122
123
|
}
|
|
123
124
|
|
|
124
|
-
if (!("login" in realKcContext)) {
|
|
125
|
+
if (id<readonly string[]>(loginThemePageIds).indexOf(realKcContext.pageId) < 0 && !("login" in realKcContext)) {
|
|
125
126
|
return { "kcContext": undefined };
|
|
126
127
|
}
|
|
127
128
|
|
|
@@ -21,13 +21,17 @@ export default function Terms(props: PageProps<Extract<KcContext, { pageId: "ter
|
|
|
21
21
|
|
|
22
22
|
const { url } = kcContext;
|
|
23
23
|
|
|
24
|
-
|
|
24
|
+
const termMarkdown = evtTermMarkdown.state;
|
|
25
|
+
|
|
26
|
+
if (termMarkdown === undefined) {
|
|
25
27
|
return null;
|
|
26
28
|
}
|
|
27
29
|
|
|
28
30
|
return (
|
|
29
31
|
<Template {...{ kcContext, i18n, doUseDefaultCss, classes }} displayMessage={false} headerNode={msg("termsTitle")}>
|
|
30
|
-
<div id="kc-terms-text">
|
|
32
|
+
<div id="kc-terms-text">
|
|
33
|
+
<Markdown>{termMarkdown}</Markdown>
|
|
34
|
+
</div>
|
|
31
35
|
<form className="form-actions" action={url.loginAction} method="POST">
|
|
32
36
|
<input
|
|
33
37
|
className={clsx(
|