From 072e88114a976db739751176c54dfbe5235f006e Mon Sep 17 00:00:00 2001
From: Laurent Caouissin <38245508+laurentC35@users.noreply.github.com>
Date: Mon, 26 Feb 2024 11:01:36 +0100
Subject: [PATCH] fix: env variable prod (#89)

* chore: fix reading env variable

* bumb: version to 2.1.3
---
 .gitignore                                        |  2 +-
 container/env.sh                                  |  4 +---
 index.html                                        |  1 +
 package.json                                      |  2 +-
 public/configuration.json                         |  1 -
 public/env-config.js                              |  1 +
 src/core/application/auth/provider/component.tsx  |  9 +++------
 src/core/infrastructure/hooks/useAuth.ts          |  5 ++---
 src/core/utils/configuration/get-configuration.ts |  5 -----
 src/core/utils/configuration/index.ts             |  1 -
 src/ui/index.tsx                                  | 15 ---------------
 11 files changed, 10 insertions(+), 36 deletions(-)
 delete mode 100644 public/configuration.json
 create mode 100644 public/env-config.js
 delete mode 100644 src/core/utils/configuration/get-configuration.ts

diff --git a/.gitignore b/.gitignore
index 2f90d2f..0df5249 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,4 +39,4 @@ dist-ssr
 *.local
 
 # Temporary env files
-env-config.js
+/env-config.js
diff --git a/container/env.sh b/container/env.sh
index 48a4c33..5bc3eb1 100644
--- a/container/env.sh
+++ b/container/env.sh
@@ -26,6 +26,4 @@ do
   echo "  $varname: \"$value\"," >> ./env-config.js
 done < .env
 
-echo "}" >> ./env-config.js
-
-sed -i.bak 's~<body[^>]*>~&<script src="/env-config.js"></script>~' ./index.html
\ No newline at end of file
+echo "}" >> ./env-config.js
\ No newline at end of file
diff --git a/index.html b/index.html
index d481eb0..7d9a122 100644
--- a/index.html
+++ b/index.html
@@ -12,6 +12,7 @@
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
     <link rel="manifest" href="/manifest.json" />
+    <script src="/env-config.js"></script>
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
diff --git a/package.json b/package.json
index f2484dd..b300f28 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "public-enemy",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "Check and test questionnaire models",
   "repository": {
     "type": "git",
diff --git a/public/configuration.json b/public/configuration.json
deleted file mode 100644
index 0967ef4..0000000
--- a/public/configuration.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/public/env-config.js b/public/env-config.js
new file mode 100644
index 0000000..d31acf5
--- /dev/null
+++ b/public/env-config.js
@@ -0,0 +1 @@
+if (!window._env_) window._env_ = {};
diff --git a/src/core/application/auth/provider/component.tsx b/src/core/application/auth/provider/component.tsx
index db0f54d..efc5b38 100644
--- a/src/core/application/auth/provider/component.tsx
+++ b/src/core/application/auth/provider/component.tsx
@@ -2,12 +2,9 @@ import { getEnvVar } from "core/utils/configuration";
 import { createOidcProvider } from "oidc-spa/react";
 import React from "react";
 
-export enum AuthType {
-  OIDC = "oidc",
-  NONE = "none",
-}
+export type AuthType = "oidc" | "none";
 
-export const authType = getEnvVar("VITE_AUTH_TYPE");
+export const authType = getEnvVar("VITE_AUTH_TYPE") as AuthType;
 export const oidcConf = {
   authUrl: getEnvVar("VITE_AUTH_URL"),
   realm: getEnvVar("VITE_REALM"),
@@ -35,7 +32,7 @@ const { authUrl, realm, client_id } = oidcConf;
 export const AuthContext = React.createContext(dummyOidcClient);
 
 export function AuthProvider({ children }: { children: React.ReactNode }) {
-  if (authType === AuthType.OIDC) {
+  if (authType === "oidc") {
     const { OidcProvider } = createOidcProvider({
       issuerUri: `${authUrl}/realms/${realm}`,
       clientId: client_id,
diff --git a/src/core/infrastructure/hooks/useAuth.ts b/src/core/infrastructure/hooks/useAuth.ts
index 531e4a9..98b76d4 100644
--- a/src/core/infrastructure/hooks/useAuth.ts
+++ b/src/core/infrastructure/hooks/useAuth.ts
@@ -1,6 +1,5 @@
 import {
   AuthContext,
-  AuthType,
   authType,
 } from "core/application/auth/provider/component";
 import { createUseOidc } from "oidc-spa/react";
@@ -9,7 +8,7 @@ import { useContext, useMemo } from "react";
 export const { useOidc } = createUseOidc();
 
 export const useAuth = () => {
-  if (authType === AuthType.OIDC) {
+  if (authType === "oidc") {
     const oidc = useOidc();
     return { oidc };
   } else {
@@ -28,7 +27,7 @@ export const useUser = () => {
   const { decodedIdToken } = oidc.oidcTokens;
 
   const user = useMemo(() => {
-    if (authType === AuthType.OIDC) return decodedIdToken;
+    if (authType === "oidc") return decodedIdToken;
     return { preferred_username: null, sub: "", timbre: "", name: "Fake User" };
   }, [decodedIdToken]);
 
diff --git a/src/core/utils/configuration/get-configuration.ts b/src/core/utils/configuration/get-configuration.ts
deleted file mode 100644
index 0b877df..0000000
--- a/src/core/utils/configuration/get-configuration.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-const basePath = `${window.location.origin}`;
-
-const getFile = (url: string) => fetch(url).then((r) => r.json());
-
-export const getConfiguration = () => getFile(`${basePath}/configuration.json`);
diff --git a/src/core/utils/configuration/index.ts b/src/core/utils/configuration/index.ts
index 87330c5..bc0a782 100644
--- a/src/core/utils/configuration/index.ts
+++ b/src/core/utils/configuration/index.ts
@@ -1,2 +1 @@
 export { getEnvVar } from "./env";
-export { getConfiguration } from "./get-configuration";
diff --git a/src/ui/index.tsx b/src/ui/index.tsx
index 5105261..8b37353 100644
--- a/src/ui/index.tsx
+++ b/src/ui/index.tsx
@@ -7,7 +7,6 @@ import { CssBaseline } from "@mui/material";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { AuthProvider } from "core/application/auth/provider/component";
 import { LocaleType, getMessages } from "core/i18n/messages";
-import { getConfiguration } from "core/utils/configuration";
 import { getEnvVar } from "core/utils/configuration/env";
 import { SnackbarProvider } from "notistack";
 import React from "react";
@@ -17,20 +16,6 @@ import reportWebVitals from "../reportWebVitals";
 import { Application } from "./root/Application";
 import { appTheme } from "./theme";
 
-/* /!\ used in production mode where env config is used after build time
-       should not be used in docker environment 
-*/
-await getConfiguration()
-  .then((conf) => {
-    if (Object.keys(conf).length) {
-      console.log("plop");
-      window._env_ = conf;
-    }
-  })
-  .catch((e) => {
-    console.log(e);
-  });
-
 const queryClient = new QueryClient({
   defaultOptions: {
     queries: {