From 67e3dca0c3aace1e8ae58bcbecd2b6bd4f04ee14 Mon Sep 17 00:00:00 2001
From: garronej <joseph.garrone.gj@gmail.com>
Date: Sat, 30 Jul 2022 00:51:11 +0200
Subject: [PATCH] Minor refactor (changelog ignore)

---
 .../generateKeycloakThemeResources.ts                  | 10 +++++-----
 src/bin/mockTestingResourcesPath.ts                    |  5 +++++
 src/bin/urlResourcesPath.ts                            |  5 -----
 src/lib/getKcContext/getKcContext.ts                   |  4 ++--
 src/lib/getKcContext/kcContextMocks/kcContextMocks.ts  |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 src/bin/mockTestingResourcesPath.ts
 delete mode 100644 src/bin/urlResourcesPath.ts

diff --git a/src/bin/build-keycloak-theme/generateKeycloakThemeResources.ts b/src/bin/build-keycloak-theme/generateKeycloakThemeResources.ts
index 0a149fbb..7b2acd68 100644
--- a/src/bin/build-keycloak-theme/generateKeycloakThemeResources.ts
+++ b/src/bin/build-keycloak-theme/generateKeycloakThemeResources.ts
@@ -5,7 +5,7 @@ import { replaceImportsInCssCode, replaceImportsFromStaticInJsCode } from "./rep
 import { generateFtlFilesCodeFactory, pageIds } from "./generateFtl";
 import { downloadBuiltinKeycloakTheme } from "../download-builtin-keycloak-theme";
 import * as child_process from "child_process";
