Skip to content

Commit a06451e

Browse files
frodehansen2frodehansen2
authored
Pakkeoppdateringer - aksel ds-6 versjoner (#1661)
* Oppdatere til ds-6 pakker * Changeset og oppdatere versjoner
1 parent fc94211 commit a06451e

File tree

52 files changed

+434
-252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+434
-252
lines changed

Diff for: ‎apps/dine-pleiepenger/CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# @navikt/dine-pleiepenger
22

3+
## 0.5.18
4+
5+
### Patch Changes
6+
7+
- Oppdatering til navikt/ds-6 versjoner
8+
- Updated dependencies
9+
- @navikt/appstatus-react-ds@2.17.26
10+
- @navikt/sif-common-core-ds@9.15.9
11+
312
## 0.5.17
413

514
### Patch Changes

Diff for: ‎apps/dine-pleiepenger/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@navikt/dine-pleiepenger",
3-
"version": "0.5.17",
3+
"version": "0.5.18",
44
"private": true,
55
"scripts": {
66
"build-storybook": "storybook build",
@@ -15,8 +15,8 @@
1515
"dependencies": {
1616
"@navikt/appstatus-react-ds": "workspace: *",
1717
"@navikt/nav-dekoratoren-moduler": "2.1.6",
18-
"@navikt/next-auth-wonderwall": "1.6.0",
19-
"@navikt/next-logger": "1.21.0",
18+
"@navikt/next-logger": "1.23.0",
19+
"@navikt/oasis": "3.2.2",
2020
"@navikt/sif-app-register": "workspace: *",
2121
"@navikt/sif-common-amplitude": "workspace: *",
2222
"@navikt/sif-common-core-ds": "workspace: *",
@@ -25,7 +25,7 @@
2525
"axios": "1.6.7",
2626
"jsonwebtoken": "9.0.2",
2727
"next": "14.1.3",
28-
"next-logger": "3.0.2",
28+
"next-logger": "4.0.0",
2929
"node-jose": "2.2.0",
3030
"react": "18.2.0",
3131
"react-dom": "18.2.0",
@@ -36,10 +36,10 @@
3636
},
3737
"devDependencies": {
3838
"@axe-core/playwright": "4.8.5",
39-
"@navikt/ds-css": "5.18.1",
39+
"@navikt/ds-css": "6.1.1",
4040
"@navikt/ds-icons": "3.4.3",
41-
"@navikt/ds-react": "5.18.1",
42-
"@navikt/ds-tailwind": "5.18.1",
41+
"@navikt/ds-react": "6.1.1",
42+
"@navikt/ds-tailwind": "6.1.1",
4343
"@next/bundle-analyzer": "14.1.3",
4444
"@playwright/test": "1.42.1",
4545
"@storybook/addon-essentials": "7.6.17",

Diff for: ‎apps/dine-pleiepenger/src/auth/withAuthentication.ts

+18-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { validateIdportenToken } from '@navikt/next-auth-wonderwall';
1+
import { getToken, validateToken } from '@navikt/oasis';
22
import { logger } from '@navikt/next-logger';
33
import { IncomingHttpHeaders } from 'http';
44
import { GetServerSidePropsContext, GetServerSidePropsResult, NextApiRequest, NextApiResponse } from 'next';
@@ -50,10 +50,8 @@ export function withAuthenticatedPage(handler: PageHandler = defaultPageHandler)
5050
return handler(context);
5151
}
5252

53-
const request = context.req;
54-
55-
const bearerToken: string | null | undefined = request.headers['authorization'];
56-
if (!bearerToken) {
53+
const token = getToken(context.req);
54+
if (token === null) {
5755
return {
5856
redirect: {
5957
destination: browserEnv.NEXT_PUBLIC_LOGIN_URL,
@@ -62,14 +60,13 @@ export function withAuthenticatedPage(handler: PageHandler = defaultPageHandler)
6260
},
6361
};
6462
}
65-
66-
const validationResult = await validateIdportenToken(bearerToken);
67-
if (validationResult !== 'valid') {
63+
const validationResult = await validateToken(token);
64+
if (!validationResult.ok) {
6865
const error = new Error(
69-
`Invalid JWT token found (cause: ${validationResult.errorType} ${validationResult.message}, redirecting to login.`,
66+
`Invalid JWT token found (cause: ${validationResult.errorType} ${validationResult.error.message}, redirecting to login.`,
7067
{ cause: validationResult.error },
7168
);
72-
if (validationResult.errorType === 'NOT_ACR_LEVEL4') {
69+
if (validationResult.errorType === 'token expired') {
7370
logger.warn(error);
7471
} else {
7572
logger.error(error);
@@ -92,12 +89,17 @@ export function withAuthenticatedApi(handler: ApiHandler): ApiHandler {
9289
return handler(req, res, ...rest);
9390
}
9491

95-
const bearerToken: string | null | undefined = req.headers['authorization'];
96-
const validatedToken = bearerToken ? await validateIdportenToken(bearerToken) : null;
97-
if (!bearerToken || validatedToken !== 'valid') {
98-
if (validatedToken && validatedToken !== 'valid') {
99-
logger.error(`Invalid JWT token found (cause: ${validatedToken.message} for API ${req.url}`);
100-
}
92+
const token = getToken(req);
93+
if (token == null) {
94+
logger.error(`JWT-less request for API ${req.url}`);
95+
res.status(401).json({ message: 'Access denied' });
96+
return;
97+
}
98+
99+
const validatedToken = await validateToken(token);
100+
101+
if (!validatedToken.ok) {
102+
logger.error(`Invalid JWT token found (cause: ${validatedToken.error.message} for API ${req.url}`);
101103
res.status(401).json({ message: 'Access denied' });
102104
return;
103105
}

Diff for: ‎apps/dine-pleiepenger/src/components/error-boundary/ErrorBoundary.tsx

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ContentContainer } from '@navikt/ds-react';
1+
import { Page } from '@navikt/ds-react';
22
import { Component, ErrorInfo, PropsWithChildren, ReactNode } from 'react';
33
import { createChildLogger } from '@navikt/next-logger';
44
import { getUserRequestId } from '../../utils/userRequestId';
@@ -35,9 +35,11 @@ class ErrorBoundary extends Component<PropsWithChildren, State> {
3535
render(): ReactNode {
3636
if (this.state.hasError) {
3737
return (
38-
<ContentContainer>
39-
<ErrorFallback />
40-
</ContentContainer>
38+
<Page>
39+
<Page.Block width="xl">
40+
<ErrorFallback />
41+
</Page.Block>
42+
</Page>
4143
);
4244
}
4345

Diff for: ‎apps/dine-pleiepenger/src/pages/_app.page.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ReactElement } from 'react';
33
import { IntlProvider } from 'react-intl';
44
import { InnsynPsbApp } from '@navikt/sif-app-register';
55
import { AmplitudeProvider } from '@navikt/sif-common-amplitude';
6-
import { AxiosError } from 'axios';
6+
import axios, { AxiosError } from 'axios';
77
import { AppProps } from 'next/app';
88
import Head from 'next/head';
99
import useSWR from 'swr';
@@ -16,14 +16,15 @@ import { Innsynsdata } from '../types/InnsynData';
1616
import appSentryLogger from '../utils/appSentryLogger';
1717
import { browserEnv } from '../utils/env';
1818
import { messages } from '../utils/message';
19-
import { innsynsdataFetcher } from './api/innsynsdata.api';
2019
import UnavailablePage from './unavailable.page';
2120
import 'react-loading-skeleton/dist/skeleton.css';
2221
import '../components/process/process.css';
2322
import '../style/global.css';
2423

2524
export const APPLICATION_KEY = 'sif-innsyn';
2625

26+
const innsynsdataFetcher = async (url: string): Promise<Innsynsdata> => axios.get(url).then((res) => res.data);
27+
2728
function MyApp({ Component, pageProps }: AppProps): ReactElement {
2829
const { data, error, isLoading } = useSWR<Innsynsdata, AxiosError>(
2930
`${browserEnv.NEXT_PUBLIC_BASE_PATH}/api/innsynsdata`,

Diff for: ‎apps/dine-pleiepenger/src/pages/api/innsynsdata.api.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { NextApiRequest, NextApiResponse } from 'next';
22
import { createChildLogger } from '@navikt/next-logger';
3-
import axios, { HttpStatusCode } from 'axios';
3+
import { HttpStatusCode } from 'axios';
44
import { withAuthenticatedApi } from '../../auth/withAuthentication';
55
import {
66
fetchSaksbehandlingstid,
@@ -14,8 +14,6 @@ import { getXRequestId } from '../../utils/apiUtils';
1414
import { sortSøknadEtterOpprettetDato } from '../../utils/søknadUtils';
1515
import { Feature } from '../../utils/features';
1616

17-
export const innsynsdataFetcher = async (url: string): Promise<Innsynsdata> => axios.get(url).then((res) => res.data);
18-
1917
async function handler(req: NextApiRequest, res: NextApiResponse) {
2018
const childLogger = createChildLogger(getXRequestId(req));
2119
childLogger.info(`Henter innsynsdata`);

Diff for: ‎apps/dine-pleiepenger/src/server/utils/exchangeTokenPrepRequest.ts

+13-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { grantTokenXOboToken, isInvalidTokenSet } from '@navikt/next-auth-wonderwall';
1+
import { requestOboToken } from '@navikt/oasis';
22
import { createChildLogger } from '@navikt/next-logger';
33
import { browserEnv, getServerEnv, isLocal, ServerEnv } from '../../utils/env';
44
import { ApiService } from '../apiService';
@@ -42,22 +42,27 @@ export const exchangeTokenAndPrepRequest = async (
4242

4343
const { audience, serverUrl } = getAudienceAndServerUrl(service, serverEnv);
4444

45-
let tokenX;
46-
4745
if (!isLocal) {
4846
childLogger.info(`Exchanging token for ${audience}`);
49-
tokenX = await grantTokenXOboToken(context.accessToken, audience);
50-
if (isInvalidTokenSet(tokenX)) {
47+
const tokenX = await requestOboToken(context.accessToken, audience);
48+
if (!tokenX.ok) {
5149
throw new Error(
52-
`Unable to exchange token for dine-pleiepenger-backend token, requestId: ${context.requestId}, reason: ${tokenX.message}`,
50+
`Unable to exchange token for dine-pleiepenger-backend token, requestId: ${context.requestId}, reason: ${tokenX.error.message}`,
5351
);
5452
}
53+
return {
54+
url: `${serverUrl}/${path}`,
55+
headers: {
56+
Authorization: `Bearer ${tokenX.token}`,
57+
'Content-Type': 'application/pdf',
58+
'x-request-id': context.requestId,
59+
'X-K9-Brukerdialog': serverEnv.NAIS_CLIENT_ID!,
60+
},
61+
};
5562
}
56-
5763
return {
5864
url: `${serverUrl}/${path}`,
5965
headers: {
60-
Authorization: `Bearer ${tokenX}`,
6166
'Content-Type': 'application/pdf',
6267
'x-request-id': context.requestId,
6368
'X-K9-Brukerdialog': serverEnv.NAIS_CLIENT_ID!,

Diff for: ‎apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# @navikt/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn
22

3+
## 1.21.30
4+
5+
### Patch Changes
6+
7+
- Oppdatering til navikt/ds-6 versjoner
8+
- Updated dependencies
9+
- @navikt/sif-common-formik-ds@1.7.18
10+
- @navikt/sif-common-soknad-ds@10.13.18
11+
- @navikt/sif-common-core-ds@9.15.9
12+
313
## 1.21.29
414

515
### Patch Changes

Diff for: ‎apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Søknad om ekstra omsorgsdager når den andre forelderen ikke kan ha tilsyn med barn",
44
"license": "MIT",
55
"name": "@navikt/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn",
6-
"version": "1.21.29",
6+
"version": "1.21.30",
77
"repository": "https://github.com/navikt/sif-brukerdialog",
88
"private": true,
99
"type": "module",
@@ -23,9 +23,9 @@
2323
"test": "vitest run"
2424
},
2525
"dependencies": {
26-
"@navikt/ds-css": "5.18.1",
27-
"@navikt/ds-react": "5.18.1",
28-
"@navikt/ds-tailwind": "5.18.1",
26+
"@navikt/ds-css": "6.1.1",
27+
"@navikt/ds-react": "6.1.1",
28+
"@navikt/ds-tailwind": "6.1.1",
2929
"@navikt/sif-app-register": "workspace:*",
3030
"@navikt/sif-common-amplitude": "workspace:*",
3131
"@navikt/sif-common-core-ds": "workspace:*",

Diff for: ‎apps/endringsmelding-pleiepenger/CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# @navikt/endringsmelding-pleiepenger
22

3+
## 2.25.11
4+
5+
### Patch Changes
6+
7+
- Oppdatering til navikt/ds-6 versjoner
8+
- Updated dependencies
9+
- @navikt/sif-common-formik-ds@1.7.18
10+
- @navikt/sif-common-soknad-ds@10.13.18
11+
- @navikt/sif-common-forms-ds@8.19.7
12+
- @navikt/sif-common-core-ds@9.15.9
13+
314
## 2.25.10
415

516
### Patch Changes

Diff for: ‎apps/endringsmelding-pleiepenger/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
"license": "MIT",
66
"name": "@navikt/endringsmelding-pleiepenger",
77
"repository": "https://github.com/navikt/sif-brukerdialog",
8-
"version": "2.25.10",
8+
"version": "2.25.11",
99
"private": true,
1010
"dependencies": {
11-
"@navikt/ds-css": "5.18.1",
11+
"@navikt/ds-css": "6.1.1",
1212
"@navikt/ds-icons": "3.4.3",
13-
"@navikt/ds-react": "5.18.1",
14-
"@navikt/ds-tailwind": "5.18.1",
13+
"@navikt/ds-react": "6.1.1",
14+
"@navikt/ds-tailwind": "6.1.1",
1515
"@navikt/sif-common-amplitude": "workspace:*",
1616
"@navikt/sif-common-core-ds": "workspace:*",
1717
"@navikt/sif-common-formik-ds": "workspace:*",
@@ -52,7 +52,7 @@
5252
"@babel/preset-react": "7.23.3",
5353
"@babel/preset-typescript": "7.23.3",
5454
"@mswjs/data": "0.16.1",
55-
"@navikt/ds-tailwind": "5.18.1",
55+
"@navikt/ds-tailwind": "6.1.1",
5656
"@sentry/vite-plugin": "2.14.3",
5757
"@storybook/addon-actions": "7.6.17",
5858
"@storybook/addon-essentials": "7.6.17",

Diff for: ‎apps/endringsmelding-pleiepenger/src/app/søknad/SøknadStep.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { Accordion } from '@navikt/ds-react';
2-
import AccordionContent from '@navikt/ds-react/esm/accordion/AccordionContent';
3-
import AccordionHeader from '@navikt/ds-react/esm/accordion/AccordionHeader';
4-
import AccordionItem from '@navikt/ds-react/esm/accordion/AccordionItem';
2+
import { AccordionContent, AccordionHeader, AccordionItem } from '@navikt/ds-react/Accordion';
53
import React from 'react';
64
import { useIntl } from 'react-intl';
75
import { useLogSidevisning } from '@navikt/sif-common-amplitude';

Diff for: ‎apps/omsorgsdager-aleneomsorg-dialog/CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# @navikt/omsorgsdager-aleneomsorg-dialog
22

3+
## 2.14.33
4+
5+
### Patch Changes
6+
7+
- Oppdatering til navikt/ds-6 versjoner
8+
- Updated dependencies
9+
- @navikt/sif-common-formik-ds@1.7.18
10+
- @navikt/sif-common-soknad-ds@10.13.18
11+
- @navikt/sif-common-forms-ds@8.19.7
12+
- @navikt/sif-common-core-ds@9.15.9
13+
314
## 2.14.32
415

516
### Patch Changes

Diff for: ‎apps/omsorgsdager-aleneomsorg-dialog/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"license": "MIT",
55
"name": "@navikt/omsorgsdager-aleneomsorg-dialog",
66
"repository": "https://github.com/navikt/sif-brukerdialog",
7-
"version": "2.14.32",
7+
"version": "2.14.33",
88
"private": true,
99
"type": "module",
1010
"scripts": {
@@ -23,9 +23,9 @@
2323
"storybook": "storybook dev -p 6006 -s public"
2424
},
2525
"dependencies": {
26-
"@navikt/ds-css": "5.18.1",
27-
"@navikt/ds-react": "5.18.1",
28-
"@navikt/ds-tailwind": "5.18.1",
26+
"@navikt/ds-css": "6.1.1",
27+
"@navikt/ds-react": "6.1.1",
28+
"@navikt/ds-tailwind": "6.1.1",
2929
"@navikt/sif-app-register": "workspace:*",
3030
"@navikt/sif-common-amplitude": "workspace:*",
3131
"@navikt/sif-common-core-ds": "workspace:*",

Diff for: ‎apps/omsorgsdager-kalkulator/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @navikt/omsorgsdager-kalkulator
22

3+
## 3.5.23
4+
5+
### Patch Changes
6+
7+
- Oppdatering til navikt/ds-6 versjoner
8+
39
## 3.5.22
410

511
### Patch Changes

Diff for: ‎apps/omsorgsdager-kalkulator/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "En kalkulator for beregning av omsorgsdager.",
44
"license": "MIT",
55
"name": "@navikt/omsorgsdager-kalkulator",
6-
"version": "3.5.22",
6+
"version": "3.5.23",
77
"private": true,
88
"scripts": {
99
"dev": "next dev -p 8080",
@@ -14,10 +14,10 @@
1414
"playwright-test": "playwright test"
1515
},
1616
"dependencies": {
17-
"@navikt/ds-css": "5.18.1",
17+
"@navikt/ds-css": "6.1.1",
1818
"@navikt/ds-icons": "3.4.3",
19-
"@navikt/ds-react": "5.18.1",
20-
"@navikt/ds-tailwind": "5.18.1",
19+
"@navikt/ds-react": "6.1.1",
20+
"@navikt/ds-tailwind": "6.1.1",
2121
"@navikt/nav-dekoratoren-moduler": "2.1.6",
2222
"classnames": "2.5.1",
2323
"dayjs": "1.11.10",

0 commit comments

Comments
 (0)