fix: env variable prod (#89)

* chore: fix reading env variable

* bumb: version to 2.1.3

.gitignore

@@ -39,4 +39,4 @@ dist-ssr
 *.local
 
 # Temporary env files
-env-config.js
+/env-config.js

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
+echo "}" >> ./env-config.js

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.

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",

public/env-config.js

@@ -0,0 +1 @@
+if (!window._env_) window._env_ = {};

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,

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]);
 

src/core/utils/configuration/index.ts

@@ -1,2 +1 @@
 export { getEnvVar } from "./env";
-export { getConfiguration } from "./get-configuration";

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: {