Merge Dev in Staging

This commit is contained in:
Arnaud D. Natali 2023-11-07 10:13:42 +01:00 committed by GitHub
commit daca673495
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 14 deletions

View File

@ -4,7 +4,20 @@ const nextConfig = {
reactStrictMode: false, reactStrictMode: false,
publicRuntimeConfig: { publicRuntimeConfig: {
// Will be available on both server and client // Will be available on both server and client
NEXT_PUBLIC_BACK_API_PROTOCOL: process.env["NEXT_PUBLIC_BACK_API_PROTOCOL"], NEXT_PUBLIC_BACK_API_PROTOCOL: process.env.NEXT_PUBLIC_BACK_API_PROTOCOL,
NEXT_PUBLIC_BACK_API_HOST: process.env.NEXT_PUBLIC_BACK_API_HOST,
NEXT_PUBLIC_BACK_API_ROOT_URL: process.env.NEXT_PUBLIC_BACK_API_ROOT_URL,
NEXT_PUBLIC_BACK_API_VERSION: process.env.NEXT_PUBLIC_BACK_API_VERSION,
NEXT_PUBLIC_FRONT_APP_HOST: process.env.NEXT_PUBLIC_FRONT_APP_HOST,
NEXT_PUBLIC_FRONT_APP_PORT: process.env.NEXT_PUBLIC_FRONT_APP_PORT,
NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT: process.env.NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT,
NEXT_PUBLIC_IDNOT_CLIENT_ID: process.env.NEXT_PUBLIC_IDNOT_CLIENT_ID,
NEXT_PUBLIC_IDNOT_BASE_URL: process.env.NEXT_PUBLIC_IDNOT_BASE_URL,
NEXT_PUBLIC_DOCAPOSTE_API_URL: process.env.NEXT_PUBLIC_DOCAPOSTE_API_URL,
},
serverRuntimeConfig: {
NEXT_PUBLIC_BACK_API_PROTOCOL: process.env.NEXT_PUBLIC_BACK_API_PROTOCOL,
NEXT_PUBLIC_BACK_API_HOST: process.env.NEXT_PUBLIC_BACK_API_HOST, NEXT_PUBLIC_BACK_API_HOST: process.env.NEXT_PUBLIC_BACK_API_HOST,
NEXT_PUBLIC_BACK_API_ROOT_URL: process.env.NEXT_PUBLIC_BACK_API_ROOT_URL, NEXT_PUBLIC_BACK_API_ROOT_URL: process.env.NEXT_PUBLIC_BACK_API_ROOT_URL,
NEXT_PUBLIC_BACK_API_VERSION: process.env.NEXT_PUBLIC_BACK_API_VERSION, NEXT_PUBLIC_BACK_API_VERSION: process.env.NEXT_PUBLIC_BACK_API_VERSION,

View File

@ -26,7 +26,7 @@ type AppPropsWithLayout = AppProps & {
docaposteApiUrl: string; docaposteApiUrl: string;
}; };
const { publicRuntimeConfig } = getConfig(); const { publicRuntimeConfig, serverRuntimeConfig } = getConfig();
const MyApp = (({ const MyApp = (({
Component, Component,
@ -65,19 +65,20 @@ const MyApp = (({
MyApp.getInitialProps = async () => { MyApp.getInitialProps = async () => {
console.log("runtime config", publicRuntimeConfig); console.log("runtime config", publicRuntimeConfig);
console.log("server runtime config", serverRuntimeConfig);
return { return {
backApiProtocol: publicRuntimeConfig.NEXT_PUBLIC_BACK_API_PROTOCOL, backApiProtocol: serverRuntimeConfig.NEXT_PUBLIC_BACK_API_PROTOCOL,
backApiHost: publicRuntimeConfig.NEXT_PUBLIC_BACK_API_HOST, backApiHost: serverRuntimeConfig.NEXT_PUBLIC_BACK_API_HOST,
backApiRootUrl: publicRuntimeConfig.NEXT_PUBLIC_BACK_API_ROOT_URL, backApiRootUrl: serverRuntimeConfig.NEXT_PUBLIC_BACK_API_ROOT_URL,
backApiVersion: publicRuntimeConfig.NEXT_PUBLIC_BACK_API_VERSION, backApiVersion: serverRuntimeConfig.NEXT_PUBLIC_BACK_API_VERSION,
frontAppHost: publicRuntimeConfig.NEXT_PUBLIC_FRONT_APP_HOST, frontAppHost: serverRuntimeConfig.NEXT_PUBLIC_FRONT_APP_HOST,
frontAppPort: publicRuntimeConfig.NEXT_PUBLIC_FRONT_APP_PORT, frontAppPort: serverRuntimeConfig.NEXT_PUBLIC_FRONT_APP_PORT,
idNotBaseUrl: publicRuntimeConfig.NEXT_PUBLIC_IDNOT_BASE_URL, idNotBaseUrl: serverRuntimeConfig.NEXT_PUBLIC_IDNOT_BASE_URL,
idNotAuthorizeEndpoint: publicRuntimeConfig.NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT, idNotAuthorizeEndpoint: serverRuntimeConfig.NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT,
idNotClientId: publicRuntimeConfig.NEXT_PUBLIC_IDNOT_CLIENT_ID, idNotClientId: serverRuntimeConfig.NEXT_PUBLIC_IDNOT_CLIENT_ID,
fcAuthorizeEndpoint: publicRuntimeConfig.NEXT_PUBLIC_FC_AUTHORIZE_ENDPOINT, fcAuthorizeEndpoint: serverRuntimeConfig.NEXT_PUBLIC_FC_AUTHORIZE_ENDPOINT,
fcClientId: publicRuntimeConfig.NEXT_PUBLIC_FC_CLIENT_ID, fcClientId: serverRuntimeConfig.NEXT_PUBLIC_FC_CLIENT_ID,
docaposteApiUrl: publicRuntimeConfig.NEXT_PUBLIC_DOCAPOST_API_URL, docaposteApiUrl: serverRuntimeConfig.NEXT_PUBLIC_DOCAPOST_API_URL,
}; };
}; };