-import { resourcesCommonPath, resourcesPath, subDirOfPublicDirBasename } from "../urlResourcesPath";
+import { mockTestingResourcesCommonPath, mockTestingResourcesPath, mockTestingSubDirOfPublicDirBasename } from "../mockTestingResourcesPath";
 import { isInside } from "../tools/isInside";
 
 export function generateKeycloakThemeResources(params: {
@@ -44,7 +44,7 @@ export function generateKeycloakThemeResources(params: {
             if (
                 urlOrigin === undefined &&
                 isInside({
-                    "dirPath": pathJoin(reactAppBuildDirPath, subDirOfPublicDirBasename),
+                    "dirPath": pathJoin(reactAppBuildDirPath, mockTestingSubDirOfPublicDirBasename),
                     filePath,
                 })
             ) {
@@ -137,15 +137,15 @@ export function generateKeycloakThemeResources(params: {
 
         transformCodebase({
             "srcDirPath": pathJoin(tmpDirPath, "keycloak", "common", "resources"),
-            "destDirPath": pathJoin(themeResourcesDirPath, pathBasename(resourcesCommonPath)),
+            "destDirPath": pathJoin(themeResourcesDirPath, pathBasename(mockTestingResourcesCommonPath)),
         });
 
         transformCodebase({
             "srcDirPath": themeResourcesDirPath,
-            "destDirPath": pathJoin(reactAppPublicDirPath, resourcesPath),
+            "destDirPath": pathJoin(reactAppPublicDirPath, mockTestingResourcesPath),
         });
 
-        const keycloakResourcesWithinPublicDirPath = pathJoin(reactAppPublicDirPath, subDirOfPublicDirBasename);
+        const keycloakResourcesWithinPublicDirPath = pathJoin(reactAppPublicDirPath, mockTestingSubDirOfPublicDirBasename);
 
         fs.writeFileSync(
             pathJoin(keycloakResourcesWithinPublicDirPath, "README.txt"),
diff --git a/src/bin/mockTestingResourcesPath.ts b/src/bin/mockTestingResourcesPath.ts
new file mode 100644
index 00000000..a9aaf6ef
--- /dev/null
+++ b/src/bin/mockTestingResourcesPath.ts
@@ -0,0 +1,5 @@
+import { pathJoin } from "./tools/pathJoin";
+
+export const mockTestingSubDirOfPublicDirBasename = "keycloak_static";
+export const mockTestingResourcesPath = pathJoin(mockTestingSubDirOfPublicDirBasename, "resources");
+export const mockTestingResourcesCommonPath = pathJoin(mockTestingResourcesPath, "resources_common");
diff --git a/src/bin/urlResourcesPath.ts b/src/bin/urlResourcesPath.ts
deleted file mode 100644
index f2a33128..00000000
--- a/src/bin/urlResourcesPath.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { pathJoin } from "./tools/pathJoin";
-
-export const subDirOfPublicDirBasename = "keycloak_static";
-export const resourcesPath = pathJoin(subDirOfPublicDirBasename, "resources");
-export const resourcesCommonPath = pathJoin(resourcesPath, "resources_common");
diff --git a/src/lib/getKcContext/getKcContext.ts b/src/lib/getKcContext/getKcContext.ts
index 67287659..52cdda30 100644
--- a/src/lib/getKcContext/getKcContext.ts
+++ b/src/lib/getKcContext/getKcContext.ts
@@ -9,7 +9,7 @@ import type { ExtendsKcContextBase } from "./getKcContextFromWindow";
 import { getKcContextFromWindow } from "./getKcContextFromWindow";
 import { pathJoin } from "../../bin/tools/pathJoin";
 import { pathBasename } from "../tools/pathBasename";
-import { resourcesCommonPath } from "../../bin/urlResourcesPath";
+import { mockTestingResourcesCommonPath } from "../../bin/mockTestingResourcesPath";
 
 export function getKcContext<KcContextExtended extends { pageId: string } = never>(params?: {
     mockPageId?: ExtendsKcContextBase<KcContextExtended>["pageId"];
@@ -101,7 +101,7 @@ export function getKcContext<KcContextExtended extends { pageId: string } = neve
     if (kcContext !== undefined) {
         const { url } = kcContext;
 
-        url.resourcesCommonPath = pathJoin(url.resourcesPath, pathBasename(resourcesCommonPath));
+        url.resourcesCommonPath = pathJoin(url.resourcesPath, pathBasename(mockTestingResourcesCommonPath));
     }
 
     return { kcContext };
diff --git a/src/lib/getKcContext/kcContextMocks/kcContextMocks.ts b/src/lib/getKcContext/kcContextMocks/kcContextMocks.ts
index 68116800..a387f022 100644
--- a/src/lib/getKcContext/kcContextMocks/kcContextMocks.ts
+++ b/src/lib/getKcContext/kcContextMocks/kcContextMocks.ts
@@ -1,7 +1,7 @@
 import "minimal-polyfills/Object.fromEntries";
 import type { KcContextBase, Attribute } from "../KcContextBase";
 //NOTE: Aside because we want to be able to import them from node
-import { resourcesCommonPath, resourcesPath } from "../../../bin/urlResourcesPath";
+import { mockTestingResourcesCommonPath, mockTestingResourcesPath } from "../../../bin/mockTestingResourcesPath";
 import { id } from "tsafe/id";
 import { pathJoin } from "../../../bin/tools/pathJoin";
 
@@ -10,8 +10,8 @@ const PUBLIC_URL = process.env["PUBLIC_URL"] ?? "/";
 export const kcContextCommonMock: KcContextBase.Common = {
     "url": {
         "loginAction": "#",
-        "resourcesPath": pathJoin(PUBLIC_URL, resourcesPath),
-        "resourcesCommonPath": pathJoin(PUBLIC_URL, resourcesCommonPath),
+        "resourcesPath": pathJoin(PUBLIC_URL, mockTestingResourcesPath),
+        "resourcesCommonPath": pathJoin(PUBLIC_URL, mockTestingResourcesCommonPath),
         "loginRestartFlowUrl": "/auth/realms/myrealm/login-actions/restart?client_id=account&tab_id=HoAx28ja4xg",
         "loginUrl": "/auth/realms/myrealm/login-actions/authenticate?client_id=account&tab_id=HoAx28ja4xg",
     },