From f134d115cda0d82cc668528d0c770778d69111f3 Mon Sep 17 00:00:00 2001
From: Maxime Lalo <maxime.lalo.pro@gmail.com>
Date: Wed, 10 May 2023 19:34:35 +0200
Subject: [PATCH] :bug: Fixing env variables

---
 next.config.js                  | 17 ++++++++---------
 src/front/Api/BaseApiService.ts |  1 -
 src/pages/_app.tsx              | 33 +++++++++++++++++----------------
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/next.config.js b/next.config.js
index 898d4a52..4a45c7f6 100644
--- a/next.config.js
+++ b/next.config.js
@@ -4,15 +4,14 @@ const nextConfig = {
 	reactStrictMode: false,
 	publicRuntimeConfig: {
 		// Will be available on both server and client
-		BACK_API_PROTOCOL: process.env.BACK_API_PROTOCOL,
-		BACK_API_HOST: process.env.BACK_API_HOST,
-		BACK_API_PORT: process.env.BACK_API_PORT,
-		BACK_API_ROOT_URL: process.env.BACK_API_ROOT_URL,
-		BACK_API_VERSION: process.env.BACK_API_VERSION,
-		FRONT_APP_HOST: process.env.FRONT_APP_HOST,
-		FRONT_APP_PORT: process.env.FRONT_APP_PORT,
-    IDNOT_AUTHORIZE_ENDPOINT: process.env.IDNOT_AUTHORIZE_ENDPOINT,
-    IDNOT_CLIENT_ID: process.env.IDNOT_CLIENT_ID,
+		BACK_API_PROTOCOL: process.env.NEXT_PUBLIC_BACK_API_PROTOCOL,
+		BACK_API_HOST: process.env.NEXT_PUBLIC_BACK_API_HOST,
+		BACK_API_ROOT_URL: process.env.NEXT_PUBLIC_BACK_API_ROOT_URL,
+		BACK_API_VERSION: process.env.NEXT_PUBLIC_BACK_API_VERSION,
+		FRONT_APP_HOST: process.env.NEXT_PUBLIC_FRONT_APP_HOST,
+		FRONT_APP_PORT: process.env.NEXT_PUBLIC_FRONT_APP_PORT,
+		IDNOT_AUTHORIZE_ENDPOINT: process.env.NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT,
+		IDNOT_CLIENT_ID: process.env.NEXT_PUBLIC_IDNOT_CLIENT_ID,
 	},
 };
 
diff --git a/src/front/Api/BaseApiService.ts b/src/front/Api/BaseApiService.ts
index f3786452..2992b609 100644
--- a/src/front/Api/BaseApiService.ts
+++ b/src/front/Api/BaseApiService.ts
@@ -17,7 +17,6 @@ export default abstract class BaseApiService {
 	}
 
 	protected getBaseUrl() {
-		console.log("BaseApiService.baseUrl >>> ", BaseApiService.baseUrl);
 		return BaseApiService.baseUrl;
 	}
 
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index be5cf63c..4e9c36fe 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -36,28 +36,29 @@ const MyApp = (({
 }: AppPropsWithLayout) => {
 	const getLayout = Component.getLayout ?? ((page) => <DefaultLayout children={page}></DefaultLayout>);
 
-	FrontendVariables.getInstance().BACK_API_PROTOCOL = backApiProtocol;
-	FrontendVariables.getInstance().BACK_API_HOST = backApiHost;
-	FrontendVariables.getInstance().BACK_API_ROOT_URL = backApiRootUrl;
-	FrontendVariables.getInstance().BACK_API_VERSION = backApiVersion;
-	FrontendVariables.getInstance().FRONT_APP_HOST = frontAppHost;
-	FrontendVariables.getInstance().FRONT_APP_PORT = frontAppPort;
-	FrontendVariables.getInstance().IDNOT_AUTHORIZE_ENDPOINT = idNotAuthorizeEndpoint;
-	FrontendVariables.getInstance().IDNOT_CLIENT_ID = idNotClientId;
+	const instance = FrontendVariables.getInstance();
+	instance.BACK_API_PROTOCOL = backApiProtocol;
+	instance.BACK_API_HOST = backApiHost;
+	instance.BACK_API_ROOT_URL = backApiRootUrl;
+	instance.BACK_API_VERSION = backApiVersion;
+	instance.FRONT_APP_HOST = frontAppHost;
+	instance.FRONT_APP_PORT = frontAppPort;
+	instance.IDNOT_AUTHORIZE_ENDPOINT = idNotAuthorizeEndpoint;
+	instance.IDNOT_CLIENT_ID = idNotClientId;
 
 	return getLayout(<Component {...pageProps} />);
 }) as AppType;
 
 MyApp.getInitialProps = async () => {
 	return {
-		backApiProtocol: process.env["BACK_API_PROTOCOL"],
-		backApiHost: process.env["BACK_API_HOST"],
-		backApiRootUrl: process.env["BACK_API_ROOT_URL"],
-		backApiVersion: process.env["BACK_API_VERSION"],
-		frontAppHost: process.env["FRONT_APP_HOST"],
-		frontAppPort: process.env["FRONT_APP_PORT"],
-		idNotAuthorizeEndpoint: process.env["IDNOT_AUTHORIZE_ENDPOINT"],
-		idNotClientId: process.env["IDNOT_CLIENT_ID"],
+		backApiProtocol: process.env["NEXT_PUBLIC_BACK_API_PROTOCOL"],
+		backApiHost: process.env["NEXT_PUBLIC_BACK_API_HOST"],
+		backApiRootUrl: process.env["NEXT_PUBLIC_BACK_API_ROOT_URL"],
+		backApiVersion: process.env["NEXT_PUBLIC_BACK_API_VERSION"],
+		frontAppHost: process.env["NEXT_PUBLIC_FRONT_APP_HOST"],
+		frontAppPort: process.env["NEXT_PUBLIC_FRONT_APP_PORT"],
+		idNotAuthorizeEndpoint: process.env["NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT"],
+		idNotClientId: process.env["NEXT_PUBLIC_IDNOT_CLIENT_ID"],
 	};
 };