keycloakify 4.4.0 → 4.5.2

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.
Files changed (33) hide show
  1. package/CHANGELOG.md +22 -0
  2. package/README.md +6 -1
  3. package/bin/KeycloakVersion.d.ts +1 -1
  4. package/bin/KeycloakVersion.js +1 -1
  5. package/bin/KeycloakVersion.js.map +1 -1
  6. package/bin/build-keycloak-theme/build-keycloak-theme.js +12 -3
  7. package/bin/build-keycloak-theme/build-keycloak-theme.js.map +1 -1
  8. package/bin/build-keycloak-theme/generateDebugFiles/generateDebugFiles.d.ts +2 -1
  9. package/bin/build-keycloak-theme/generateDebugFiles/generateDebugFiles.js.map +1 -1
  10. package/bin/build-keycloak-theme/generateDebugFiles/standalone-ha_16.1.0.xml +652 -0
  11. package/bin/build-keycloak-theme/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl +8 -0
  12. package/bin/build-keycloak-theme/generateKeycloakThemeResources.d.ts +2 -1
  13. package/bin/build-keycloak-theme/generateKeycloakThemeResources.js +5 -5
  14. package/bin/build-keycloak-theme/generateKeycloakThemeResources.js.map +1 -1
  15. package/bin/download-builtin-keycloak-theme.js +1 -1
  16. package/lib/getKcContext/getKcContext.js +9 -1
  17. package/lib/getKcContext/getKcContext.js.map +1 -1
  18. package/lib/getKcContext/kcContextMocks/urlResourcesPath.js +1 -1
  19. package/lib/getKcContext/kcContextMocks/urlResourcesPath.js.map +1 -1
  20. package/lib/tools/pathBasename.d.ts +1 -0
  21. package/lib/tools/pathBasename.js +8 -0
  22. package/lib/tools/pathBasename.js.map +1 -0
  23. package/package.json +7 -1
  24. package/src/bin/KeycloakVersion.ts +1 -1
  25. package/src/bin/build-keycloak-theme/build-keycloak-theme.ts +15 -3
  26. package/src/bin/build-keycloak-theme/generateDebugFiles/generateDebugFiles.ts +2 -1
  27. package/src/bin/build-keycloak-theme/generateDebugFiles/standalone-ha_16.1.0.xml +652 -0
  28. package/src/bin/build-keycloak-theme/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl +8 -0
  29. package/src/bin/build-keycloak-theme/generateKeycloakThemeResources.ts +10 -7
  30. package/src/bin/download-builtin-keycloak-theme.ts +1 -1
  31. package/src/lib/getKcContext/getKcContext.ts +12 -1
  32. package/src/lib/getKcContext/kcContextMocks/urlResourcesPath.ts +1 -1
  33. package/src/lib/tools/pathBasename.ts +3 -0
@@ -126,6 +126,14 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
126
126
  key == "loginAction" &&
127
127
  are_same_path(path, ["url"]) &&
128
128
  pageId == "saml-post-form.ftl"
129
+ ) || (
130
+ ["contextData", "idpConfig", "idp", "authenticationSession"]?seq_contains(key) &&
131
+ are_same_path(path, ["brokerContext"]) &&
132
+ ["login-idp-link-confirm.ftl", "login-idp-link-email.ftl" ]?seq_contains(pageId)
133
+ ) || (
134
+ key == "identityProviderBrokerCtx" &&
135
+ are_same_path(path, []) &&
136
+ ["login-idp-link-confirm.ftl", "login-idp-link-email.ftl" ]?seq_contains(pageId)
129
137
  )
130
138
  >
131
139
  <#local out_seq += ["/*If you need '" + key + "' on " + pageId + ", please submit an issue to the Keycloakify repo*/"]>
