Merge branch 'master' into TAG-2154_tokenx_pam

navikt · Sep 1, 2023 · 121b5e4 · 121b5e4
2 parents c3defa8 + e7c1d24
commit 121b5e4
Show file tree

Hide file tree

Showing 31 changed files with 1,174 additions and 914 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -22,6 +22,11 @@ on:
 
 jobs:
   analyze:
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
     name: Analyze
     runs-on: ubuntu-latest
 
@@ -35,11 +40,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +55,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -64,4 +69,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
diff --git a/nais/dev-gcp.yaml b/nais/dev-gcp.yaml
@@ -32,14 +32,8 @@ spec:
   env:
     - name: NODE_EXTRA_CA_CERTS
       value: /etc/ssl/ca-bundle.pem
-    - name: BACKEND_API_URL
-      value: http://min-side-arbeidsgiver-api.fager
     - name: LOGIN_URL
       value: https://arbeidsgiver.intern.dev.nav.no/min-side-arbeidsgiver/oauth2/login
-    - name: PROXY_LOG_LEVEL
-      value: debug
-    - name: BRUKER_API_URL
-      value: http://notifikasjon-bruker-api.fager.svc.cluster.local
     - name: GIT_COMMIT
       value: {{commit}}
     - name: MILJO

diff --git a/nais/experimental-labs-gcp.yaml b/nais/experimental-labs-gcp.yaml
@@ -26,14 +26,8 @@ spec:
   env:
     - name: NODE_EXTRA_CA_CERTS
       value: /etc/ssl/ca-bundle.pem
-    - name: BACKEND_API_URL
-      value: http://demo-min-side-arbeidsgiver-api.fager
     - name: LOGIN_URL
       value: https://arbeidsgiver.ekstern.dev.nav.no/fake-login/login?issuer=selvbetjening&sub=123456789&domain=ekstern.dev.nav.no&redirect=https://arbeidsgiver-dev-lik.ekstern.dev.nav.no/min-side-arbeidsgiver/
-    - name: PROXY_LOG_LEVEL
-      value: debug
-    - name: BRUKER_API_URL
-      value: http://localhost:8081
     - name: GIT_COMMIT
       value: {{commit}}
     - name: MILJO

diff --git a/nais/labs-gcp.yaml b/nais/labs-gcp.yaml
@@ -26,14 +26,8 @@ spec:
   env:
     - name: NODE_EXTRA_CA_CERTS
       value: /etc/ssl/ca-bundle.pem
-    - name: BACKEND_API_URL
-      value: http://demo-min-side-arbeidsgiver-api.fager
     - name: LOGIN_URL
       value: https://arbeidsgiver.ekstern.dev.nav.no/fake-login/login?issuer=selvbetjening&sub=123456789&domain=arbeidsgiver.ekstern.dev.nav.no&redirect=https://arbeidsgiver.ekstern.dev.nav.no/min-side-arbeidsgiver/
-    - name: PROXY_LOG_LEVEL
-      value: debug
-    - name: BRUKER_API_URL
-      value: http://localhost:8081
     - name: GIT_COMMIT
       value: {{commit}}
     - name: MILJO

diff --git a/nais/prod-gcp.yaml b/nais/prod-gcp.yaml
@@ -32,14 +32,8 @@ spec:
   env:
     - name: NODE_EXTRA_CA_CERTS
       value: /etc/ssl/ca-bundle.pem
-    - name: BACKEND_API_URL
-      value: http://min-side-arbeidsgiver-api.fager
     - name: LOGIN_URL
       value: https://arbeidsgiver.nav.no/min-side-arbeidsgiver/oauth2/login
