keycloakify 9.2.0 → 9.3.0
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/README.md +0 -11
- package/bin/constants.d.ts +1 -0
- package/bin/constants.js +2 -1
- package/bin/constants.js.map +1 -1
- package/bin/download-builtin-keycloak-theme.js +28 -1
- package/bin/download-builtin-keycloak-theme.js.map +1 -1
- package/bin/keycloakify/BuildOptions.d.ts +1 -0
- package/bin/keycloakify/BuildOptions.js +5 -4
- package/bin/keycloakify/BuildOptions.js.map +1 -1
- package/bin/keycloakify/generateJavaStackFiles/bringInAccountV1.js +17 -4
- package/bin/keycloakify/generateJavaStackFiles/bringInAccountV1.js.map +1 -1
- package/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.d.ts +1 -0
- package/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.js +9 -2
- package/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.js.map +1 -1
- package/bin/keycloakify/generateTheme/generateTheme.d.ts +1 -0
- package/bin/keycloakify/generateTheme/generateTheme.js +17 -2
- package/bin/keycloakify/generateTheme/generateTheme.js.map +1 -1
- package/bin/promptKeycloakVersion.js +2 -0
- package/bin/promptKeycloakVersion.js.map +1 -1
- package/package.json +1 -1
- package/src/bin/constants.ts +1 -0
- package/src/bin/download-builtin-keycloak-theme.ts +45 -0
- package/src/bin/keycloakify/BuildOptions.ts +3 -1
- package/src/bin/keycloakify/generateJavaStackFiles/bringInAccountV1.ts +17 -3
- package/src/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.ts +11 -2
- package/src/bin/keycloakify/generateTheme/generateTheme.ts +30 -5
- package/src/bin/promptKeycloakVersion.ts +2 -0
package/README.md
CHANGED
|
@@ -125,17 +125,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
|
|
|
125
125
|
|
|
126
126
|
# Changelog highlights
|
|
127
127
|
|
|
128
|
-
## 9.2
|
|
129
|
-
|
|
130
|
-
Remove the `<your theme name>_retrocompat` option in the account theme dropdown and the `doBuildRetrocompatAccountTheme` build option.
|
|
131
|
-
`<your theme name>_retrocompat` was useless because `<rout theme name>` works fine even on older Keycloak version.
|
|
132
|
-
|
|
133
|
-
What you have to remember is that:
|
|
134
|
-
|
|
135
|
-
- If you have no account theme: You can use the `retrocompat_*.jar` it will work on any Keycloak version.
|
|
136
|
-
- If you have an Account theme: Use `retrocompat_*.jar` only if your Keycloak is in a version prior to 23.
|
|
137
|
-
Keycloak 22 is not supported (Only login themes works in Keycloak 22).
|
|
138
|
-
|
|
139
128
|
## 9.0
|
|
140
129
|
|
|
141
130
|
Bring back support for account themes in Keycloak v23 and up! [See issue](https://github.com/keycloakify/keycloakify/issues/389).
|
package/bin/constants.d.ts
CHANGED
|
@@ -2,5 +2,6 @@ export declare const keycloak_resources = "keycloak-resources";
|
|
|
2
2
|
export declare const resources_common = "resources-common";
|
|
3
3
|
export declare const lastKeycloakVersionWithAccountV1 = "21.1.2";
|
|
4
4
|
export declare const themeTypes: readonly ["login", "account"];
|
|
5
|
+
export declare const retrocompatPostfix = "_retrocompat";
|
|
5
6
|
export declare const accountV1 = "account-v1";
|
|
6
7
|
export type ThemeType = (typeof themeTypes)[number];
|
package/bin/constants.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.accountV1 = exports.themeTypes = exports.lastKeycloakVersionWithAccountV1 = exports.resources_common = exports.keycloak_resources = void 0;
|
|
3
|
+
exports.accountV1 = exports.retrocompatPostfix = exports.themeTypes = exports.lastKeycloakVersionWithAccountV1 = exports.resources_common = exports.keycloak_resources = void 0;
|
|
4
4
|
exports.keycloak_resources = "keycloak-resources";
|
|
5
5
|
exports.resources_common = "resources-common";
|
|
6
6
|
exports.lastKeycloakVersionWithAccountV1 = "21.1.2";
|
|
7
7
|
exports.themeTypes = ["login", "account"];
|
|
8
|
+
exports.retrocompatPostfix = "_retrocompat";
|
|
8
9
|
exports.accountV1 = "account-v1";
|
|
9
10
|
//# sourceMappingURL=constants.js.map
|
package/bin/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/bin/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,kBAAkB,GAAG,oBAAoB,CAAC;AAC1C,QAAA,gBAAgB,GAAG,kBAAkB,CAAC;AACtC,QAAA,gCAAgC,GAAG,QAAQ,CAAC;AAE5C,QAAA,UAAU,GAAG,CAAC,OAAO,EAAE,SAAS,CAAU,CAAC;AAC3C,QAAA,SAAS,GAAG,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/bin/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,kBAAkB,GAAG,oBAAoB,CAAC;AAC1C,QAAA,gBAAgB,GAAG,kBAAkB,CAAC;AACtC,QAAA,gCAAgC,GAAG,QAAQ,CAAC;AAE5C,QAAA,UAAU,GAAG,CAAC,OAAO,EAAE,SAAS,CAAU,CAAC;AAC3C,QAAA,kBAAkB,GAAG,cAAc,CAAC;AACpC,QAAA,SAAS,GAAG,YAAY,CAAC"}
|
|
@@ -89,8 +89,35 @@ function downloadBuiltinKeycloakTheme(params) {
|
|
|
89
89
|
"action": function (_a) {
|
|
90
90
|
var destDirPath = _a.destDirPath;
|
|
91
91
|
return __awaiter(_this, void 0, void 0, function () {
|
|
92
|
-
var commonResourcesDirPath, accountV2DirSrcDirPath, packageManager, packageJsonFilePath, packageJsonRaw, parsedPackageJson;
|
|
92
|
+
var accountCssFilePath, totpFtlFilePath, commonResourcesDirPath, accountV2DirSrcDirPath, packageManager, packageJsonFilePath, packageJsonRaw, parsedPackageJson;
|
|
93
93
|
return __generator(this, function (_b) {
|
|
94
|
+
fix_account_css: {
|
|
95
|
+
accountCssFilePath = (0, path_1.join)(destDirPath, "keycloak", "account", "resources", "css", "account.css");
|
|
96
|
+
if (!fs.existsSync(accountCssFilePath)) {
|
|
97
|
+
break fix_account_css;
|
|
98
|
+
}
|
|
99
|
+
fs.writeFileSync(accountCssFilePath, Buffer.from(fs.readFileSync(accountCssFilePath).toString("utf8").replace("top: -34px;", "top: -34px !important;"), "utf8"));
|
|
100
|
+
}
|
|
101
|
+
fix_account_topt: {
|
|
102
|
+
totpFtlFilePath = (0, path_1.join)(destDirPath, "base", "account", "totp.ftl");
|
|
103
|
+
if (!fs.existsSync(totpFtlFilePath)) {
|
|
104
|
+
break fix_account_topt;
|
|
105
|
+
}
|
|
106
|
+
fs.writeFileSync(totpFtlFilePath, Buffer.from(fs
|
|
107
|
+
.readFileSync(totpFtlFilePath)
|
|
108
|
+
.toString("utf8")
|
|
109
|
+
.replace([
|
|
110
|
+
" <#list totp.policy.supportedApplications as app>",
|
|
111
|
+
" <li>${app}</li>",
|
|
112
|
+
" </#list>"
|
|
113
|
+
].join("\n"), [
|
|
114
|
+
" <#if totp.policy.supportedApplications?has_content>",
|
|
115
|
+
" <#list totp.policy.supportedApplications as app>",
|
|
116
|
+
" <li>${app}</li>",
|
|
117
|
+
" </#list>",
|
|
118
|
+
" </#if>"
|
|
119
|
+
].join("\n")), "utf8"));
|
|
120
|
+
}
|
|
94
121
|
install_common_node_modules: {
|
|
95
122
|
commonResourcesDirPath = (0, path_1.join)(destDirPath, "keycloak", "common", "resources");
|
|
96
123
|
if (!fs.existsSync(commonResourcesDirPath)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download-builtin-keycloak-theme.js","sourceRoot":"","sources":["../src/bin/download-builtin-keycloak-theme.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"download-builtin-keycloak-theme.js","sourceRoot":"","sources":["../src/bin/download-builtin-keycloak-theme.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@ export type BuildOptions = {
|
|
|
18
18
|
/** If your app is hosted under a subpath, it's the case in CRA if you have "homepage": "https://example.com/my-app" in your package.json
|
|
19
19
|
* In this case the urlPathname will be "/my-app/" */
|
|
20
20
|
urlPathname: string | undefined;
|
|
21
|
+
doBuildRetrocompatAccountTheme: boolean;
|
|
21
22
|
};
|
|
22
23
|
export declare function readBuildOptions(params: {
|
|
23
24
|
reactAppRootDirPath: string;
|
|
@@ -10,7 +10,7 @@ var path_1 = require("path");
|
|
|
10
10
|
var minimist_1 = __importDefault(require("minimist"));
|
|
11
11
|
var getAbsoluteAndInOsFormatPath_1 = require("../tools/getAbsoluteAndInOsFormatPath");
|
|
12
12
|
function readBuildOptions(params) {
|
|
13
|
-
var _a, _b, _c, _d, _e;
|
|
13
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
14
14
|
var reactAppRootDirPath = params.reactAppRootDirPath, processArgv = params.processArgv;
|
|
15
15
|
var isSilentCliParamProvided = (function () {
|
|
16
16
|
var argv = (0, minimist_1.default)(processArgv);
|
|
@@ -19,8 +19,8 @@ function readBuildOptions(params) {
|
|
|
19
19
|
};
|
|
20
20
|
})().isSilentCliParamProvided;
|
|
21
21
|
var parsedPackageJson = (0, parsedPackageJson_1.getParsedPackageJson)({ reactAppRootDirPath: reactAppRootDirPath });
|
|
22
|
-
var name = parsedPackageJson.name,
|
|
23
|
-
var
|
|
22
|
+
var name = parsedPackageJson.name, _h = parsedPackageJson.keycloakify, keycloakify = _h === void 0 ? {} : _h, version = parsedPackageJson.version, homepage = parsedPackageJson.homepage;
|
|
23
|
+
var _j = keycloakify !== null && keycloakify !== void 0 ? keycloakify : {}, extraThemeProperties = _j.extraThemeProperties, groupId = _j.groupId, artifactId = _j.artifactId, doCreateJar = _j.doCreateJar, loginThemeResourcesFromKeycloakVersion = _j.loginThemeResourcesFromKeycloakVersion;
|
|
24
24
|
var themeNames = (function () {
|
|
25
25
|
if (keycloakify.themeName === undefined) {
|
|
26
26
|
return [
|
|
@@ -105,7 +105,8 @@ function readBuildOptions(params) {
|
|
|
105
105
|
}
|
|
106
106
|
var out = url.pathname.replace(/([^/])$/, "$1/");
|
|
107
107
|
return out === "/" ? undefined : out;
|
|
108
|
-
})()
|
|
108
|
+
})(),
|
|
109
|
+
"doBuildRetrocompatAccountTheme": (_g = (_f = parsedPackageJson.keycloakify) === null || _f === void 0 ? void 0 : _f.doBuildRetrocompatAccountTheme) !== null && _g !== void 0 ? _g : true
|
|
109
110
|
};
|
|
110
111
|
}
|
|
111
112
|
exports.readBuildOptions = readBuildOptions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BuildOptions.js","sourceRoot":"","sources":["../../src/bin/keycloakify/BuildOptions.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAwC;AACxC,yDAA2D;AAC3D,6BAAwC;AACxC,sDAAiC;AACjC,sFAAqF;
|
|
1
|
+
{"version":3,"file":"BuildOptions.js","sourceRoot":"","sources":["../../src/bin/keycloakify/BuildOptions.ts"],"names":[],"mappings":"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"}
|
|
@@ -128,10 +128,23 @@ function bringInAccountV1(params) {
|
|
|
128
128
|
"srcDirPath": (0, path_1.join)(builtinKeycloakThemeTmpDirPath, "base", "account"),
|
|
129
129
|
"destDirPath": accountV1DirPath
|
|
130
130
|
});
|
|
131
|
-
commonResourceFilePaths = [
|
|
131
|
+
commonResourceFilePaths = __spreadArray([
|
|
132
132
|
"node_modules/patternfly/dist/css/patternfly.min.css",
|
|
133
133
|
"node_modules/patternfly/dist/css/patternfly-additions.min.css"
|
|
134
|
-
]
|
|
134
|
+
], __read([
|
|
135
|
+
"OpenSans-Light-webfont.woff2",
|
|
136
|
+
"OpenSans-Regular-webfont.woff2",
|
|
137
|
+
"OpenSans-Bold-webfont.woff2",
|
|
138
|
+
"OpenSans-Semibold-webfont.woff2",
|
|
139
|
+
"OpenSans-Bold-webfont.woff",
|
|
140
|
+
"OpenSans-Light-webfont.woff",
|
|
141
|
+
"OpenSans-Regular-webfont.woff",
|
|
142
|
+
"OpenSans-Semibold-webfont.woff",
|
|
143
|
+
"OpenSans-Regular-webfont.ttf",
|
|
144
|
+
"OpenSans-Light-webfont.ttf",
|
|
145
|
+
"OpenSans-Semibold-webfont.ttf",
|
|
146
|
+
"OpenSans-Bold-webfont.ttf"
|
|
147
|
+
].map(function (path) { return "node_modules/patternfly/dist/fonts/".concat(path); })), false);
|
|
135
148
|
try {
|
|
136
149
|
for (_a = __values(commonResourceFilePaths.map(function (path) { return path_1.join.apply(void 0, __spreadArray([], __read(path.split("/")), false)); })), _b = _a.next(); !_b.done; _b = _a.next()) {
|
|
137
150
|
relativeFilePath = _b.value;
|
|
@@ -147,7 +160,7 @@ function bringInAccountV1(params) {
|
|
|
147
160
|
}
|
|
148
161
|
finally { if (e_1) throw e_1.error; }
|
|
149
162
|
}
|
|
150
|
-
resourceFilePaths = ["css/account.css"];
|
|
163
|
+
resourceFilePaths = ["css/account.css", "img/icon-sidebar-active.png", "img/logo.png"];
|
|
151
164
|
try {
|
|
152
165
|
for (_c = __values(resourceFilePaths.map(function (path) { return path_1.join.apply(void 0, __spreadArray([], __read(path.split("/")), false)); })), _d = _c.next(); !_d.done; _d = _c.next()) {
|
|
153
166
|
relativeFilePath = _d.value;
|
|
@@ -169,7 +182,7 @@ function bringInAccountV1(params) {
|
|
|
169
182
|
"",
|
|
170
183
|
"locales=ar,ca,cs,da,de,en,es,fr,fi,hu,it,ja,lt,nl,no,pl,pt-BR,ru,sk,sv,tr,zh-CN",
|
|
171
184
|
"",
|
|
172
|
-
"styles=" + __spreadArray(__spreadArray([], __read(resourceFilePaths), false), __read(commonResourceFilePaths.map(function (path) { return "
|
|
185
|
+
"styles=" + __spreadArray(__spreadArray([], __read(resourceFilePaths), false), __read(commonResourceFilePaths.map(function (path) { return "resources-common/".concat(path); })), false).join(" "),
|
|
173
186
|
"",
|
|
174
187
|
"##### css classes for form buttons",
|
|
175
188
|
"# main class used for all buttons",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bringInAccountV1.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateJavaStackFiles/bringInAccountV1.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAyB;AACzB,6BAAgE;AAChE,uCAAsC;AACtC,yCAAwC;AAExC,6CAAgG;AAChG,yFAAqF;AACrF,mEAAkE;AAOlE;IACI,IAAM,YAAY,GAAG,IAAA,iBAAO,GAAgB,CAAC;IAE7C,IAAA,eAAM,GAA+D,CAAC;CACzE;AAED,SAAsB,gBAAgB,CAAC,MAA0C;;;;;;;oBACrE,YAAY,GAAK,MAAM,aAAX,CAAY;oBAE1B,8BAA8B,GAAG,IAAA,WAAQ,EAAC,YAAY,CAAC,uBAAuB,EAAE,IAAI,EAAE,kCAAkC,CAAC,CAAC;oBAEhI,qBAAM,IAAA,8DAA4B,EAAC;4BAC/B,aAAa,EAAE,8BAA8B;4BAC7C,iBAAiB,EAAE,4CAAgC;4BACnD,YAAY,cAAA;yBACf,CAAC,EAAA;;oBAJF,SAIE,CAAC;oBAEG,gBAAgB,GAAG,IAAA,WAAQ,EAAC,YAAY,CAAC,uBAAuB,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,qBAAS,EAAE,SAAS,CAAC,CAAC;oBAEnI,IAAA,qCAAiB,EAAC;wBACd,YAAY,EAAE,IAAA,WAAQ,EAAC,8BAA8B,EAAE,MAAM,EAAE,SAAS,CAAC;wBACzE,aAAa,EAAE,gBAAgB;qBAClC,CAAC,CAAC;oBAEG,uBAAuB
|
|
1
|
+
{"version":3,"file":"bringInAccountV1.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateJavaStackFiles/bringInAccountV1.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export type BuildOptionsLike = {
|
|
|
6
6
|
cacheDirPath: string;
|
|
7
7
|
keycloakifyBuildDirPath: string;
|
|
8
8
|
themeNames: string[];
|
|
9
|
+
doBuildRetrocompatAccountTheme: boolean;
|
|
9
10
|
};
|
|
10
11
|
export declare function generateJavaStackFiles(params: {
|
|
11
12
|
implementedThemeTypes: Record<ThemeType | "email", boolean>;
|
|
@@ -170,7 +170,7 @@ function generateJavaStackFiles(params) {
|
|
|
170
170
|
"types": ["account"]
|
|
171
171
|
}
|
|
172
172
|
])), false), __read(buildOptions.themeNames
|
|
173
|
-
.map(function (themeName) { return [
|
|
173
|
+
.map(function (themeName) { return __spreadArray([
|
|
174
174
|
{
|
|
175
175
|
"name": themeName,
|
|
176
176
|
"types": Object.entries(implementedThemeTypes)
|
|
@@ -183,7 +183,14 @@ function generateJavaStackFiles(params) {
|
|
|
183
183
|
return themeType;
|
|
184
184
|
})
|
|
185
185
|
}
|
|
186
|
-
]
|
|
186
|
+
], __read((!implementedThemeTypes.account || !buildOptions.doBuildRetrocompatAccountTheme
|
|
187
|
+
? []
|
|
188
|
+
: [
|
|
189
|
+
{
|
|
190
|
+
"name": "".concat(themeName).concat(constants_1.retrocompatPostfix),
|
|
191
|
+
"types": ["account"]
|
|
192
|
+
}
|
|
193
|
+
])), false); })
|
|
187
194
|
.flat()), false)
|
|
188
195
|
}, null, 2), "utf8"));
|
|
189
196
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateJavaStackFiles.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAyB;AACzB,6BAAgE;AAChE,uCAAsC;AACtC,yCAAwC;AAExC,
|
|
1
|
+
{"version":3,"file":"generateJavaStackFiles.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.ts"],"names":[],"mappings":"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"}
|
|
@@ -132,8 +132,8 @@ function generateTheme(params) {
|
|
|
132
132
|
case 0:
|
|
133
133
|
themeName = params.themeName, themeSrcDirPath = params.themeSrcDirPath, keycloakifySrcDirPath = params.keycloakifySrcDirPath, buildOptions = params.buildOptions, keycloakifyVersion = params.keycloakifyVersion;
|
|
134
134
|
getThemeTypeDirPath = function (params) {
|
|
135
|
-
var themeType = params.themeType;
|
|
136
|
-
return (0, path_1.join)(buildOptions.keycloakifyBuildDirPath, "src", "main", "resources", "theme", themeName, themeType);
|
|
135
|
+
var themeType = params.themeType, _a = params.isRetrocompat, isRetrocompat = _a === void 0 ? false : _a;
|
|
136
|
+
return (0, path_1.join)(buildOptions.keycloakifyBuildDirPath, "src", "main", "resources", "theme", "".concat(themeName).concat(isRetrocompat ? constants_1.retrocompatPostfix : ""), themeType);
|
|
137
137
|
};
|
|
138
138
|
allCssGlobalsToDefine = {};
|
|
139
139
|
generateFtlFilesCode_glob = undefined;
|
|
@@ -256,6 +256,21 @@ function generateTheme(params) {
|
|
|
256
256
|
(0, assert_1.assert)(false);
|
|
257
257
|
})())
|
|
258
258
|
], __read(((_a = buildOptions.extraThemeProperties) !== null && _a !== void 0 ? _a : [])), false).join("\n\n"), "utf8"));
|
|
259
|
+
if (themeType === "account" && buildOptions.doBuildRetrocompatAccountTheme) {
|
|
260
|
+
(0, transformCodebase_1.transformCodebase)({
|
|
261
|
+
"srcDirPath": themeTypeDirPath,
|
|
262
|
+
"destDirPath": getThemeTypeDirPath({ themeType: themeType, "isRetrocompat": true }),
|
|
263
|
+
"transformSourceCode": function (_a) {
|
|
264
|
+
var filePath = _a.filePath, sourceCode = _a.sourceCode;
|
|
265
|
+
if ((0, path_1.basename)(filePath) === "theme.properties") {
|
|
266
|
+
return {
|
|
267
|
+
"modifiedSourceCode": Buffer.from(sourceCode.toString("utf8").replace("parent=".concat(constants_1.accountV1), "parent=keycloak"), "utf8")
|
|
268
|
+
};
|
|
269
|
+
}
|
|
270
|
+
return { "modifiedSourceCode": sourceCode };
|
|
271
|
+
}
|
|
272
|
+
});
|
|
273
|
+
}
|
|
259
274
|
return [2 /*return*/];
|
|
260
275
|
}
|
|
261
276
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateTheme.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateTheme/generateTheme.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAkE;AAClE,qCAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"generateTheme.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateTheme/generateTheme.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,6 +68,7 @@ exports.promptKeycloakVersion = void 0;
|
|
|
68
68
|
var getLatestsSemVersionedTag_1 = require("./tools/octokit-addons/getLatestsSemVersionedTag");
|
|
69
69
|
var rest_1 = require("@octokit/rest");
|
|
70
70
|
var cli_select_1 = __importDefault(require("cli-select"));
|
|
71
|
+
var constants_1 = require("./constants");
|
|
71
72
|
function promptKeycloakVersion() {
|
|
72
73
|
return __awaiter(this, void 0, void 0, function () {
|
|
73
74
|
var getLatestsSemVersionedTag, tags, _a, keycloakVersion;
|
|
@@ -96,6 +97,7 @@ function promptKeycloakVersion() {
|
|
|
96
97
|
}); })];
|
|
97
98
|
case 1:
|
|
98
99
|
tags = __spreadArray.apply(void 0, [__spreadArray.apply(void 0, _a.concat([__read.apply(void 0, [(_b.sent())]), false])), [
|
|
100
|
+
constants_1.lastKeycloakVersionWithAccountV1,
|
|
99
101
|
"11.0.3"
|
|
100
102
|
], false]);
|
|
101
103
|
if (process.env["GITHUB_ACTIONS"] === "true") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promptKeycloakVersion.js","sourceRoot":"","sources":["../src/bin/promptKeycloakVersion.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8FAAoG;AACpG,sCAAwC;AACxC,0DAAmC;
|
|
1
|
+
{"version":3,"file":"promptKeycloakVersion.js","sourceRoot":"","sources":["../src/bin/promptKeycloakVersion.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8FAAoG;AACpG,sCAAwC;AACxC,0DAAmC;AACnC,yCAA+D;AAE/D,SAAsB,qBAAqB;;;;;;oBAC/B,yBAAyB,GAAK,CAAC;wBAC3B,IAAA,OAAO,GAAK,CAAC;4BACjB,IAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;4BAE7C,IAAM,OAAO,GAAG,IAAI,cAAO,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;4BAE7F,OAAO,EAAE,OAAO,SAAA,EAAE,CAAC;wBACvB,CAAC,CAAC,EAAE,QANW,CAMV;wBAEG,IAAA,yBAAyB,GAAK,IAAA,4DAAgC,EAAC,EAAE,OAAO,SAAA,EAAE,CAAC,0BAAlD,CAAmD;wBAEpF,OAAO,EAAE,yBAAyB,2BAAA,EAAE,CAAC;oBACzC,CAAC,CAAC,EAAE,0BAZ6B,CAY5B;oBAEL,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;;oBAGhC,qBAAM,yBAAyB,CAAC;4BAChC,OAAO,EAAE,EAAE;4BACX,cAAc,EAAE,IAAI;4BACpB,OAAO,EAAE,UAAU;4BACnB,MAAM,EAAE,UAAU;yBACrB,CAAC,CAAC,IAAI,CAAC,UAAA,GAAG,IAAI,OAAA,GAAG,CAAC,GAAG,CAAC,UAAC,EAAO;gCAAL,GAAG,SAAA;4BAAO,OAAA,GAAG;wBAAH,CAAG,CAAC,EAAzB,CAAyB,CAAC,EAAA;;oBANvC,IAAI,6FACH,CAAC,SAKqC,CAAC;4BAC1C,4CAAgC;4BAChC,QAAQ;kCACX;oBAED,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,KAAK,MAAM,EAAE;wBAC1C,sBAAO,EAAE,iBAAiB,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAC;qBACzC;oBAEkC,qBAAM,IAAA,oBAAS,EAAS;4BACvD,QAAQ,EAAE,IAAI;yBACjB,CAAC,CAAC,KAAK,CAAC;4BACL,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;4BAExB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;wBACrB,CAAC,CAAC,EAAA;;oBANa,eAAe,GAAK,CAAA,SAMjC,CAAA,MAN4B;oBAQ9B,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;oBAE7B,sBAAO,EAAE,eAAe,iBAAA,EAAE,EAAC;;;;CAC9B;AA3CD,sDA2CC"}
|
package/package.json
CHANGED
package/src/bin/constants.ts
CHANGED
|
@@ -3,6 +3,7 @@ export const resources_common = "resources-common";
|
|
|
3
3
|
export const lastKeycloakVersionWithAccountV1 = "21.1.2";
|
|
4
4
|
|
|
5
5
|
export const themeTypes = ["login", "account"] as const;
|
|
6
|
+
export const retrocompatPostfix = "_retrocompat";
|
|
6
7
|
export const accountV1 = "account-v1";
|
|
7
8
|
|
|
8
9
|
export type ThemeType = (typeof themeTypes)[number];
|
|
@@ -27,6 +27,51 @@ export async function downloadBuiltinKeycloakTheme(params: { keycloakVersion: st
|
|
|
27
27
|
"preCacheTransform": {
|
|
28
28
|
"actionCacheId": "npm install and build",
|
|
29
29
|
"action": async ({ destDirPath }) => {
|
|
30
|
+
fix_account_css: {
|
|
31
|
+
const accountCssFilePath = pathJoin(destDirPath, "keycloak", "account", "resources", "css", "account.css");
|
|
32
|
+
|
|
33
|
+
if (!fs.existsSync(accountCssFilePath)) {
|
|
34
|
+
break fix_account_css;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
fs.writeFileSync(
|
|
38
|
+
accountCssFilePath,
|
|
39
|
+
Buffer.from(fs.readFileSync(accountCssFilePath).toString("utf8").replace("top: -34px;", "top: -34px !important;"), "utf8")
|
|
40
|
+
);
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
fix_account_topt: {
|
|
44
|
+
const totpFtlFilePath = pathJoin(destDirPath, "base", "account", "totp.ftl");
|
|
45
|
+
|
|
46
|
+
if (!fs.existsSync(totpFtlFilePath)) {
|
|
47
|
+
break fix_account_topt;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
fs.writeFileSync(
|
|
51
|
+
totpFtlFilePath,
|
|
52
|
+
Buffer.from(
|
|
53
|
+
fs
|
|
54
|
+
.readFileSync(totpFtlFilePath)
|
|
55
|
+
.toString("utf8")
|
|
56
|
+
.replace(
|
|
57
|
+
[
|
|
58
|
+
" <#list totp.policy.supportedApplications as app>",
|
|
59
|
+
" <li>${app}</li>",
|
|
60
|
+
" </#list>"
|
|
61
|
+
].join("\n"),
|
|
62
|
+
[
|
|
63
|
+
" <#if totp.policy.supportedApplications?has_content>",
|
|
64
|
+
" <#list totp.policy.supportedApplications as app>",
|
|
65
|
+
" <li>${app}</li>",
|
|
66
|
+
" </#list>",
|
|
67
|
+
" </#if>"
|
|
68
|
+
].join("\n")
|
|
69
|
+
),
|
|
70
|
+
"utf8"
|
|
71
|
+
)
|
|
72
|
+
);
|
|
73
|
+
}
|
|
74
|
+
|
|
30
75
|
install_common_node_modules: {
|
|
31
76
|
const commonResourcesDirPath = pathJoin(destDirPath, "keycloak", "common", "resources");
|
|
32
77
|
|
|
@@ -24,6 +24,7 @@ export type BuildOptions = {
|
|
|
24
24
|
/** If your app is hosted under a subpath, it's the case in CRA if you have "homepage": "https://example.com/my-app" in your package.json
|
|
25
25
|
* In this case the urlPathname will be "/my-app/" */
|
|
26
26
|
urlPathname: string | undefined;
|
|
27
|
+
doBuildRetrocompatAccountTheme: boolean;
|
|
27
28
|
};
|
|
28
29
|
|
|
29
30
|
export function readBuildOptions(params: { reactAppRootDirPath: string; processArgv: string[] }): BuildOptions {
|
|
@@ -150,6 +151,7 @@ export function readBuildOptions(params: { reactAppRootDirPath: string; processA
|
|
|
150
151
|
|
|
151
152
|
const out = url.pathname.replace(/([^/])$/, "$1/");
|
|
152
153
|
return out === "/" ? undefined : out;
|
|
153
|
-
})()
|
|
154
|
+
})(),
|
|
155
|
+
"doBuildRetrocompatAccountTheme": parsedPackageJson.keycloakify?.doBuildRetrocompatAccountTheme ?? true
|
|
154
156
|
};
|
|
155
157
|
}
|
|
@@ -38,7 +38,21 @@ export async function bringInAccountV1(params: { buildOptions: BuildOptionsLike
|
|
|
38
38
|
|
|
39
39
|
const commonResourceFilePaths = [
|
|
40
40
|
"node_modules/patternfly/dist/css/patternfly.min.css",
|
|
41
|
-
"node_modules/patternfly/dist/css/patternfly-additions.min.css"
|
|
41
|
+
"node_modules/patternfly/dist/css/patternfly-additions.min.css",
|
|
42
|
+
...[
|
|
43
|
+
"OpenSans-Light-webfont.woff2",
|
|
44
|
+
"OpenSans-Regular-webfont.woff2",
|
|
45
|
+
"OpenSans-Bold-webfont.woff2",
|
|
46
|
+
"OpenSans-Semibold-webfont.woff2",
|
|
47
|
+
"OpenSans-Bold-webfont.woff",
|
|
48
|
+
"OpenSans-Light-webfont.woff",
|
|
49
|
+
"OpenSans-Regular-webfont.woff",
|
|
50
|
+
"OpenSans-Semibold-webfont.woff",
|
|
51
|
+
"OpenSans-Regular-webfont.ttf",
|
|
52
|
+
"OpenSans-Light-webfont.ttf",
|
|
53
|
+
"OpenSans-Semibold-webfont.ttf",
|
|
54
|
+
"OpenSans-Bold-webfont.ttf"
|
|
55
|
+
].map(path => `node_modules/patternfly/dist/fonts/${path}`)
|
|
42
56
|
];
|
|
43
57
|
|
|
44
58
|
for (const relativeFilePath of commonResourceFilePaths.map(path => pathJoin(...path.split("/")))) {
|
|
@@ -49,7 +63,7 @@ export async function bringInAccountV1(params: { buildOptions: BuildOptionsLike
|
|
|
49
63
|
fs.cpSync(pathJoin(builtinKeycloakThemeTmpDirPath, "keycloak", "common", "resources", relativeFilePath), destFilePath);
|
|
50
64
|
}
|
|
51
65
|
|
|
52
|
-
const resourceFilePaths = ["css/account.css"];
|
|
66
|
+
const resourceFilePaths = ["css/account.css", "img/icon-sidebar-active.png", "img/logo.png"];
|
|
53
67
|
|
|
54
68
|
for (const relativeFilePath of resourceFilePaths.map(path => pathJoin(...path.split("/")))) {
|
|
55
69
|
const destFilePath = pathJoin(accountV1DirPath, "resources", relativeFilePath);
|
|
@@ -69,7 +83,7 @@ export async function bringInAccountV1(params: { buildOptions: BuildOptionsLike
|
|
|
69
83
|
"",
|
|
70
84
|
"locales=ar,ca,cs,da,de,en,es,fr,fi,hu,it,ja,lt,nl,no,pl,pt-BR,ru,sk,sv,tr,zh-CN",
|
|
71
85
|
"",
|
|
72
|
-
"styles=" + [...resourceFilePaths, ...commonResourceFilePaths.map(path => `
|
|
86
|
+
"styles=" + [...resourceFilePaths, ...commonResourceFilePaths.map(path => `resources-common/${path}`)].join(" "),
|
|
73
87
|
"",
|
|
74
88
|
"##### css classes for form buttons",
|
|
75
89
|
"# main class used for all buttons",
|
|
@@ -3,7 +3,7 @@ import { join as pathJoin, dirname as pathDirname } from "path";
|
|
|
3
3
|
import { assert } from "tsafe/assert";
|
|
4
4
|
import { Reflect } from "tsafe/Reflect";
|
|
5
5
|
import type { BuildOptions } from "../BuildOptions";
|
|
6
|
-
import { type ThemeType, accountV1 } from "../../constants";
|
|
6
|
+
import { type ThemeType, retrocompatPostfix, accountV1 } from "../../constants";
|
|
7
7
|
import { bringInAccountV1 } from "./bringInAccountV1";
|
|
8
8
|
|
|
9
9
|
export type BuildOptionsLike = {
|
|
@@ -13,6 +13,7 @@ export type BuildOptionsLike = {
|
|
|
13
13
|
cacheDirPath: string;
|
|
14
14
|
keycloakifyBuildDirPath: string;
|
|
15
15
|
themeNames: string[];
|
|
16
|
+
doBuildRetrocompatAccountTheme: boolean;
|
|
16
17
|
};
|
|
17
18
|
|
|
18
19
|
{
|
|
@@ -113,7 +114,15 @@ export async function generateJavaStackFiles(params: {
|
|
|
113
114
|
"types": Object.entries(implementedThemeTypes)
|
|
114
115
|
.filter(([, isImplemented]) => isImplemented)
|
|
115
116
|
.map(([themeType]) => themeType)
|
|
116
|
-
}
|
|
117
|
+
},
|
|
118
|
+
...(!implementedThemeTypes.account || !buildOptions.doBuildRetrocompatAccountTheme
|
|
119
|
+
? []
|
|
120
|
+
: [
|
|
121
|
+
{
|
|
122
|
+
"name": `${themeName}${retrocompatPostfix}`,
|
|
123
|
+
"types": ["account"]
|
|
124
|
+
}
|
|
125
|
+
])
|
|
117
126
|
])
|
|
118
127
|
.flat()
|
|
119
128
|
]
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { transformCodebase } from "../../tools/transformCodebase";
|
|
2
2
|
import * as fs from "fs";
|
|
3
|
-
import { join as pathJoin, resolve as pathResolve } from "path";
|
|
3
|
+
import { join as pathJoin, basename as pathBasename, resolve as pathResolve } from "path";
|
|
4
4
|
import { replaceImportsFromStaticInJsCode } from "../replacers/replaceImportsFromStaticInJsCode";
|
|
5
5
|
import { replaceImportsInCssCode } from "../replacers/replaceImportsInCssCode";
|
|
6
6
|
import { generateFtlFilesCodeFactory, loginThemePageIds, accountThemePageIds } from "../generateFtl";
|
|
7
|
-
import { themeTypes, type ThemeType, lastKeycloakVersionWithAccountV1, keycloak_resources, accountV1 } from "../../constants";
|
|
7
|
+
import { themeTypes, type ThemeType, lastKeycloakVersionWithAccountV1, keycloak_resources, retrocompatPostfix, accountV1 } from "../../constants";
|
|
8
8
|
import { isInside } from "../../tools/isInside";
|
|
9
9
|
import type { BuildOptions } from "../BuildOptions";
|
|
10
10
|
import { assert, type Equals } from "tsafe/assert";
|
|
@@ -22,6 +22,7 @@ export type BuildOptionsLike = {
|
|
|
22
22
|
keycloakifyBuildDirPath: string;
|
|
23
23
|
reactAppBuildDirPath: string;
|
|
24
24
|
cacheDirPath: string;
|
|
25
|
+
doBuildRetrocompatAccountTheme: boolean;
|
|
25
26
|
};
|
|
26
27
|
|
|
27
28
|
assert<BuildOptions extends BuildOptionsLike ? true : false>();
|
|
@@ -35,9 +36,17 @@ export async function generateTheme(params: {
|
|
|
35
36
|
}): Promise<void> {
|
|
36
37
|
const { themeName, themeSrcDirPath, keycloakifySrcDirPath, buildOptions, keycloakifyVersion } = params;
|
|
37
38
|
|
|
38
|
-
const getThemeTypeDirPath = (params: { themeType: ThemeType | "email" }) => {
|
|
39
|
-
const { themeType } = params;
|
|
40
|
-
return pathJoin(
|
|
39
|
+
const getThemeTypeDirPath = (params: { themeType: ThemeType | "email"; isRetrocompat?: true }) => {
|
|
40
|
+
const { themeType, isRetrocompat = false } = params;
|
|
41
|
+
return pathJoin(
|
|
42
|
+
buildOptions.keycloakifyBuildDirPath,
|
|
43
|
+
"src",
|
|
44
|
+
"main",
|
|
45
|
+
"resources",
|
|
46
|
+
"theme",
|
|
47
|
+
`${themeName}${isRetrocompat ? retrocompatPostfix : ""}`,
|
|
48
|
+
themeType
|
|
49
|
+
);
|
|
41
50
|
};
|
|
42
51
|
|
|
43
52
|
let allCssGlobalsToDefine: Record<string, string> = {};
|
|
@@ -192,6 +201,22 @@ export async function generateTheme(params: {
|
|
|
192
201
|
"utf8"
|
|
193
202
|
)
|
|
194
203
|
);
|
|
204
|
+
|
|
205
|
+
if (themeType === "account" && buildOptions.doBuildRetrocompatAccountTheme) {
|
|
206
|
+
transformCodebase({
|
|
207
|
+
"srcDirPath": themeTypeDirPath,
|
|
208
|
+
"destDirPath": getThemeTypeDirPath({ themeType, "isRetrocompat": true }),
|
|
209
|
+
"transformSourceCode": ({ filePath, sourceCode }) => {
|
|
210
|
+
if (pathBasename(filePath) === "theme.properties") {
|
|
211
|
+
return {
|
|
212
|
+
"modifiedSourceCode": Buffer.from(sourceCode.toString("utf8").replace(`parent=${accountV1}`, "parent=keycloak"), "utf8")
|
|
213
|
+
};
|
|
214
|
+
}
|
|
215
|
+
|
|
216
|
+
return { "modifiedSourceCode": sourceCode };
|
|
217
|
+
}
|
|
218
|
+
});
|
|
219
|
+
}
|
|
195
220
|
}
|
|
196
221
|
|
|
197
222
|
email: {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { getLatestsSemVersionedTagFactory } from "./tools/octokit-addons/getLatestsSemVersionedTag";
|
|
2
2
|
import { Octokit } from "@octokit/rest";
|
|
3
3
|
import cliSelect from "cli-select";
|
|
4
|
+
import { lastKeycloakVersionWithAccountV1 } from "./constants";
|
|
4
5
|
|
|
5
6
|
export async function promptKeycloakVersion() {
|
|
6
7
|
const { getLatestsSemVersionedTag } = (() => {
|
|
@@ -26,6 +27,7 @@ export async function promptKeycloakVersion() {
|
|
|
26
27
|
"owner": "keycloak",
|
|
27
28
|
"repo": "keycloak"
|
|
28
29
|
}).then(arr => arr.map(({ tag }) => tag))),
|
|
30
|
+
lastKeycloakVersionWithAccountV1,
|
|
29
31
|
"11.0.3"
|
|
30
32
|
];
|
|
31
33
|
|