@@ -1,3 +1,4 @@
1
+ import type { KeycloakVersion } from "../KeycloakVersion";
1
2
  export declare function generateKeycloakThemeResources(params: {
2
3
  themeName: string;
3
4
  reactAppBuildDirPath: string;
@@ -6,5 +7,5 @@ export declare function generateKeycloakThemeResources(params: {
6
7
  urlOrigin: undefined | string;
7
8
  extraPagesId: string[];
8
9
  extraThemeProperties: string[];
9
- keycloakVersion: "11.0.3" | "15.0.2";
10
+ keycloakVersion: KeycloakVersion;
10
11
  }): void;
@@ -127,15 +127,15 @@ function generateKeycloakThemeResources(params) {
127
127
  });
128
128
  var reactAppPublicDirPath = (0, path_1.join)(reactAppBuildDirPath, "..", "public");
129
129
  (0, transformCodebase_1.transformCodebase)({
130
- "srcDirPath": themeResourcesDirPath,
131
- "destDirPath": (0, path_1.join)(reactAppPublicDirPath, urlResourcesPath_1.resourcesPath),
130
+ "srcDirPath": (0, path_1.join)(tmpDirPath, "keycloak", "common", "resources"),
131
+ "destDirPath": (0, path_1.join)(themeResourcesDirPath, (0, path_1.basename)(urlResourcesPath_1.resourcesCommonPath)),
132
132
  });
133
133
  (0, transformCodebase_1.transformCodebase)({
134
- "srcDirPath": (0, path_1.join)(tmpDirPath, "keycloak", "common", "resources"),
135
- "destDirPath": (0, path_1.join)(reactAppPublicDirPath, urlResourcesPath_1.resourcesCommonPath),
134
+ "srcDirPath": themeResourcesDirPath,
135
+ "destDirPath": (0, path_1.join)(reactAppPublicDirPath, urlResourcesPath_1.resourcesPath),
136
136
  });
137
137
  var keycloakResourcesWithinPublicDirPath = (0, path_1.join)(reactAppPublicDirPath, urlResourcesPath_1.subDirOfPublicDirBasename);
138
- fs.writeFileSync((0, path_1.join)(keycloakResourcesWithinPublicDirPath, "README.txt"), Buffer.from(["This is just a test folder that helps develop", "the login and register page without having to yarn build"].join(" ")));
138
+ fs.writeFileSync((0, path_1.join)(keycloakResourcesWithinPublicDirPath, "README.txt"), Buffer.from(["This is just a test folder that helps develop", "the login and register page without having to run a Keycloak container"].join(" ")));
139
139
  fs.writeFileSync((0, path_1.join)(keycloakResourcesWithinPublicDirPath, ".gitignore"), Buffer.from("*", "utf8"));
140
140
  child_process.execSync("rm -r " + tmpDirPath);
141
141
  }
