Migrering felles api (#1282)

* Migrering felles api
navikt · Dec 20, 2022 · 2ec34d3 · 2ec34d3
1 parent a2aaa79
commit 2ec34d3
Show file tree

Hide file tree

Showing 45 changed files with 530 additions and 377 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,6 +4,7 @@ WORKDIR /usr/src/app
 
 COPY dist ./dist
 COPY server.js .
+COPY tokenx.js .
 COPY node_modules ./node_modules
 COPY package.json .
 COPY src/build/scripts/decorator.js ./src/build/scripts/decorator.js

diff --git a/Dockerfile.web-cypress b/Dockerfile.web-cypress
@@ -2,6 +2,8 @@ FROM node:16-alpine
 
 WORKDIR /usr/src/app
 ENV API_URL=http://api-mock:8082
+ENV FRONTEND_API_PATH=http://api-mock:8082
+ENV FRONTEND_VEDLEGG_URL=http://localhost:8080/api
 ENV PUBLIC_PATH=/familie/sykdom-i-familien/soknad/pleiepenger
 COPY . .
 RUN apk update && apk add bash && apk add curl

diff --git a/e2e/cypress/integration-utils/contextConfig.ts b/e2e/cypress/integration-utils/contextConfig.ts
@@ -15,10 +15,10 @@ interface ConfigProps {
 export const contextConfig = (props?: ConfigProps) => {
     const { mellomlagring, step, arbeidsgivere } = props || {};
     beforeEach('intercept mellomlagring og levere tomt objekt', () => {
-        cy.intercept(`GET`, `/mellomlagring*`, mellomlagring || {});
-        cy.intercept('GET', `/arbeidsgiver*`, arbeidsgivere || cyApiMockData.arbeidsgivereMock);
-        cy.intercept('GET', `/soker*`, cyApiMockData.søkerMock);
-        cy.intercept('GET', `/barn*`, cyApiMockData.barnMock);
+        cy.intercept(`GET`, `/mellomlagring/PLEIEPENGER_SYKT_BARN*`, mellomlagring || {});
+        cy.intercept('GET', `/oppslag/arbeidsgiver*`, arbeidsgivere || cyApiMockData.arbeidsgivereMock);
+        cy.intercept('GET', `/oppslag/soker*`, cyApiMockData.søkerMock);
+        cy.intercept('GET', `/oppslag/barn*`, cyApiMockData.barnMock);
         cy.intercept(`https://ryujtq87.api.sanity.io*`, {});
     });
 

diff --git a/e2e/cypress/integration-utils/mocks/mellomlagring.ts b/e2e/cypress/integration-utils/mocks/mellomlagring.ts
@@ -35,8 +35,6 @@ export const mellomlagring = {
         utenlandsoppholdIPerioden: [],
         skalTaUtFerieIPerioden: 'no',
         ferieuttakIPerioden: [],
-        harMedsøker: 'no',
-        samtidigHjemme: 'unanswered',
         omsorgstilbud: {
             erIOmsorgstilbudFremtid: 'no',
             erIOmsorgstilbudFortid: 'no',
@@ -67,7 +65,7 @@ export const mellomlagring = {
     },
     metadata: {
         lastStepID: 'legeerklaering',
-        version: '13.0.0',
+        version: '13.1.0',
         updatedTimestemp: '2022-10-19T13:14:12.851Z',
     },
 };
diff --git a/e2e/cypress/integration-utils/steps/periode.ts b/e2e/cypress/integration-utils/steps/periode.ts
@@ -26,8 +26,6 @@ const expectedLand = 'Albania'; // Land #2 i listen
 export const fyllUtPeriode = () => {
     getInputByName('periodeFra').click().type(fraDato).blur();
     getInputByName('periodeTil').click().type(tilDato).blur();
-    selectRadioYes('er-annenSamtidig');
-    selectRadioYes('er-samtidigHjemme');
     selectRadioYes('er-iUtlandetIPerioden');
 
     selectRadioYes('er-iUtlandetIPerioden');
@@ -66,7 +64,6 @@ export const oppsummeringTestPeriodeEnkelt = () => {
     getTestElement('oppsummering-tidsrom-fomtom').should((element) =>
         expect(expectedFomTomPeriode).equal(element.text())
     );
-    getTestElement('oppsummering-annenSøkerSammePeriode').should((element) => expect('Nei').equal(element.text()));
     getTestElement('oppsummering-utenlandsoppholdIPerioden').should((element) => expect('Nei').equal(element.text()));
     getTestElement('oppsummering-ferieuttakIPerioden').should((element) => expect('Nei').equal(element.text()));
 };
@@ -75,8 +72,6 @@ export const oppsummeringTestPeriode = () => {
     getTestElement('oppsummering-tidsrom-fomtom').should((element) =>
         expect(expectedFomTomPeriode).equal(element.text())
     );
-    getTestElement('oppsummering-annenSøkerSammePeriode').should((element) => expect('Ja').equal(element.text()));
-    getTestElement('oppsummering-samtidigHjemme').should((element) => expect('Ja').equal(element.text()));
     getTestElement('oppsummering-utenlandsoppholdIPerioden').should((element) => expect('Ja').equal(element.text()));
     getTestElement('oppsummering-utenlandsoppholdIPerioden-list').within(() => {
         getElement('li')

diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml
@@ -1,29 +1,31 @@
 version: '3.7'
 services:
-  api-mock:
-    build: ../server
-    environment:
-      - "PORT=8082"
-    ports:
-      - 8082:8082
-  web:
-    build:
-      context: ../
-      dockerfile: Dockerfile.web-cypress
-    ports:
-      - 8080:8080
-    depends_on:
-      - api-mock
-    environment:
-      - API_URL=http://api-mock:8082
-      - HOST=localhost
-  e2e:
-    build: .
-    depends_on:
-      - web
-    environment:
-      - CYPRESS_video=false
-      - CYPRESS_baseUrl=http://web:8080
+    api-mock:
+        build: ../server
+        environment:
+            - 'PORT=8082'
+        ports:
+            - 8082:8082
+    web:
+        build:
+            context: ../
+            dockerfile: Dockerfile.web-cypress
+        ports:
+            - 8080:8080
+        depends_on:
+            - api-mock
+        environment:
+            - API_URL=http://api-mock:8082
+            - FRONTEND_API_PATH=http://api-mock:8082
+            - FRONTEND_VEDLEGG_URL=http://web:8080/api
+            - HOST=localhost
+    e2e:
+        build: .
+        depends_on:
+            - web
+        environment:
+            - CYPRESS_video=false
+            - CYPRESS_baseUrl=http://web:8080
 # Dersom debugging er nødvendig
 #    working_dir: /e2e
 #    volumes:

diff --git a/envSettings.js b/envSettings.js
@@ -4,6 +4,9 @@ require('dotenv').config();
 const envSettings = () => {
     const API_URL = process.env.API_URL;
     const API_URL_INNSYN = process.env.API_URL_INNSYN;
+    const FRONTEND_INNSYN_API_PATH = process.env.FRONTEND_INNSYN_API_PATH;
+    const FRONTEND_API_PATH = process.env.FRONTEND_API_PATH;
+    const FRONTEND_VEDLEGG_URL = process.env.FRONTEND_VEDLEGG_URL;
     const LOGIN_URL = process.env.LOGIN_URL;
     const PUBLIC_PATH = process.env.PUBLIC_PATH;
     const UTILGJENGELIG = process.env.UTILGJENGELIG;
@@ -21,6 +24,9 @@ const envSettings = () => {
     window.appSettings = {
         API_URL: '${API_URL}',
         API_URL_INNSYN: '${API_URL_INNSYN}',
+        FRONTEND_INNSYN_API_PATH: '${FRONTEND_INNSYN_API_PATH}',
+        FRONTEND_API_PATH: '${FRONTEND_API_PATH}',
+        FRONTEND_VEDLEGG_URL:'${FRONTEND_VEDLEGG_URL}',
         LOGIN_URL: '${LOGIN_URL}',
         PUBLIC_PATH: '${PUBLIC_PATH}',
         UTILGJENGELIG: '${UTILGJENGELIG}',

diff --git a/nais/dev-gcp.json b/nais/dev-gcp.json
@@ -10,11 +10,14 @@
     "livenessPath": "/familie/sykdom-i-familien/soknad/pleiepenger/health/isAlive",
     "readinessPath": "/familie/sykdom-i-familien/soknad/pleiepenger/health/isReady",
     "env": {
-        "DEKORATOR_URL": "https://dekoratoren.dev.nav.no/?simple=true&chatbot=false&urlLookupTable=false",
-        "API_URL": "https://pleiepengesoknad-api.dev.nav.no",
+        "DEKORATOR_URL": "https://dekoratoren.dev.nav.no/?simple=true&chatbot=false&urlLookupTable=false&logoutUrl=https://pleiepengesoknad.dev.nav.no/oauth2/logout",
+        "API_URL": "https://k9-brukerdialog-api.dev.nav.no",
+        "FRONTEND_VEDLEGG_URL": "https://pleiepengesoknad.dev.nav.no/api",
+        "FRONTEND_API_PATH": "/api",
+        "FRONTEND_INNSYN_API_PATH": "/innsynapi",
         "API_URL_INNSYN": "https://sif-innsyn-api.dev.nav.no",
         "PUBLIC_PATH": "/familie/sykdom-i-familien/soknad/pleiepenger",
-        "LOGIN_URL": "https://loginservice.dev.nav.no/login?redirect=https://pleiepengesoknad.dev.nav.no/familie/sykdom-i-familien/soknad/pleiepenger/soknad",
+        "LOGIN_URL": "https://pleiepengesoknad.dev.nav.no/oauth2/login?redirect=/familie/sykdom-i-familien/soknad/pleiepenger/soknad",
         "INNSYN_URL": "https://sif-innsyn.dev.nav.no/familie/sykdom-i-familien/soknad/innsyn/",
         "NYNORSK": "on",
         "INNSYN": "on",
@@ -23,7 +26,9 @@
         "APPSTATUS_DATASET": "staging",
         "USE_AMPLITUDE": "true",
         "FORENKLET_ARBEID": "off",
+        "API_TOKENX_AUDIENCE": "dev-gcp:dusseldorf:k9-brukerdialog-api",
+        "INNSYN_API_TOKENX_AUDIENCE": "dev-gcp:dusseldorf:sif-innsyn-api",
         "NPM_CONFIG_CACHE": "/tmp",
-        "PREUTFYLLING": "false"
+        "PREUTFYLLING": "true"
     }
 }
diff --git a/nais/naiserator.yml b/nais/naiserator.yml
@@ -5,6 +5,8 @@ metadata:
     namespace: {{namespace}}
     labels:
         team: {{team}}
+    annotations:
+        nginx.ingress.kubernetes.io/proxy-body-size: "100M"    
 spec:
     image: {{ image }}
     port: 8080
@@ -48,4 +50,10 @@ spec:
   {{#each env}}
      - name: {{@key}}
        value: "{{this}}"
-    {{/each}}
+    {{/each}}
+    tokenx:
+        enabled: true
+    idporten:
+        enabled: true
+        sidecar:
+            enabled: true
diff --git a/nais/prod-gcp.json b/nais/prod-gcp.json
@@ -10,10 +10,14 @@
     "livenessPath": "/familie/sykdom-i-familien/soknad/pleiepenger/health/isAlive",
     "readinessPath": "/familie/sykdom-i-familien/soknad/pleiepenger/health/isReady",
     "env": {
-        "DEKORATOR_URL": "https://www.nav.no/dekoratoren/?simple=true&chatbot=false",
-        "API_URL": "https://pleiepengesoknad-api.nav.no",
+        "DEKORATOR_URL": "https://www.nav.no/dekoratoren/?simple=true&chatbot=false&logoutUrl=https://www.nav.no/familie/sykdom-i-familien/soknad/pleiepenger/oauth2/logout",
+        "API_URL": "https://k9-brukerdialog-api.nav.no",
+        "FRONTEND_VEDLEGG_URL": "https://www.nav.no/familie/sykdom-i-familien/soknad/pleiepenger/api",
+        "FRONTEND_API_PATH": "/familie/sykdom-i-familien/soknad/pleiepenger/api",
+        "FRONTEND_INNSYN_API_PATH": "/familie/sykdom-i-familien/soknad/pleiepenger/innsynapi",
+        "API_URL_INNSYN": "https://sif-innsyn-api.nav.no",
         "PUBLIC_PATH": "/familie/sykdom-i-familien/soknad/pleiepenger",
-        "LOGIN_URL": "https://loginservice.nav.no/login?redirect=https://www.nav.no/familie/sykdom-i-familien/soknad/pleiepenger/soknad",
+        "LOGIN_URL": "https://www.nav.no/familie/sykdom-i-familien/soknad/pleiepenger/oauth2/login?redirect=/familie/sykdom-i-familien/soknad/pleiepenger/soknad",
         "INNSYN_URL": "https://www.nav.no/familie/sykdom-i-familien/soknad/innsyn/",
         "NYNORSK": "off",
         "INNSYN": "on",
@@ -22,6 +26,8 @@
         "APPSTATUS_DATASET": "production",
         "USE_AMPLITUDE": "true",
         "FORENKLET_ARBEID": "off",
+        "API_TOKENX_AUDIENCE": "prod-gcp:dusseldorf:k9-brukerdialog-api",
+        "INNSYN_API_TOKENX_AUDIENCE": "prod-gcp:dusseldorf:sif-innsyn-api",
         "NPM_CONFIG_CACHE": "/tmp",
         "PREUTFYLLING": "false"
     }