Erstatte egen api service med common api service

apps/omsorgspengerutbetaling-arbeidstaker-soknad/e2e/playwright/tests/fyll-ut-søknad.spec.ts

@@ -25,7 +25,7 @@ test.describe('Fyller ut søknad', () => {
         await page.route('**/vedlegg', async (route) => {
             await route.fulfill({
                 status: 200,
-                headers: { Location: '/vedlegg', 'access-control-expose-headers': 'Location' },
+                headers: { Location: '/vedlegg/123', 'access-control-expose-headers': 'Location' },
             });
         });
         await page.route('**/innsending', async (route) => {

apps/omsorgspengerutbetaling-soknad/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @navikt/omsorgspengerutbetaling-soknad
 
+## 1.17.0
+
+### Minor Changes
+
+-   052ef4b: Vedleggservice i common, og ta denne i bruk i omsorgspengerutbetaling-sn-fl
+
+### Patch Changes
+
+-   Updated dependencies [052ef4b]
+    -   @navikt/sif-common-soknad-ds@14.0.12
+    -   @navikt/sif-common-core-ds@9.18.17
+
 ## 1.16.0
 
 ### Minor Changes

apps/omsorgspengerutbetaling-soknad/e2e/playwright/tests/fyll-ut-søknad.spec.ts

@@ -21,12 +21,14 @@ test.describe('Fyller ut søknad', () => {
         await page.route('**/oppslag/barn', async (route) => {
             await route.fulfill({ status: 200, body: JSON.stringify(playwrightApiMockData.barnMock.toBarnUnder13) });
         });
-        await page.route('**/vedlegg', async (route) => {
+
+        await page.route('*/**/vedlegg', async (route) => {
             await route.fulfill({
                 status: 200,
-                headers: { Location: '/vedlegg', 'access-control-expose-headers': 'Location' },
+                headers: { Location: '/vedlegg/123', 'access-control-expose-headers': 'Location' },
             });
         });
+
         await page.route('**/innsending', async (route) => {
             await route.fulfill({ status: 200 });
         });

apps/omsorgspengerutbetaling-soknad/e2e/playwright/tests/test-dine-barn.spec.ts

@@ -20,7 +20,7 @@ const startScenario = async (page: Page, barnMockData: any) => {
     await page.route('**/vedlegg', async (route) => {
         await route.fulfill({
             status: 200,
-            headers: { Location: '/vedlegg', 'access-control-expose-headers': 'Location' },
+            headers: { Location: '/vedlegg/123', 'access-control-expose-headers': 'Location' },
         });
     });
     await page.route('**/innsending', async (route) => {

apps/omsorgspengerutbetaling-soknad/mock/AppSettings.cjs

@@ -11,11 +11,9 @@ const getAppSettings = () => ({
 
     SIF_PUBLIC_APPSTATUS_DATASET: `${process.env.SIF_PUBLIC_APPSTATUS_DATASET}`,
     SIF_PUBLIC_APPSTATUS_PROJECT_ID: `${process.env.SIF_PUBLIC_APPSTATUS_PROJECT_ID}`,
-    SIF_PUBLIC_FRONTEND_VEDLEGG_URL: `${process.env.SIF_PUBLIC_FRONTEND_VEDLEGG_URL}`,
     SIF_PUBLIC_LOGIN_URL: `${process.env.SIF_PUBLIC_LOGIN_URL}`,
     SIF_PUBLIC_MINSIDE_URL: `${process.env.SIF_PUBLIC_MINSIDE_URL}`,
     SIF_PUBLIC_SKIP_ORGNUM_VALIDATION: `${process.env.SIF_PUBLIC_SKIP_ORGNUM_VALIDATION}`,
-    SIF_PUBLIC_VEDLEGG_API_URL: `${process.env.SIF_PUBLIC_VEDLEGG_API_URL}`,
 
     MOCK_DATE: `${process.env.MOCK_DATE}`,
     USE_MOCK_DATE: `${process.env.USE_MOCK_DATE}`,

apps/omsorgspengerutbetaling-soknad/mock/mock-api-server.cjs

@@ -88,7 +88,12 @@ const startServer = () => {
         req.pipe(busboy);
     });
 
-    server.delete(`/vedlegg`, (req, res) => {
+    server.get(`/vedlegg/:id`, (req, res) => {
+        const { id } = req.params;
+        res.send({ id }).status(200);
+    });
+
+    server.delete(`/vedlegg/:id`, (req, res) => {
         res.sendStatus(200);
     });
 
@@ -106,7 +111,8 @@ const startServer = () => {
         const body = req.body;
         const jsBody = isJSON(body) ? JSON.parse(body) : body;
         writeFileAsync(MELLOMLAGRING_JSON, JSON.stringify(jsBody, null, 2));
-        res.sendStatus(200);
+        res.set('location', 'http://localhost:8089/mellomlagring/vedlegg/OMSORGSPENGER_UTBETALING_SNF');
+        res.send(200);
     });
     server.put(`/mellomlagring/OMSORGSPENGER_UTBETALING_SNF`, (req, res) => {
         const body = req.body;

apps/omsorgspengerutbetaling-soknad/nais/dev-gcp.json

@@ -24,9 +24,7 @@
         "SIF_PUBLIC_APPSTATUS_DATASET": "staging",
         "SIF_PUBLIC_APPSTATUS_PROJECT_ID": "ryujtq87",
         "SIF_PUBLIC_DEKORATOR_URL": "https://dekoratoren.ekstern.dev.nav.no/?simple=true&chatbot=false&urlLookupTable=false&logoutUrl=https://omsorgspengerutbetaling-soknad.intern.dev.nav.no/oauth2/logout&redirectToApp=true",
-        "SIF_PUBLIC_FRONTEND_VEDLEGG_URL": "https://omsorgspengerutbetaling-soknad.intern.dev.nav.no/familie/sykdom-i-familien/soknad/omsorgspengerutbetaling/api",
         "SIF_PUBLIC_LOGIN_URL": "https://omsorgspengerutbetaling-soknad.intern.dev.nav.no/oauth2/login?redirect=/familie/sykdom-i-familien/soknad/omsorgspengerutbetaling/soknad",
-        "SIF_PUBLIC_MINSIDE_URL": "https://www.intern.dev.nav.no/minside",
-        "SIF_PUBLIC_VEDLEGG_API_URL": "https://k9-brukerdialog-prosessering"
+        "SIF_PUBLIC_MINSIDE_URL": "https://www.intern.dev.nav.no/minside"
     }
 }

apps/omsorgspengerutbetaling-soknad/nais/prod-gcp.json

@@ -24,9 +24,7 @@
         "SIF_PUBLIC_APPSTATUS_DATASET": "production",
         "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/omsorgspengerutbetaling/oauth2/logout",
-        "SIF_PUBLIC_FRONTEND_VEDLEGG_URL": "https://www.nav.no/familie/sykdom-i-familien/soknad/omsorgspengerutbetaling/api",
         "SIF_PUBLIC_LOGIN_URL": "https://www.nav.no/familie/sykdom-i-familien/soknad/omsorgspengerutbetaling/oauth2/login?redirect=/familie/sykdom-i-familien/soknad/omsorgspengerutbetaling/soknad",
-        "SIF_PUBLIC_MINSIDE_URL": "https://www.nav.no/minside",
-        "SIF_PUBLIC_VEDLEGG_API_URL": "https://k9-brukerdialog-prosessering"
+        "SIF_PUBLIC_MINSIDE_URL": "https://www.nav.no/minside"
     }
 }

apps/omsorgspengerutbetaling-soknad/package.json

@@ -4,7 +4,7 @@
     "license": "MIT",
     "name": "@navikt/omsorgspengerutbetaling-soknad",
     "repository": "https://github.com/navikt/sif-brukerdialog",
-    "version": "1.16.0",
+    "version": "1.17.0",
     "private": true,
     "type": "module",
     "dependencies": {

apps/omsorgspengerutbetaling-soknad/playwright.config.ts

@@ -28,8 +28,6 @@ export default defineConfig({
             PUBLIC_PATH: '/familie/sykdom-i-familien/soknad/omsorgspengerutbetaling',
             K9_BRUKERDIALOG_PROSESSERING_API_URL: 'http://localhost:8089',
             K9_BRUKERDIALOG_PROSESSERING_FRONTEND_PATH: 'http://localhost:8089',
-            SIF_PUBLIC_FRONTEND_VEDLEGG_URL: 'http://localhost:8089',
-            SIF_PUBLIC_VEDLEGG_API_URL: 'http://localhost:8089',
             SIF_PUBLIC_APPSTATUS_PROJECT_ID: 'ryujtq87',
             SIF_PUBLIC_APPSTATUS_DATASET: 'staging',
             USE_MOCK_DATE: 'true',

apps/omsorgspengerutbetaling-soknad/src/app/App.tsx

@@ -8,6 +8,7 @@ import {
 } from '@navikt/sif-common-soknad-ds';
 import MockDate from 'mockdate';
 import { applicationIntlMessages } from './i18n';
+import IkkeTilgangPage from './pages/ikke-tilgang-page/IkkeTilgangPage';
 import Søknad from './søknad/Søknad';
 import { SøknadRoutes } from './types/SøknadRoutes';
 import '@navikt/ds-css';
@@ -42,7 +43,7 @@ const App = () => (
             contentRoutes={[
                 <Route index key="redirect" element={<Navigate to={SøknadRoutes.VELKOMMEN} />} />,
                 <Route path={SøknadRoutes.INNLOGGET_ROOT} key="soknad" element={<Søknad />} />,
-                <Route path={SøknadRoutes.IKKE_TILGANG} key="ikke-tilgang" element={<>Ikke tilgang</>} />,
+                <Route path={SøknadRoutes.IKKE_TILGANG} key="ikke-tilgang" element={<IkkeTilgangPage />} />,
                 <Route path="*" key="ukjent" element={<Navigate to={SøknadRoutes.VELKOMMEN} />} />,
             ]}
         />