Ettersending

apps/sif-ettersending/.env.example

@@ -12,7 +12,6 @@ SIF_PUBLIC_INNSYN_PP=https://https://dine-pleiepenger.intern.dev.nav.no/
 SIF_PUBLIC_LOGIN_URL=http://localhost:8081/auth-mock/cookie?subject=mockSubject&redirect_location=http://localhost:8080
 SIF_PUBLIC_MINSIDE_URL=https://www.nav.no/minside
 SIF_PUBLIC_PLEIEPENGER_SYKT_BARN_URL=https://pleiepengesoknad.intern.dev.nav.no
-SIF_PUBLIC_SKIP_ORGNUM_VALIDATION=true
 
 K9_BRUKERDIALOG_PROSESSERING_FRONTEND_PATH=/familie/sykdom-i-familien/soknad/ettersending/api/k9-brukerdialog
 K9_BRUKERDIALOG_PROSESSERING_API_SCOPE=dev-gcp:dusseldorf:k9-brukerdialog-prosessering

apps/sif-ettersending/dev/AppSettings.cjs

@@ -14,7 +14,6 @@ const getAppSettings = () => ({
     SIF_PUBLIC_LOGIN_URL: `${process.env.SIF_PUBLIC_LOGIN_URL}`,
     SIF_PUBLIC_MINSIDE_URL: `${process.env.SIF_PUBLIC_MINSIDE_URL}`,
     SIF_PUBLIC_PLEIEPENGER_SYKT_BARN_URL: `${process.env.SIF_PUBLIC_PLEIEPENGER_SYKT_BARN_URL}`,
-    SIF_PUBLIC_SKIP_ORGNUM_VALIDATION: `${process.env.SIF_PUBLIC_SKIP_ORGNUM_VALIDATION}`,
     K9_BRUKERDIALOG_PROSESSERING_FRONTEND_PATH: `${process.env.K9_BRUKERDIALOG_PROSESSERING_FRONTEND_PATH}`,
     K9_BRUKERDIALOG_PROSESSERING_API_SCOPE: `${process.env.K9_BRUKERDIALOG_PROSESSERING_API_SCOPE}`,
     K9_BRUKERDIALOG_PROSESSERING_API_URL: `${process.env.K9_BRUKERDIALOG_PROSESSERING_API_URL}`,

apps/sif-ettersending/env.schema.ts

@@ -0,0 +1,10 @@
+import { commonEnvSchema } from '@navikt/sif-common-env';
+import * as z from 'zod';
+
+export const appEnvSchema = commonEnvSchema.extend({
+    SIF_PUBLIC_ENDRINGSMELDING_PP: z.string().min(1),
+    SIF_PUBLIC_INNSYN_PP: z.string().min(1),
+    SIF_PUBLIC_PLEIEPENGER_SYKT_BARN_URL: z.string().min(1),
+});
+
+export type AppEnv = z.infer<typeof appEnvSchema>;

apps/sif-ettersending/playwright.config.ts

@@ -1,4 +1,25 @@
 import { defineConfig, devices } from '@playwright/test';
+import { AppEnv } from './env.schema';
+
+const env: AppEnv = {
+    ENV: 'dev',
+    APP_VERSION: 'dev',
+    PUBLIC_PATH: '/familie/sykdom-i-familien/soknad/ettersending',
+    GITHUB_REF_NAME: 'branch-name',
+    SIF_PUBLIC_APPSTATUS_DATASET: 'staging',
+    SIF_PUBLIC_APPSTATUS_PROJECT_ID: 'ryujtq87',
+    SIF_PUBLIC_DEKORATOR_URL:
+        'https://www.nav.no/dekoratoren/?simple=true&chatbot=false&logoutUrl=https://www.nav.no/familie/sykdom-i-familien/soknad/ettersending/oauth2/logout',
+    SIF_PUBLIC_ENDRINGSMELDING_PP: 'https://endringsmelding-pleiepenger.intern.dev.nav.no',
+    SIF_PUBLIC_INNSYN_PP: 'https://https://dine-pleiepenger.intern.dev.nav.no/',
+    SIF_PUBLIC_LOGIN_URL:
+        'http://localhost:8081/auth-mock/cookie?subject=mockSubject&redirect_location=http://localhost:8080',
+    SIF_PUBLIC_MINSIDE_URL: 'https://www.nav.no/minside',
+    SIF_PUBLIC_PLEIEPENGER_SYKT_BARN_URL: 'https://pleiepengesoknad.intern.dev.nav.no',
+    K9_BRUKERDIALOG_PROSESSERING_FRONTEND_PATH: '/familie/sykdom-i-familien/soknad/ettersending/api/k9-brukerdialog',
+    K9_BRUKERDIALOG_PROSESSERING_API_SCOPE: 'dev-gcp:dusseldorf:k9-brukerdialog-prosessering',
+    K9_BRUKERDIALOG_PROSESSERING_API_URL: 'http://k9-brukerdialog-prosessering',
+};
 
 export default defineConfig({
     testDir: './e2e/playwright/tests',
@@ -23,27 +44,6 @@ export default defineConfig({
         command: 'yarn start-e2e-server',
         url: 'http://localhost:8080',
         reuseExistingServer: true,
-        env: {
-            ENV: 'dev',
-            APP_VERSION: 'dev',
-            NODE_ENV: 'development',
-            PUBLIC_PATH: '/familie/sykdom-i-familien/soknad/ettersending',
-            GITHUB_REF_NAME: 'branch-name',
-            SIF_PUBLIC_APPSTATUS_DATASET: 'staging',
-            SIF_PUBLIC_APPSTATUS_PROJECT_ID: 'ryujtq87',
-            SIF_PUBLIC_DEKORATOR_URL:
-                'https://www.nav.no/dekoratoren/?simple=true&chatbot=false&logoutUrl=https://www.nav.no/familie/sykdom-i-familien/soknad/ettersending/oauth2/logout',
-            SIF_PUBLIC_ENDRINGSMELDING_PP: 'https://endringsmelding-pleiepenger.intern.dev.nav.no',
-            SIF_PUBLIC_INNSYN_PP: 'https://https://dine-pleiepenger.intern.dev.nav.no/',
-            SIF_PUBLIC_LOGIN_URL:
-                'http://localhost:8081/auth-mock/cookie?subject=mockSubject&redirect_location=http://localhost:8080',
-            SIF_PUBLIC_MINSIDE_URL: 'https://www.nav.no/minside',
-            SIF_PUBLIC_PLEIEPENGER_SYKT_BARN_URL: 'https://pleiepengesoknad.intern.dev.nav.no',
-            SIF_PUBLIC_SKIP_ORGNUM_VALIDATION: 'true',
-            K9_BRUKERDIALOG_PROSESSERING_FRONTEND_PATH:
-                '/familie/sykdom-i-familien/soknad/ettersending/api/k9-brukerdialog',
-            K9_BRUKERDIALOG_PROSESSERING_API_SCOPE: 'dev-gcp:dusseldorf:k9-brukerdialog-prosessering',
-            K9_BRUKERDIALOG_PROSESSERING_API_URL: 'http://k9-brukerdialog-prosessering',
-        },
+        env,
     },
 });

apps/sif-ettersending/src/app/App.tsx

@@ -1,6 +1,5 @@
 import { Navigate, Route } from 'react-router-dom';
 import { EttersendelseApp } from '@navikt/sif-app-register';
-import { commonEnv } from '@navikt/sif-common-env';
 import {
     ensureBaseNameForReactRouter,
     SoknadApplication,
@@ -10,11 +9,12 @@ import { applicationIntlMessages } from './i18n';
 import GeneralErrorPage from './pages/general-error-page/GeneralErrorPage';
 import IntroPage from './pages/intro-page/IntroPage';
 import SoknadRemoteDataFetcher from './soknad/SoknadRemoteDataFetcher';
+import { appEnv } from './utils/appEnv';
 import '@navikt/ds-css';
 import '@navikt/sif-common-core-ds/src/styles/sif-ds-theme.css';
 import './app.css';
 
-const { PUBLIC_PATH, SIF_PUBLIC_APPSTATUS_PROJECT_ID, SIF_PUBLIC_APPSTATUS_DATASET } = commonEnv;
+const { PUBLIC_PATH, SIF_PUBLIC_APPSTATUS_PROJECT_ID, SIF_PUBLIC_APPSTATUS_DATASET } = appEnv;
 
 ensureBaseNameForReactRouter(PUBLIC_PATH);
 

apps/sif-ettersending/tsconfig.json

@@ -5,5 +5,5 @@
         "typeRoots": ["../../node_modules/@types", "./node_modules/@types"]
     },
     "exclude": ["node_modules", "**.js", "dist"],
-    "include": ["./src/**/*"]
+    "include": ["./src/**/*", "./playwright-config.ts", "./env.schema.ts"]
 }