@@ -1 +1 @@
1
- {"version":3,"file":"generateKeycloakThemeResources.js","sourceRoot":"","sources":["../../src/bin/build-keycloak-theme/generateKeycloakThemeResources.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generateKeycloakThemeResources.js","sourceRoot":"","sources":["../../src/bin/build-keycloak-theme/generateKeycloakThemeResources.ts"],"names":[],"mappings":"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"}
@@ -42,7 +42,7 @@ if (require.main === module) {
42
42
  var keycloakVersion = (function () {
43
43
  var keycloakVersion = process.argv[2];
44
44
  if (keycloakVersion === undefined) {
45
- return "15.0.2";
45
+ return "11.0.3";
46
46
  }
47
47
  return keycloakVersion;
48
48
  })();
@@ -43,6 +43,9 @@ var id_1 = require("tsafe/id");
43
43
  var exclude_1 = require("tsafe/exclude");
44
44
  var assert_1 = require("tsafe/assert");
45
45
  var getKcContextFromWindow_1 = require("./getKcContextFromWindow");
46
+ var pathJoin_1 = require("../tools/pathJoin");
47
+ var pathBasename_1 = require("../tools/pathBasename");
48
+ var urlResourcesPath_1 = require("./kcContextMocks/urlResourcesPath");
46
49
  function getKcContext(params) {
47
50
  var _a, _b;
48
51
  var _c = params !== null && params !== void 0 ? params : {}, mockPageId = _c.mockPageId, mockData = _c.mockData;
@@ -109,7 +112,12 @@ function getKcContext(params) {
109
112
  }
110
113
  return { kcContext: kcContext_1 };
111
114
  }
112
- return { "kcContext": (0, getKcContextFromWindow_1.getKcContextFromWindow)() };
115
+ var kcContext = (0, getKcContextFromWindow_1.getKcContextFromWindow)();
116
+ if (kcContext !== undefined) {
117
+ var url = kcContext.url;
118
+ url.resourcesCommonPath = (0, pathJoin_1.pathJoin)(url.resourcesPath, (0, pathBasename_1.pathBasename)(urlResourcesPath_1.resourcesCommonPath));
119
+ }
120
+ return { kcContext: kcContext };
113
121
  }
114
122
  exports.getKcContext = getKcContext;
115
123
  //# sourceMappingURL=getKcContext.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"getKcContext.js","sourceRoot":"","sources":["../../src/lib/getKcContext/getKcContext.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getKcContext.js","sourceRoot":"","sources":["../../src/lib/getKcContext/getKcContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mDAAuE;AAEvE,kDAAiD;AACjD,+BAA8B;AAC9B,yCAAwC;AACxC,uCAAsC;AAEtC,mEAAkE;AAClE,8CAA6C;AAC7C,sDAAqD;AACrD,sEAAwE;AAExE,SAAgB,YAAY,CAAuD,MAGlF;;IACS,IAAA,KAA2B,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,EAArC,UAAU,gBAAA,EAAE,QAAQ,cAAiB,CAAC;IAE9C,IAAI,UAAU,KAAK,SAAS,EAAE;QAC1B,2CAA2C;QAE3C,IAAM,oBAAoB,GAAG,+BAAc,CAAC,IAAI,CAAC,UAAC,EAAU;gBAAR,MAAM,YAAA;YAAO,OAAA,MAAM,KAAK,UAAU;QAArB,CAAqB,CAAC,CAAC;QAExF,IAAM,0BAA0B,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAC,UAAC,EAAU;gBAAR,MAAM,YAAA;YAAO,OAAA,MAAM,KAAK,UAAU;QAArB,CAAqB,CAAC,CAAC;QAEzF,IAAI,oBAAoB,KAAK,SAAS,IAAI,0BAA0B,KAAK,SAAS,EAAE;YAChF,OAAO,CAAC,IAAI,CACR;gBACI,iDAA+C,UAAU,qBAAkB;gBAC3E,6FAA6F;gBAC7F,6DAA6D;aAChE,CAAC,IAAI,CAAC,IAAI,CAAC,CACf,CAAC;SACL;QAED,IAAM,WAAS,GAAQ,EAAE,CAAC;QAE1B,IAAA,uBAAU,EAAC;YACP,QAAQ,EAAE,WAAS;YACnB,QAAQ,EAAE,oBAAoB,KAAK,SAAS,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,YAAG,QAAQ,EAAE,UAAU,IAAK,oCAAmB,CAAE;SACzH,CAAC,CAAC;QAEH,IAAI,0BAA0B,KAAK,SAAS,EAAE;YAC1C,IAAA,uBAAU,EAAC;gBACP,QAAQ,EAAE,WAAS;gBACnB,QAAQ,EAAE,0BAA0B;aACvC,CAAC,CAAC;YAEH,IAAI,0BAA0B,CAAC,MAAM,KAAK,2BAA2B,EAAE;gBACnE,IAAA,eAAM,EAAC,CAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,MAAM,MAAK,2BAA2B,CAAC,CAAC;gBAE7D,IAAA,UAAU,GAAK,oBAAoB,CAAC,OAAO,WAAjC,CAAkC;gBAEpD,IAAA,OAAE,EAAoC,WAAS,CAAC,CAAC,OAAO,CAAC,UAAU,GAAG,EAAE,CAAC;gBACzE,IAAA,OAAE,EAAoC,WAAS,CAAC,CAAC,OAAO,CAAC,gBAAgB,GAAG,EAAE,CAAC;gBAE/E,IAAM,mBAAiB,GAAG,yBACnB,CAAC,MAAA,MAAC,0BAA6E,CAAC,OAAO,0CAAE,UAAU,mCAAI,EAAE,CAAC,UAC/G,MAAM,CAAC,IAAA,iBAAO,EAAC,SAAS,CAAC,CAAC,CAAC;gBAE7B,UAAU,CAAC,OAAO,CAAC,UAAA,SAAS;oBACxB,IAAM,gBAAgB,GAAG,mBAAiB,CAAC,IAAI,CAAC,UAAC,EAAQ;4BAAN,IAAI,UAAA;wBAAO,OAAA,IAAI,KAAK,SAAS,CAAC,IAAI;oBAAvB,CAAuB,CAAC,CAAC;oBAEvF,IAAM,kBAAkB,GAAc,EAAS,CAAC;oBAEhD,IAAA,uBAAU,EAAC;wBACP,QAAQ,EAAE,kBAAkB;wBAC5B,QAAQ,EAAE,SAAS;qBACtB,CAAC,CAAC;oBAEH,IAAI,gBAAgB,KAAK,SAAS,EAAE;wBAChC,mBAAiB,CAAC,MAAM,CAAC,mBAAiB,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC;wBAEzE,IAAA,uBAAU,EAAC;4BACP,QAAQ,EAAE,kBAAkB;4BAC5B,QAAQ,EAAE,gBAAgB;yBAC7B,CAAC,CAAC;qBACN;oBAED,IAAA,OAAE,EAAoC,WAAS,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;oBAC7F,IAAA,OAAE,EAAoC,WAAS,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC;gBAC5H,CAAC,CAAC,CAAC;gBAEH,mBAAiB,CAAC,OAAO,CAAC,UAAA,gBAAgB;oBAC9B,IAAA,IAAI,GAAK,gBAAgB,KAArB,CAAsB;oBAElC,IAAA,eAAM,EAAC,IAAI,KAAK,SAAS,EAAE,6DAA6D,CAAC,CAAC;oBAE1F,IAAA,OAAE,EAAoC,WAAS,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAuB,CAAC,CAAC;oBAClG,IAAA,OAAE,EAAoC,WAAS,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,gBAAuB,CAAC;gBAC9G,CAAC,CAAC,CAAC;aACN;SACJ;QAED,OAAO,EAAE,SAAS,aAAA,EAAE,CAAC;KACxB;IAED,IAAM,SAAS,GAAG,IAAA,+CAAsB,GAAqB,CAAC;IAE9D,IAAI,SAAS,KAAK,SAAS,EAAE;QACjB,IAAA,GAAG,GAAK,SAAS,IAAd,CAAe;QAE1B,GAAG,CAAC,mBAAmB,GAAG,IAAA,mBAAQ,EAAC,GAAG,CAAC,aAAa,EAAE,IAAA,2BAAY,EAAC,sCAAmB,CAAC,CAAC,CAAC;KAC5F;IAED,OAAO,EAAE,SAAS,WAAA,EAAE,CAAC;AACzB,CAAC;AA9FD,oCA8FC"}
@@ -4,5 +4,5 @@ exports.resourcesCommonPath = exports.resourcesPath = exports.subDirOfPublicDirB
4
4
  var pathJoin_1 = require("../../tools/pathJoin");
5
5
  exports.subDirOfPublicDirBasename = "keycloak_static";
6
6
  exports.resourcesPath = (0, pathJoin_1.pathJoin)(exports.subDirOfPublicDirBasename, "resources");
7
- exports.resourcesCommonPath = (0, pathJoin_1.pathJoin)(exports.subDirOfPublicDirBasename, "resources_common");
7
+ exports.resourcesCommonPath = (0, pathJoin_1.pathJoin)(exports.resourcesPath, "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,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"}
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,qBAAa,EAAE,kBAAkB,CAAC,CAAC"}
@@ -0,0 +1 @@
1
+ export declare function pathBasename(path: string): string;
@@ -0,0 +1,8 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.pathBasename = void 0;
4
+ function pathBasename(path) {
5
+ return path.split("/").reverse()[0];
6
+ }
7
+ exports.pathBasename = pathBasename;
8
+ //# sourceMappingURL=pathBasename.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"pathBasename.js","sourceRoot":"","sources":["../../src/lib/tools/pathBasename.ts"],"names":[],"mappings":";;;AAAA,SAAgB,YAAY,CAAC,IAAY;IACrC,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;AACxC,CAAC;AAFD,oCAEC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "keycloakify",
3
- "version": "4.4.0",
3
+ "version": "4.5.2",
4
4
  "description": "Keycloak theme generator for Reacts app",
5
5
  "repository": {
6
6
  "type": "git",
@@ -32,6 +32,7 @@
32
32
  "src/bin/build-keycloak-theme/generateDebugFiles/index.ts",
33
33
  "src/bin/build-keycloak-theme/generateDebugFiles/standalone-ha_11.0.3.xml",
34
34
  "src/bin/build-keycloak-theme/generateDebugFiles/standalone-ha_15.0.2.xml",
35
+ "src/bin/build-keycloak-theme/generateDebugFiles/standalone-ha_16.1.0.xml",
35
36
  "src/bin/build-keycloak-theme/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl",
36
37
  "src/bin/build-keycloak-theme/generateFtl/generateFtl.ts",
37
38
  "src/bin/build-keycloak-theme/generateFtl/index.ts",
@@ -97,6 +98,7 @@
97
98
  "src/lib/tools/deepClone.ts",
98
99
  "src/lib/tools/emailRegExp.ts",
99
100
  "src/lib/tools/headInsert.ts",
101
+ "src/lib/tools/pathBasename.ts",
100
102
  "src/lib/tools/pathJoin.ts",
101
103
  "src/lib/useFormValidationSlice.tsx",
102
104
  "bin/KeycloakVersion.d.ts",
@@ -116,6 +118,7 @@
116
118
  "bin/build-keycloak-theme/generateDebugFiles/index.js.map",
117
119
  "bin/build-keycloak-theme/generateDebugFiles/standalone-ha_11.0.3.xml",
118
120
  "bin/build-keycloak-theme/generateDebugFiles/standalone-ha_15.0.2.xml",
121
+ "bin/build-keycloak-theme/generateDebugFiles/standalone-ha_16.1.0.xml",
119
122
  "bin/build-keycloak-theme/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl",
120
123
  "bin/build-keycloak-theme/generateFtl/generateFtl.d.ts",
121
124
  "bin/build-keycloak-theme/generateFtl/generateFtl.js",
@@ -309,6 +312,9 @@
309
312
  "lib/tools/headInsert.d.ts",
310
313
  "lib/tools/headInsert.js",
311
314
  "lib/tools/headInsert.js.map",
315
+ "lib/tools/pathBasename.d.ts",
316
+ "lib/tools/pathBasename.js",
317
+ "lib/tools/pathBasename.js.map",
312
318
  "lib/tools/pathJoin.d.ts",
313
319
  "lib/tools/pathJoin.js",
314
320
  "lib/tools/pathJoin.js.map",
@@ -1,3 +1,3 @@
1
- export const keycloakVersions = ["11.0.3", "15.0.2"] as const;
1
+ export const keycloakVersions = ["11.0.3", "15.0.2", "16.1.0"] as const;
2
2
 
3
3
  export type KeycloakVersion = typeof keycloakVersions[number];
@@ -4,6 +4,7 @@ import { join as pathJoin, relative as pathRelative, basename as pathBasename }
4
4
  import * as child_process from "child_process";
5
5
  import { generateDebugFiles, containerLaunchScriptBasename } from "./generateDebugFiles";
6
6
  import { URL } from "url";
7
+ import * as fs from "fs";
7
8
 
8
9
  type ParsedPackageJson = {
9
10
  name: string;
@@ -41,7 +42,17 @@ export function main() {
41
42
  const url = (() => {
42
43
  const { homepage } = parsedPackageJson;
43
44
 
44
- return homepage === undefined ? undefined : new URL(homepage);
45
+ if (homepage !== undefined) {
46
+ return new URL(homepage);
47
+ }
48
+
49
+ const cnameFilePath = pathJoin(reactProjectDirPath, "public", "CNAME");
50
+
51
+ if (fs.existsSync(cnameFilePath)) {
52
+ return new URL(`https://${fs.readFileSync(cnameFilePath).toString("utf8").replace(/\s+$/, "")}`);
53
+ }
54
+
55
+ return undefined;
45
56
  })();
46
57
 
47
58
  return {
@@ -61,7 +72,7 @@ export function main() {
61
72
  extraPagesId,
62
73
  extraThemeProperties,
63
74
  //We have to leave it at that otherwise we break our default theme.
64
- //Problem is that we can't guarantee that the the old resources common
75
+ //Problem is that we can't guarantee that the the old resources
65
76
  //will still be available on the newer keycloak version.
66
77
  "keycloakVersion": "11.0.3",
67
78
  });
@@ -80,7 +91,8 @@ export function main() {
80
91
  generateDebugFiles({
81
92
  keycloakThemeBuildingDirPath,
82
93
  themeName,
83
- "keycloakVersion": "15.0.2",
94
+ //We want, however to test in a container running the latest Keycloak version
95
+ "keycloakVersion": "16.1.0",
84
96
  });
85
97
 
86
98
  console.log(
@@ -1,10 +1,11 @@
1
1
  import * as fs from "fs";
2
2
  import { join as pathJoin, dirname as pathDirname } from "path";
3
+ import type { KeycloakVersion } from "../../KeycloakVersion";
3
4
 
4
5
  export const containerLaunchScriptBasename = "start_keycloak_testing_container.sh";
5
6
 
6
7
  /** Files for being able to run a hot reload keycloak container */
7
- export function generateDebugFiles(params: { keycloakVersion: "11.0.3" | "15.0.2"; themeName: string; keycloakThemeBuildingDirPath: string }) {
8
+ export function generateDebugFiles(params: { keycloakVersion: KeycloakVersion; themeName: string; keycloakThemeBuildingDirPath: string }) {
8
9
  const { themeName, keycloakThemeBuildingDirPath, keycloakVersion } = params;
9
10
 
10
11
  fs.writeFileSync(