Endre env variable name

navikt · Sep 23, 2024 · 502581e · 502581e
1 parent f09455b
commit 502581e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 28 deletions.
diff --git a/packages/sif-common/src/api/apiClient.ts b/packages/sif-common/src/api/apiClient.ts
@@ -10,15 +10,5 @@ export const axiosConfig: AxiosRequestConfig = {
 
 export const k9BrukerdialogApiClient = axios.create({
     ...axiosConfig,
-    baseURL: getEnvVariableOrDefault('BRUKERDIALOG_PROSESSERING_FRONTEND_API_PATH', defaultFrontendApiPath),
+    baseURL: getEnvVariableOrDefault('BRUKERDIALOG_PROSESSERING_FRONTEND_PATH', defaultFrontendApiPath),
 });
-
-// export const sifInnsynApiClient = axios.create({
-//     ...axiosConfig,
-//     baseURL: getEnvVariableOrDefault('FRONTEND_API_PATH_SIF_INNSYN', defaultFrontendApiPath),
-// });
-
-// export const k9SakInnsynApiClient = axios.create({
-//     ...axiosConfig,
-//     baseURL: getEnvVariableOrDefault('FRONTEND_API_PATH_K9_SAK_INNSYN', defaultFrontendApiPath),
-// });
diff --git a/packages/sif-common/src/server/serverEnv.cjs b/packages/sif-common/src/server/serverEnv.cjs
@@ -1,15 +1,16 @@
 module.exports = {
     PUBLIC_PATH: `${process.env.PUBLIC_PATH}`,
     NAIS_CLIENT_ID: `${process.env.NAIS_CLIENT_ID}`,
+    DEKORATOR_URL: `${process.env.DEKORATOR_URL}`,
 
     /** API adresser */
-    BRUKERDIALOG_PROSESSERING_FRONTEND_API_PATH: `${process.env.BRUKERDIALOG_PROSESSERING_FRONTEND_API_PATH}`,
+    BRUKERDIALOG_PROSESSERING_FRONTEND_PATH: `${process.env.BRUKERDIALOG_PROSESSERING_FRONTEND_PATH}`,
     BRUKERDIALOG_PROSESSERING_SERVER_URL: `${process.env.BRUKERDIALOG_PROSESSERING_SERVER_URL}`,
     BRUKERDIALOG_PROSESSERING_TOKENX_AUDIENCE: `${process.env.BRUKERDIALOG_PROSESSERING_TOKENX_AUDIENCE}`,
-    K9_SAK_INNSYN_FRONTEND_API_PATH: `${process.env.K9_SAK_INNSYN_FRONTEND_API_PATH}`,
+    K9_SAK_INNSYN_FRONTEND_PATH: `${process.env.K9_SAK_INNSYN_FRONTEND_PATH}`,
     K9_SAK_INNSYN_SERVER_URL: `${process.env.K9_SAK_INNSYN_SERVER_URL}`,
     K9_SAK_INNSYN_TOKENX_AUDIENCE: `${process.env.K9_SAK_INNSYN_TOKENX_AUDIENCE}`,
-    SIF_INNSYN_FRONTEND_API_PATH: `${process.env.SIF_INNSYN_FRONTEND_API_PATH}`,
+    SIF_INNSYN_FRONTEND_PATH: `${process.env.SIF_INNSYN_FRONTEND_PATH}`,
     SIF_INNSYN_SERVER_URL: `${process.env.SIF_INNSYN_SERVER_URL}`,
     SIF_INNSYN_TOKENX_AUDIENCE: `${process.env.SIF_INNSYN_TOKENX_AUDIENCE}`,
 };
diff --git a/packages/sif-common/src/server/serverUtils.cjs b/packages/sif-common/src/server/serverUtils.cjs
@@ -7,13 +7,13 @@ const { createProxyMiddleware } = require('http-proxy-middleware');
 const { exchangeToken } = require('./tokenx.cjs');
 const mustacheExpress = require('mustache-express');
 const {
-    BRUKERDIALOG_PROSESSERING_FRONTEND_API_PATH,
+    BRUKERDIALOG_PROSESSERING_FRONTEND_PATH,
     BRUKERDIALOG_PROSESSERING_SERVER_URL,
     BRUKERDIALOG_PROSESSERING_TOKENX_AUDIENCE,
-    K9_SAK_INNSYN_FRONTEND_API_PATH,
+    K9_SAK_INNSYN_FRONTEND_PATH,
     K9_SAK_INNSYN_SERVER_URL,
     K9_SAK_INNSYN_TOKENX_AUDIENCE,
-    SIF_INNSYN_FRONTEND_API_PATH,
+    SIF_INNSYN_FRONTEND_PATH,
     SIF_INNSYN_SERVER_URL,
     SIF_INNSYN_TOKENX_AUDIENCE,
 } = require('./serverEnv.cjs');
@@ -74,19 +74,19 @@ const createProxyMiddlewareForService = (server, frontendPath, backendUrl, audie
 const createProxyMiddlewares = (server) => {
     createProxyMiddlewareForService(
         server,
-        BRUKERDIALOG_PROSESSERING_FRONTEND_API_PATH,
+        BRUKERDIALOG_PROSESSERING_FRONTEND_PATH,
         BRUKERDIALOG_PROSESSERING_SERVER_URL,
         BRUKERDIALOG_PROSESSERING_TOKENX_AUDIENCE,
     );
     createProxyMiddlewareForService(
         server,
-        K9_SAK_INNSYN_FRONTEND_API_PATH,
+        K9_SAK_INNSYN_FRONTEND_PATH,
         K9_SAK_INNSYN_SERVER_URL,
         K9_SAK_INNSYN_TOKENX_AUDIENCE,
     );
     createProxyMiddlewareForService(
         server,
-        SIF_INNSYN_FRONTEND_API_PATH,
+        SIF_INNSYN_FRONTEND_PATH,
         SIF_INNSYN_SERVER_URL,
         SIF_INNSYN_TOKENX_AUDIENCE,
     );

diff --git a/packages/sif-common/src/utils/env.ts b/packages/sif-common/src/utils/env.ts
@@ -2,27 +2,25 @@ import { z } from 'zod';
 import { getMaybeEnvironmentVariable } from './envUtils';
 
 const apiEnvSchema = z.object({
-    BRUKERDIALOG_PROSESSERING_FRONTEND_API_PATH: z.string(),
+    BRUKERDIALOG_PROSESSERING_FRONTEND_PATH: z.string(),
     BRUKERDIALOG_PROSESSERING_SERVER_URL: z.string(),
     BRUKERDIALOG_PROSESSERING_TOKENX_AUDIENCE: z.string(),
-    K9_SAK_INNSYN_FRONTEND_API_PATH: z.string(),
+    K9_SAK_INNSYN_FRONTEND_PATH: z.string(),
     K9_SAK_INNSYN_SERVER_URL: z.string(),
     K9_SAK_INNSYN_TOKENX_AUDIENCE: z.string(),
-    SIF_INNSYN_FRONTEND_API_PATH: z.string(),
+    SIF_INNSYN_FRONTEND_PATH: z.string(),
     SIF_INNSYN_SERVER_URL: z.string(),
     SIF_INNSYN_TOKENX_AUDIENCE: z.string(),
 });
 
 const apiEnv = apiEnvSchema.parse({
-    BRUKERDIALOG_PROSESSERING_FRONTEND_API_PATH: getMaybeEnvironmentVariable(
-        'BRUKERDIALOG_PROSESSERING_FRONTEND_API_PATH',
-    ),
+    BRUKERDIALOG_PROSESSERING_FRONTEND_PATH: getMaybeEnvironmentVariable('BRUKERDIALOG_PROSESSERING_FRONTEND_PATH'),
     BRUKERDIALOG_PROSESSERING_SERVER_URL: getMaybeEnvironmentVariable('BRUKERDIALOG_PROSESSERING_SERVER_URL'),
     BRUKERDIALOG_PROSESSERING_TOKENX_AUDIENCE: getMaybeEnvironmentVariable('BRUKERDIALOG_PROSESSERING_TOKENX_AUDIENCE'),
-    K9_SAK_INNSYN_FRONTEND_API_PATH: getMaybeEnvironmentVariable('K9_SAK_INNSYN_FRONTEND_API_PATH'),
+    K9_SAK_INNSYN_FRONTEND_PATH: getMaybeEnvironmentVariable('K9_SAK_INNSYN_FRONTEND_PATH'),
     K9_SAK_INNSYN_SERVER_URL: getMaybeEnvironmentVariable('K9_SAK_INNSYN_SERVER_URL'),
     K9_SAK_INNSYN_TOKENX_AUDIENCE: getMaybeEnvironmentVariable('K9_SAK_INNSYN_TOKENX_AUDIENCE'),
-    SIF_INNSYN_FRONTEND_API_PATH: getMaybeEnvironmentVariable('SIF_INNSYN_FRONTEND_API_PATH'),
+    SIF_INNSYN_FRONTEND_PATH: getMaybeEnvironmentVariable('SIF_INNSYN_FRONTEND_PATH'),
     SIF_INNSYN_SERVER_URL: getMaybeEnvironmentVariable('SIF_INNSYN_SERVER_URL'),
     SIF_INNSYN_TOKENX_AUDIENCE: getMaybeEnvironmentVariable('SIF_INNSYN_TOKENX_AUDIENCE'),
 });