From 40831d9c0de919e86c6050a771bec143796fbdd8 Mon Sep 17 00:00:00 2001 From: OxSaitama Date: Fri, 27 Oct 2023 10:39:07 +0200 Subject: [PATCH] refacto env config --- src/pages/_app.tsx | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index f980e28f..46c35112 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -4,6 +4,7 @@ import "@Front/index.scss"; import type { NextPage } from "next"; import type { AppType, AppProps } from "next/app"; import type { ReactElement, ReactNode } from "react"; +import getConfig from 'next/config' export type NextPageWithLayout, TInitialProps = TProps> = NextPage & { getLayout?: (page: ReactElement) => ReactNode; @@ -25,6 +26,8 @@ type AppPropsWithLayout = AppProps & { docaposteApiUrl: string; }; +const { publicRuntimeConfig } = getConfig(); + const MyApp = (({ Component, pageProps, @@ -60,18 +63,18 @@ const MyApp = (({ MyApp.getInitialProps = async () => { return { - 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"], - idNotBaseUrl: process.env["NEXT_PUBLIC_IDNOT_BASE_URL"], - idNotAuthorizeEndpoint: process.env["NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT"], - idNotClientId: process.env["NEXT_PUBLIC_IDNOT_CLIENT_ID"], - fcAuthorizeEndpoint: process.env["NEXT_PUBLIC_FC_AUTHORIZE_ENDPOINT"], - fcClientId: process.env["NEXT_PUBLIC_FC_CLIENT_ID"], - docaposteApiUrl: process.env["NEXT_PUBLIC_DOCAPOST_API_URL"], + backApiProtocol: publicRuntimeConfig.NEXT_PUBLIC_BACK_API_PROTOCOL, + backApiHost: publicRuntimeConfig.NEXT_PUBLIC_BACK_API_HOST, + backApiRootUrl: publicRuntimeConfig.NEXT_PUBLIC_BACK_API_ROOT_URL, + backApiVersion: publicRuntimeConfig.NEXT_PUBLIC_BACK_API_VERSION, + frontAppHost: publicRuntimeConfig.NEXT_PUBLIC_FRONT_APP_HOST, + frontAppPort: publicRuntimeConfig.NEXT_PUBLIC_FRONT_APP_PORT, + idNotBaseUrl: publicRuntimeConfig.NEXT_PUBLIC_IDNOT_BASE_URL, + idNotAuthorizeEndpoint: publicRuntimeConfig.NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT, + idNotClientId: publicRuntimeConfig.NEXT_PUBLIC_IDNOT_CLIENT_ID, + fcAuthorizeEndpoint: publicRuntimeConfig.NEXT_PUBLIC_FC_AUTHORIZE_ENDPOINT, + fcClientId: publicRuntimeConfig.NEXT_PUBLIC_FC_CLIENT_ID, + docaposteApiUrl: publicRuntimeConfig.NEXT_PUBLIC_DOCAPOST_API_URL, }; };