-    - name: PROXY_LOG_LEVEL
-      value: debug
-    - name: BRUKER_API_URL
-      value: http://notifikasjon-bruker-api.fager.svc.cluster.local
     - name: GIT_COMMIT
       value: {{commit}}
     - name: MILJO

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,8 +6,8 @@
     "homepage": "/min-side-arbeidsgiver",
     "dependencies": {
         "@navikt/aksel-icons": "^4.9.0",
-        "@navikt/arbeidsgiver-notifikasjon-widget": "6.3.8",
-        "@navikt/bedriftsmeny": "6.10.0",
+        "@navikt/arbeidsgiver-notifikasjon-widget": "6.3.9",
+        "@navikt/bedriftsmeny": "6.10.2",
         "@navikt/ds-css": "^4.9.0",
         "@navikt/ds-icons": "3.4.3",
         "@navikt/ds-react": "^4.9.0",
@@ -46,6 +46,7 @@
         "react-tooltip": "^4.2.13",
         "regenerator-runtime": "^0.13.7",
         "smoothscroll-polyfill": "^0.4.4",
+        "swr": "^2.2.2",
         "typescript": "4.5.4",
         "uuid": "^9.0.0",
         "whatwg-fetch": "^3.6.2",

diff --git a/server/mock/altinnMeldingsboksMock.js b/server/mock/altinnMeldingsboksMock.js
@@ -1,9 +1,9 @@
-import {OrganisasjonerResponse} from './altinnMock.js';
+import { OrganisasjonerResponse } from './userInfoMock.js';
 
 const reportees = {
     _links: {},
     _embedded: {
-        reportees: OrganisasjonerResponse.map(org => ({
+        reportees: OrganisasjonerResponse.map((org) => ({
             ...org,
             _links: {
                 self: {
@@ -25,7 +25,7 @@ let getRandomInt = (min, max) => {
 
 let randomStatus = () => (Math.random() < 0.5 ? 'Ulest' : 'Lest');
 
-const uniqueMessageId = (id => () => {
+const uniqueMessageId = ((id) => () => {
     id += 1;
     return `r${id}`;
 })(0);
@@ -59,8 +59,7 @@ const randomMessage = (org) => {
                 href: '/min-side-arbeidsgiver/mock/tt02.altinn.no/api/r50179335/messages/a9069768',
             },
             portalview: {
-                href:
-                    '/min-side-arbeidsgiver/mock/tt02.altinn.no/Pages/ServiceEngine/Correspondence/Correspondences.aspx?ReporteeElementID=9069768&ESC=5562&ESEC=1',
+                href: '/min-side-arbeidsgiver/mock/tt02.altinn.no/Pages/ServiceEngine/Correspondence/Correspondences.aspx?ReporteeElementID=9069768&ESC=5562&ESEC=1',
             },
             metadata: {
                 href: '/min-side-arbeidsgiver/mock/tt02.altinn.no/api/metadata/correspondence/5562/1',
@@ -79,7 +78,7 @@ const randomMessages = (org) => {
 };
 
 let allMessages = {};
-OrganisasjonerResponse.forEach(org => {
+OrganisasjonerResponse.forEach((org) => {
     allMessages[`reportee${org.OrganizationNumber}`] = {
         _links: {
             portalview: {
@@ -100,10 +99,10 @@ const getMessagesForReportee = (reporteeId) => {
 };
 
 export const mock = (app) => {
-        app.use('/min-side-arbeidsgiver/mock/tt02.altinn.no/api/reportees', (req, res) => {
-            res.send(reportees);
-        });
-        app.use(`/min-side-arbeidsgiver/mock/tt02.altinn.no/api/:id/messages`, (req, res) => {
-            res.send(getMessagesForReportee(req.params.id));
-        });
-    }
+    app.use('/min-side-arbeidsgiver/mock/tt02.altinn.no/api/reportees', (req, res) => {
+        res.send(reportees);
+    });
+    app.use(`/min-side-arbeidsgiver/mock/tt02.altinn.no/api/:id/messages`, (req, res) => {
+        res.send(getMessagesForReportee(req.params.id));
+    });
+};
diff --git a/server/mock/antallArbeidsforholdMock.js b/server/mock/antallArbeidsforholdMock.js
@@ -1,9 +1,12 @@
 export const mock = (app) => {
-    app.use('/min-side-arbeidsgiver/antall-arbeidsforhold', (req, res) => {
-        const antall = 502;
-        const missing = Math.floor(Math.random() * 10) === 0;
-        setTimeout(() => {
-            res.send({ first: '131488434', second: missing ? -1 : antall });
-        }, 1000);
-    });
+    app.use(
+        '/min-side-arbeidsgiver/arbeidsgiver-arbeidsforhold-api/antall-arbeidsforhold',
+        (req, res) => {
+            const antall = 502;
+            const missing = Math.floor(Math.random() * 10) === 0;
+            setTimeout(() => {
+                res.send({ first: '131488434', second: missing ? -1 : antall });
+            }, 1000);
+        }
+    );
 };