🐛 Fixing env variables

This commit is contained in:
Maxime Lalo 2023-05-10 19:34:35 +02:00
parent 6029a21760
commit f134d115cd
3 changed files with 25 additions and 26 deletions

View File

@ -4,15 +4,14 @@ const nextConfig = {
reactStrictMode: false, reactStrictMode: false,
publicRuntimeConfig: { publicRuntimeConfig: {
// Will be available on both server and client // Will be available on both server and client
BACK_API_PROTOCOL: process.env.BACK_API_PROTOCOL, BACK_API_PROTOCOL: process.env.NEXT_PUBLIC_BACK_API_PROTOCOL,
BACK_API_HOST: process.env.BACK_API_HOST, BACK_API_HOST: process.env.NEXT_PUBLIC_BACK_API_HOST,
BACK_API_PORT: process.env.BACK_API_PORT, BACK_API_ROOT_URL: process.env.NEXT_PUBLIC_BACK_API_ROOT_URL,
BACK_API_ROOT_URL: process.env.BACK_API_ROOT_URL, BACK_API_VERSION: process.env.NEXT_PUBLIC_BACK_API_VERSION,
BACK_API_VERSION: process.env.BACK_API_VERSION, FRONT_APP_HOST: process.env.NEXT_PUBLIC_FRONT_APP_HOST,
FRONT_APP_HOST: process.env.FRONT_APP_HOST, FRONT_APP_PORT: process.env.NEXT_PUBLIC_FRONT_APP_PORT,
FRONT_APP_PORT: process.env.FRONT_APP_PORT, IDNOT_AUTHORIZE_ENDPOINT: process.env.NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT,
IDNOT_AUTHORIZE_ENDPOINT: process.env.IDNOT_AUTHORIZE_ENDPOINT, IDNOT_CLIENT_ID: process.env.NEXT_PUBLIC_IDNOT_CLIENT_ID,
IDNOT_CLIENT_ID: process.env.IDNOT_CLIENT_ID,
}, },
}; };

View File

@ -17,7 +17,6 @@ export default abstract class BaseApiService {
} }
protected getBaseUrl() { protected getBaseUrl() {
console.log("BaseApiService.baseUrl >>> ", BaseApiService.baseUrl);
return BaseApiService.baseUrl; return BaseApiService.baseUrl;
} }

View File

@ -36,28 +36,29 @@ const MyApp = (({
}: AppPropsWithLayout) => { }: AppPropsWithLayout) => {
const getLayout = Component.getLayout ?? ((page) => <DefaultLayout children={page}></DefaultLayout>); const getLayout = Component.getLayout ?? ((page) => <DefaultLayout children={page}></DefaultLayout>);
FrontendVariables.getInstance().BACK_API_PROTOCOL = backApiProtocol; const instance = FrontendVariables.getInstance();
FrontendVariables.getInstance().BACK_API_HOST = backApiHost; instance.BACK_API_PROTOCOL = backApiProtocol;
FrontendVariables.getInstance().BACK_API_ROOT_URL = backApiRootUrl; instance.BACK_API_HOST = backApiHost;
FrontendVariables.getInstance().BACK_API_VERSION = backApiVersion; instance.BACK_API_ROOT_URL = backApiRootUrl;
FrontendVariables.getInstance().FRONT_APP_HOST = frontAppHost; instance.BACK_API_VERSION = backApiVersion;
FrontendVariables.getInstance().FRONT_APP_PORT = frontAppPort; instance.FRONT_APP_HOST = frontAppHost;
FrontendVariables.getInstance().IDNOT_AUTHORIZE_ENDPOINT = idNotAuthorizeEndpoint; instance.FRONT_APP_PORT = frontAppPort;
FrontendVariables.getInstance().IDNOT_CLIENT_ID = idNotClientId; instance.IDNOT_AUTHORIZE_ENDPOINT = idNotAuthorizeEndpoint;
instance.IDNOT_CLIENT_ID = idNotClientId;
return getLayout(<Component {...pageProps} />); return getLayout(<Component {...pageProps} />);
}) as AppType; }) as AppType;
MyApp.getInitialProps = async () => { MyApp.getInitialProps = async () => {
return { return {
backApiProtocol: process.env["BACK_API_PROTOCOL"], backApiProtocol: process.env["NEXT_PUBLIC_BACK_API_PROTOCOL"],
backApiHost: process.env["BACK_API_HOST"], backApiHost: process.env["NEXT_PUBLIC_BACK_API_HOST"],
backApiRootUrl: process.env["BACK_API_ROOT_URL"], backApiRootUrl: process.env["NEXT_PUBLIC_BACK_API_ROOT_URL"],
backApiVersion: process.env["BACK_API_VERSION"], backApiVersion: process.env["NEXT_PUBLIC_BACK_API_VERSION"],
frontAppHost: process.env["FRONT_APP_HOST"], frontAppHost: process.env["NEXT_PUBLIC_FRONT_APP_HOST"],
frontAppPort: process.env["FRONT_APP_PORT"], frontAppPort: process.env["NEXT_PUBLIC_FRONT_APP_PORT"],
idNotAuthorizeEndpoint: process.env["IDNOT_AUTHORIZE_ENDPOINT"], idNotAuthorizeEndpoint: process.env["NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT"],
idNotClientId: process.env["IDNOT_CLIENT_ID"], idNotClientId: process.env["NEXT_PUBLIC_IDNOT_CLIENT_ID"],
}; };
}; };