keycloakify 9.1.11 → 9.2.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 +11 -0
- package/bin/constants.d.ts +0 -1
- package/bin/constants.js +1 -2
- package/bin/constants.js.map +1 -1
- package/bin/keycloakify/BuildOptions.d.ts +0 -1
- package/bin/keycloakify/BuildOptions.js +4 -5
- package/bin/keycloakify/BuildOptions.js.map +1 -1
- package/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.js +2 -9
- package/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.js.map +1 -1
- package/bin/keycloakify/generateTheme/generateTheme.d.ts +0 -1
- package/bin/keycloakify/generateTheme/generateTheme.js +2 -17
- package/bin/keycloakify/generateTheme/generateTheme.js.map +1 -1
- package/bin/keycloakify/keycloakify.js +1 -1
- package/package.json +1 -1
- package/src/bin/constants.ts +0 -1
- package/src/bin/keycloakify/BuildOptions.ts +1 -3
- package/src/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.ts +2 -10
- package/src/bin/keycloakify/generateTheme/generateTheme.ts +5 -30
- package/src/bin/keycloakify/keycloakify.ts +1 -1
package/README.md
CHANGED
|
@@ -125,6 +125,17 @@ 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
|
+
|
|
128
139
|
## 9.0
|
|
129
140
|
|
|
130
141
|
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,6 +2,5 @@ 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";
|
|
6
5
|
export declare const accountV1 = "account-v1";
|
|
7
6
|
export type ThemeType = (typeof themeTypes)[number];
|
package/bin/constants.js
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.accountV1 = exports.
|
|
3
|
+
exports.accountV1 = 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";
|
|
9
8
|
exports.accountV1 = "account-v1";
|
|
10
9
|
//# 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,
|
|
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"}
|
|
@@ -18,7 +18,6 @@ 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;
|
|
22
21
|
};
|
|
23
22
|
export declare function readBuildOptions(params: {
|
|
24
23
|
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;
|
|
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, _f = parsedPackageJson.keycloakify, keycloakify = _f === void 0 ? {} : _f, version = parsedPackageJson.version, homepage = parsedPackageJson.homepage;
|
|
23
|
+
var _g = keycloakify !== null && keycloakify !== void 0 ? keycloakify : {}, extraThemeProperties = _g.extraThemeProperties, groupId = _g.groupId, artifactId = _g.artifactId, doCreateJar = _g.doCreateJar, loginThemeResourcesFromKeycloakVersion = _g.loginThemeResourcesFromKeycloakVersion;
|
|
24
24
|
var themeNames = (function () {
|
|
25
25
|
if (keycloakify.themeName === undefined) {
|
|
26
26
|
return [
|
|
@@ -105,8 +105,7 @@ function readBuildOptions(params) {
|
|
|
105
105
|
}
|
|
106
106
|
var out = url.pathname.replace(/([^/])$/, "$1/");
|
|
107
107
|
return out === "/" ? undefined : out;
|
|
108
|
-
})()
|
|
109
|
-
"doBuildRetrocompatAccountTheme": (_g = (_f = parsedPackageJson.keycloakify) === null || _f === void 0 ? void 0 : _f.doBuildRetrocompatAccountTheme) !== null && _g !== void 0 ? _g : true
|
|
108
|
+
})()
|
|
110
109
|
};
|
|
111
110
|
}
|
|
112
111
|
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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"}
|
|
@@ -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 [
|
|
174
174
|
{
|
|
175
175
|
"name": themeName,
|
|
176
176
|
"types": Object.entries(implementedThemeTypes)
|
|
@@ -183,14 +183,7 @@ function generateJavaStackFiles(params) {
|
|
|
183
183
|
return themeType;
|
|
184
184
|
})
|
|
185
185
|
}
|
|
186
|
-
]
|
|
187
|
-
? []
|
|
188
|
-
: [
|
|
189
|
-
{
|
|
190
|
-
"name": "".concat(themeName).concat(constants_1.retrocompatPostfix),
|
|
191
|
-
"types": ["account"]
|
|
192
|
-
}
|
|
193
|
-
])), false); })
|
|
186
|
+
]; })
|
|
194
187
|
.flat()), false)
|
|
195
188
|
}, null, 2), "utf8"));
|
|
196
189
|
}
|
|
@@ -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",
|
|
135
|
+
var themeType = params.themeType;
|
|
136
|
+
return (0, path_1.join)(buildOptions.keycloakifyBuildDirPath, "src", "main", "resources", "theme", themeName, themeType);
|
|
137
137
|
};
|
|
138
138
|
allCssGlobalsToDefine = {};
|
|
139
139
|
generateFtlFilesCode_glob = undefined;
|
|
@@ -256,21 +256,6 @@ 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
|
-
}
|
|
274
259
|
return [2 /*return*/];
|
|
275
260
|
}
|
|
276
261
|
});
|
|
@@ -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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"}
|
|
@@ -197,7 +197,7 @@ function main() {
|
|
|
197
197
|
fs.renameSync((0, path_1.join)(jarDirPath, "original-" + (0, path_1.basename)(jarFilePath)), retrocompatJarFilePath);
|
|
198
198
|
fs.writeFileSync((0, path_1.join)(jarDirPath, "README.md"), Buffer.from([
|
|
199
199
|
"- The ".concat(jarFilePath, " is to be used in Keycloak 23 and up. "),
|
|
200
|
-
"- The ".concat(retrocompatJarFilePath, " is to be used in Keycloak
|
|
200
|
+
"- The ".concat(retrocompatJarFilePath, " is to be used in Keycloak 22 and below."),
|
|
201
201
|
" Note that Keycloak 22 is only supported for login and email theme but not for account themes. "
|
|
202
202
|
].join("\n"), "utf8"));
|
|
203
203
|
}
|
package/package.json
CHANGED
package/src/bin/constants.ts
CHANGED
|
@@ -3,7 +3,6 @@ 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";
|
|
7
6
|
export const accountV1 = "account-v1";
|
|
8
7
|
|
|
9
8
|
export type ThemeType = (typeof themeTypes)[number];
|
|
@@ -24,7 +24,6 @@ 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;
|
|
28
27
|
};
|
|
29
28
|
|
|
30
29
|
export function readBuildOptions(params: { reactAppRootDirPath: string; processArgv: string[] }): BuildOptions {
|
|
@@ -151,7 +150,6 @@ export function readBuildOptions(params: { reactAppRootDirPath: string; processA
|
|
|
151
150
|
|
|
152
151
|
const out = url.pathname.replace(/([^/])$/, "$1/");
|
|
153
152
|
return out === "/" ? undefined : out;
|
|
154
|
-
})()
|
|
155
|
-
"doBuildRetrocompatAccountTheme": parsedPackageJson.keycloakify?.doBuildRetrocompatAccountTheme ?? true
|
|
153
|
+
})()
|
|
156
154
|
};
|
|
157
155
|
}
|
|
@@ -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,
|
|
6
|
+
import { type ThemeType, accountV1 } from "../../constants";
|
|
7
7
|
import { bringInAccountV1 } from "./bringInAccountV1";
|
|
8
8
|
|
|
9
9
|
export type BuildOptionsLike = {
|
|
@@ -113,15 +113,7 @@ export async function generateJavaStackFiles(params: {
|
|
|
113
113
|
"types": Object.entries(implementedThemeTypes)
|
|
114
114
|
.filter(([, isImplemented]) => isImplemented)
|
|
115
115
|
.map(([themeType]) => themeType)
|
|
116
|
-
}
|
|
117
|
-
...(!implementedThemeTypes.account
|
|
118
|
-
? []
|
|
119
|
-
: [
|
|
120
|
-
{
|
|
121
|
-
"name": `${themeName}${retrocompatPostfix}`,
|
|
122
|
-
"types": ["account"]
|
|
123
|
-
}
|
|
124
|
-
])
|
|
116
|
+
}
|
|
125
117
|
])
|
|
126
118
|
.flat()
|
|
127
119
|
]
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { transformCodebase } from "../../tools/transformCodebase";
|
|
2
2
|
import * as fs from "fs";
|
|
3
|
-
import { join as pathJoin,
|
|
3
|
+
import { join as pathJoin, 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,
|
|
7
|
+
import { themeTypes, type ThemeType, lastKeycloakVersionWithAccountV1, keycloak_resources, 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,7 +22,6 @@ export type BuildOptionsLike = {
|
|
|
22
22
|
keycloakifyBuildDirPath: string;
|
|
23
23
|
reactAppBuildDirPath: string;
|
|
24
24
|
cacheDirPath: string;
|
|
25
|
-
doBuildRetrocompatAccountTheme: boolean;
|
|
26
25
|
};
|
|
27
26
|
|
|
28
27
|
assert<BuildOptions extends BuildOptionsLike ? true : false>();
|
|
@@ -36,17 +35,9 @@ export async function generateTheme(params: {
|
|
|
36
35
|
}): Promise<void> {
|
|
37
36
|
const { themeName, themeSrcDirPath, keycloakifySrcDirPath, buildOptions, keycloakifyVersion } = params;
|
|
38
37
|
|
|
39
|
-
const getThemeTypeDirPath = (params: { themeType: ThemeType | "email"
|
|
40
|
-
const { themeType
|
|
41
|
-
return pathJoin(
|
|
42
|
-
buildOptions.keycloakifyBuildDirPath,
|
|
43
|
-
"src",
|
|
44
|
-
"main",
|
|
45
|
-
"resources",
|
|
46
|
-
"theme",
|
|
47
|
-
`${themeName}${isRetrocompat ? retrocompatPostfix : ""}`,
|
|
48
|
-
themeType
|
|
49
|
-
);
|
|
38
|
+
const getThemeTypeDirPath = (params: { themeType: ThemeType | "email" }) => {
|
|
39
|
+
const { themeType } = params;
|
|
40
|
+
return pathJoin(buildOptions.keycloakifyBuildDirPath, "src", "main", "resources", "theme", themeName, themeType);
|
|
50
41
|
};
|
|
51
42
|
|
|
52
43
|
let allCssGlobalsToDefine: Record<string, string> = {};
|
|
@@ -201,22 +192,6 @@ export async function generateTheme(params: {
|
|
|
201
192
|
"utf8"
|
|
202
193
|
)
|
|
203
194
|
);
|
|
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
|
-
}
|
|
220
195
|
}
|
|
221
196
|
|
|
222
197
|
email: {
|
|
@@ -75,7 +75,7 @@ export async function main() {
|
|
|
75
75
|
Buffer.from(
|
|
76
76
|
[
|
|
77
77
|
`- The ${jarFilePath} is to be used in Keycloak 23 and up. `,
|
|
78
|
-
`- The ${retrocompatJarFilePath} is to be used in Keycloak
|
|
78
|
+
`- The ${retrocompatJarFilePath} is to be used in Keycloak 22 and below.`,
|
|
79
79
|
` Note that Keycloak 22 is only supported for login and email theme but not for account themes. `
|
|
80
80
|
].join("\n"),
|
|
81
81
|
"utf8"
|