Refactor configuration API to use CONFIG_PATH instead of ENV_CONFIG

hpi-schul-cloud · Oct 22, 2024 · f24b618 · f24b618
1 parent 74ac4e9
commit f24b618
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/ansible/roles/tldraw-client-core/templates/tldraw-client-configmap.yml.j2 b/ansible/roles/tldraw-client-core/templates/tldraw-client-configmap.yml.j2
@@ -9,4 +9,4 @@ data:
     NODE_ENV: "production"
     TZ: "Europe/Berlin"
     PORT: "3046"
-    ENV_CONFIG:  "{{ '/api/tldraw/config/public' if WITH_TLDRAW2 else '/api/v3/config/public' }}"
+    CONFIG_PATH:  "{{ '/api/tldraw/config/public' if WITH_TLDRAW2 else '/api/v3/config/public' }}"
diff --git a/nginx.conf.template b/nginx.conf.template
@@ -5,7 +5,7 @@ server {
     set $csp "default-src 'self'; connect-src 'self' data:; base-uri 'self'; script-src 'nonce-$request_id' 'strict-dynamic' https:; object-src 'none'; font-src 'self' data:; img-src 'self' data:; style-src 'self' 'unsafe-inline';";
 
     location /tldraw-client-runtime.config.json {
-        return 200 '{ "ENV_CONFIG": "${ENV_CONFIG}" }';
+        return 200 '{ "CONFIG_PATH": "${CONFIG_PATH}" }';
         add_header Content-Type application/json;
     }
 

diff --git a/src/configuration/api/api.configuration.ts b/src/configuration/api/api.configuration.ts
@@ -1,15 +1,15 @@
 // remove this code by BC-7906
-// set ENV_CONFIG to /api/tldraw/config/public
+// set CONFIG_PATH to /api/tldraw/config/public
 // remove line 7 and 8 in ngnix.conf.template
 import { HttpStatusCode } from "../../types/StatusCodeEnums";
 import { setErrorData } from "../../utils/errorData";
 import { redirectToErrorPage } from "../../utils/redirectUtils";
 
 const getConfigOptions = async (): Promise<{
-  ENV_CONFIG: string;
+  CONFIG_PATH: string;
 }> => {
   const connectionOptions = {
-    ENV_CONFIG: configApiUrl(),
+    CONFIG_PATH: configApiUrl(),
   };
 
   if (import.meta.env.PROD) {
@@ -20,8 +20,8 @@ const getConfigOptions = async (): Promise<{
         throw new Error(`${response.status} - ${response.statusText}`);
       }
 
-      const data: { ENV_CONFIG: string } = await response.json();
-      connectionOptions.ENV_CONFIG = data.ENV_CONFIG;
+      const data: { CONFIG_PATH: string } = await response.json();
+      connectionOptions.CONFIG_PATH = data.CONFIG_PATH;
     } catch (error) {
       setErrorData(HttpStatusCode.InternalServerError, "error.500");
       redirectToErrorPage();
@@ -45,5 +45,5 @@ export const API = {
   FILE_RESTORE: "/api/v3/file/restore/FILERECORD_ID",
   LOGIN_REDIRECT: "/login?redirect=/tldraw?parentId=PARENTID",
   USER_DATA: `/api/v3/user/me`,
-  ENV_CONFIG: await getConfigOptions().then((options) => options.ENV_CONFIG),
+  CONFIG_PATH: await getConfigOptions().then((options) => options.CONFIG_PATH),
 };
diff --git a/src/utils/envConfig.ts b/src/utils/envConfig.ts
@@ -12,7 +12,7 @@ import { redirectToErrorPage } from "./redirectUtils";
 export const getEnvs = async (): Promise<Envs> => {
   try {
     // TODO: check order..
-    const response = await fetch(API.ENV_CONFIG);
+    const response = await fetch(API.CONFIG_PATH);
     HttpGuard.checkStatusOk(response);
     const responseData = await response.json();