Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ Anyway heres wonderwall #266

Closed
wants to merge 3 commits into from
Closed

✨ Anyway heres wonderwall #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b84e2cf
:sparkles: Tester ut oasis for søknader-endepunktet
mrbjoern Feb 13, 2024
1e0b423
:alien: Lager en enkel proxy for ny token exchange mot innsending
mrbjoern Feb 13, 2024
47ff666
fiiiiiikkkksssss
mrbjoern Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions lib/api/simpleProxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import { logger } from '@navikt/aap-felles-utils';
import { getSession } from '@navikt/oasis';
import { randomUUID } from 'crypto';
import { IncomingMessage } from 'http';

const NAV_CALLID = 'Nav-CallId';

interface Opts {
req: IncomingMessage;
audience: string;
url: string;
}

export const simpleProxy = async (opts: Opts) => {
const session = await getSession(opts.req);
const onBehalfOfToken = await session.apiToken(opts.audience);

const requestId = randomUUID();

const response = await fetch(opts.url, {
method: 'GET',
headers: {
Authorization: `Bearer ${onBehalfOfToken}`,
'Content-Type': 'application/json',
[NAV_CALLID]: requestId,
},
});

if (response.ok) {
return await response.json();
}
logger.error(`simpleProxy to ${opts.url} failed with status ${response.status}`);
return undefined;
};
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"@navikt/ds-react": "^5.15.1",
"@navikt/nav-dekoratoren-moduler": "^2.1.5",
"@navikt/next-api-proxy": "^3.4.0",
"@navikt/oasis": "^1.0.2",
"@vercel/otel": "^1.2.1",
"cookie": "^0.6.0",
"date-fns": "^3.3.1",
Expand Down
6 changes: 5 additions & 1 deletion pages/[uuid]/ettersendelse/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@ export const getServerSideProps = beskyttetSide(async (ctx: NextPageContext): Pr
logger.info('getSøknad fra søknad-api feilet:' + e?.toString());
}

const søknaderFraInnsending = await getSøknaderInnsending(bearerToken);
if (ctx.req === undefined) {
throw new Error('Request object is undefined');
}

const søknaderFraInnsending = await getSøknaderInnsending(ctx.req);
const søknadFraInnsending = søknaderFraInnsending.find((søknad) => søknad.innsendingsId === uuid) ?? null;

stopTimer();
Expand Down
18 changes: 13 additions & 5 deletions pages/api/soknader/soknader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,25 @@ import { beskyttetApi, getAccessTokenFromRequest, isMock, logger, tokenXApiProxy
import metrics from 'lib/metrics';
import { InnsendingSøknad, Søknad } from 'lib/types/types';
import { isAfter } from 'date-fns';
import { IncomingMessage } from 'http';
import { simpleProxy } from 'lib/api/simpleProxy';

const handler = beskyttetApi(async (req, res) => {
const accessToken = getAccessTokenFromRequest(req);

const params = {};
const søknader = await getSøknader(params, accessToken);
res.status(200).json(søknader);
});

export const getSøknaderInnsending = async (accessToken?: string): Promise<InnsendingSøknad[]> => {
export const getSøknaderInnsending = async (req: IncomingMessage): Promise<InnsendingSøknad[]> => {
if (isMock()) return mockSøknaderInnsending;
const søknader: InnsendingSøknad[] = await tokenXApiProxy({
const søknader: InnsendingSøknad[] = await simpleProxy({
req,
audience: process.env.INNSENDING_AUDIENCE ?? '',
url: `${process.env.INNSENDING_URL}/innsending/søknader`,
});
/*const søknader: InnsendingSøknad[] = await tokenXApiProxy({
url: `${process.env.INNSENDING_URL}/innsending/søknader`,
prometheusPath: '/innsending/soeknader',
method: 'GET',
Expand All @@ -22,11 +30,11 @@ export const getSøknaderInnsending = async (accessToken?: string): Promise<Inns
logger: logger,
metricsStatusCodeCounter: metrics.backendApiStatusCodeCounter,
metricsTimer: metrics.backendApiDurationHistogram,
});
});*/
return søknader.sort((a, b) => (isAfter(new Date(a.mottattDato), new Date(b.mottattDato)) ? -1 : 1));
};

export const getSøknader = async (params: Record<string, string>, accessToken?: string): Promise<Array<Søknad>> => {
export const getSøknader = async (params: Record<string, string>, bearerToken?: string): Promise<Array<Søknad>> => {
if (isMock()) return mockSøknader;
const urlParams = Object.entries(params)
.map(([key, value]) => `${key}=${value}`)
Expand All @@ -36,7 +44,7 @@ export const getSøknader = async (params: Record<string, string>, accessToken?:
prometheusPath: '/oppslag/soeknader',
method: 'GET',
audience: process.env.SOKNAD_API_AUDIENCE ?? '',
bearerToken: accessToken,
bearerToken: bearerToken,
logger: logger,
metricsStatusCodeCounter: metrics.backendApiStatusCodeCounter,
metricsTimer: metrics.backendApiDurationHistogram,
Expand Down
6 changes: 5 additions & 1 deletion pages/ettersendelse.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,18 @@ const Ettersendelse = () => {
};

export const getServerSideProps = beskyttetSide(async (ctx: NextPageContext): Promise<GetServerSidePropsResult<{}>> => {
if (ctx.req === undefined) {
throw new Error('Request object is undefined');
}

const stopTimer = metrics.getServersidePropsDurationHistogram.startTimer({
path: '/ettersendelse',
});
const bearerToken = getAccessToken(ctx);
const params = { page: '0', size: '1', sort: 'created,desc' };
const søknader = await getSøknader(params, bearerToken);
const søknad = søknader[0];
const søknaderFraInnsending = await getSøknaderInnsending(bearerToken);
const søknaderFraInnsending = await getSøknaderInnsending(ctx.req);
const søknadFraInnsending = søknaderFraInnsending.length > 0 ? søknaderFraInnsending[0] : undefined;

stopTimer();
Expand Down
6 changes: 5 additions & 1 deletion pages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,13 @@ export const getServerSideProps = beskyttetSide(async (ctx: NextPageContext): Pr
const bearerToken = getAccessToken(ctx);
const params = { page: '0', size: '1', sort: 'created,desc' };

if (ctx.req === undefined) {
throw new Error('Request object is undefined');
}

const [søknader, innsendingSøknader] = await Promise.all([
getSøknader(params, bearerToken),
getSøknaderInnsending(bearerToken),
getSøknaderInnsending(ctx.req),
]);

let sisteSøknadInnsending;
Expand Down
3 changes: 2 additions & 1 deletion pages/soknader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,9 @@ const Søknader = ({ søknader }: PageProps) => {
};

export const getServerSideProps = beskyttetSide(async (ctx: NextPageContext): Promise<GetServerSidePropsResult<{}>> => {
const stopTimer = metrics.getServersidePropsDurationHistogram.startTimer({ path: '/soknader' });
const bearerToken = getAccessToken(ctx);

const stopTimer = metrics.getServersidePropsDurationHistogram.startTimer({ path: '/soknader' });
const params = { page: '0', size: '200', sort: 'created,desc' };
const søknader = await getSøknader(params, bearerToken);

Expand Down
53 changes: 51 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1025,6 +1025,17 @@
resolved "https://npm.pkg.github.com/download/@navikt/next-api-proxy/3.4.0/b0ec19f54b1f153ed3f91e6f513ba97d146c6f01#b0ec19f54b1f153ed3f91e6f513ba97d146c6f01"
integrity sha512-qXCa0BOFPIvjAFC6ieMC71EKzc5mlVc/0OvUgC0DdeKxyokr+wuQWWrHYwPnToz2uEejv2m80IH6O4cw5hW1dQ==

"@navikt/oasis@^1.0.2":
version "1.0.2"
resolved "https://npm.pkg.github.com/download/@navikt/oasis/1.0.2/cb08df82a47d0974664b754d7edcc9de6186af2d#cb08df82a47d0974664b754d7edcc9de6186af2d"
integrity sha512-hulG/us829LQLZX8QIxW0g7iSwRMb56Swg/hNGnAgWpSl/Np5xIzKPWx5nC4xoFlqbEDUQ0ZWScUgjJr1ePoBw==
dependencies:
jose "^5.2.0"
lodash.memoize "^4.1.2"
openid-client "^5.6.4"
optionalDependencies:
prom-client ">=15"

"@next/env@14.1.0":
version "14.1.0"
resolved "https://registry.yarnpkg.com/@next/env/-/env-14.1.0.tgz#43d92ebb53bc0ae43dcc64fb4d418f8f17d7a341"
Expand Down Expand Up @@ -1122,7 +1133,7 @@
resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.4.1.tgz#ff22eb2e5d476fbc2450a196e40dd243cc20c28f"
integrity sha512-O2yRJce1GOc6PAy3QxFM4NzFiWzvScDC1/5ihYBL6BUEVdq0XMWN01sppE+H6bBXbaFYipjwFLEWLg5PaSOThA==

"@opentelemetry/api@^1.7.0":
"@opentelemetry/api@^1.4.0", "@opentelemetry/api@^1.7.0":
version "1.7.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.7.0.tgz#b139c81999c23e3c8d3c0a7234480e945920fc40"
integrity sha512-AdY5wvN0P2vXBi3b29hxZgSFvdhdxPB9+f0B6s//P9Q8nibRWeA3cHm8UmLpio9ABigkVHJ5NMPk+Mz8VCCyrw==
Expand Down Expand Up @@ -4972,6 +4983,16 @@ jose@^4.10.0, jose@^4.11.1:
resolved "https://registry.npmjs.org/jose/-/jose-4.11.1.tgz"
integrity sha512-YRv4Tk/Wlug8qicwqFNFVEZSdbROCHRAC6qu/i0dyNKr5JQdoa2pIGoS04lLO/jXQX7Z9omoNewYIVIxqZBd9Q==

jose@^4.15.4:
version "4.15.4"
resolved "https://registry.yarnpkg.com/jose/-/jose-4.15.4.tgz#02a9a763803e3872cf55f29ecef0dfdcc218cc03"
integrity sha512-W+oqK4H+r5sITxfxpSU+MMdr/YSWGvgZMQDIsNoBDGGy4i7GBPTtvFKibQzW06n3U3TqHjhvBJsirShsEJ6eeQ==

jose@^5.2.0:
version "5.2.2"
resolved "https://registry.yarnpkg.com/jose/-/jose-5.2.2.tgz#b91170e9ba6dbe609b0c0a86568f9a1fbe4335c0"
integrity sha512-/WByRr4jDcsKlvMd1dRJnPfS1GVO3WuKyaurJ/vvXcOaUQO8rnNObCQMlv/5uCceVQIq5Q4WLF44ohsdiTohdg==

"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
Expand Down Expand Up @@ -5225,6 +5246,11 @@ lodash.camelcase@^4.3.0:
resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==

lodash.memoize@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==

lodash.merge@4.6.2, lodash.merge@^4.6.2:
version "4.6.2"
resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
Expand Down Expand Up @@ -5471,7 +5497,7 @@ object-assign@^4.1.1:
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==

object-hash@^2.0.1:
object-hash@^2.0.1, object-hash@^2.2.0:
version "2.2.0"
resolved "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz"
integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==
Expand Down Expand Up @@ -5578,6 +5604,11 @@ oidc-token-hash@^5.0.1:
resolved "https://registry.npmjs.org/oidc-token-hash/-/oidc-token-hash-5.0.1.tgz"
integrity sha512-EvoOtz6FIEBzE+9q253HsLCVRiK/0doEJ2HCvvqMQb3dHZrP3WlJKYtJ55CRTw4jmYomzH4wkPuCj/I3ZvpKxQ==

oidc-token-hash@^5.0.3:
version "5.0.3"
resolved "https://registry.yarnpkg.com/oidc-token-hash/-/oidc-token-hash-5.0.3.tgz#9a229f0a1ce9d4fc89bcaee5478c97a889e7b7b6"
integrity sha512-IF4PcGgzAr6XXSff26Sk/+P4KZFJVuHAJZj3wgO3vX2bMdNVp/QXTP3P7CEm9V1IdG8lDLY3HhiqpsE/nOwpPw==

on-exit-leak-free@^2.1.0:
version "2.1.0"
resolved "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-2.1.0.tgz"
Expand Down Expand Up @@ -5631,6 +5662,16 @@ openid-client@^5.3.1:
object-hash "^2.0.1"
oidc-token-hash "^5.0.1"

openid-client@^5.6.4:
version "5.6.4"
resolved "https://registry.yarnpkg.com/openid-client/-/openid-client-5.6.4.tgz#b2c25e6d5338ba3ce00e04341bb286798a196177"
integrity sha512-T1h3B10BRPKfcObdBklX639tVz+xh34O7GjofqrqiAQdm7eHsQ00ih18x6wuJ/E6FxdtS2u3FmUGPDeEcMwzNA==
dependencies:
jose "^4.15.4"
lru-cache "^6.0.0"
object-hash "^2.2.0"
oidc-token-hash "^5.0.3"

optionator@^0.9.3:
version "0.9.3"
resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
Expand Down Expand Up @@ -5868,6 +5909,14 @@ process-warning@^2.0.0:
resolved "https://registry.npmjs.org/process-warning/-/process-warning-2.0.0.tgz"
integrity sha512-+MmoAXoUX+VTHAlwns0h+kFUWFs/3FZy+ZuchkgjyOu3oioLAo2LB5aCfKPh2+P9O18i3m43tUEv3YqttSy0Ww==

prom-client@>=15:
version "15.1.0"
resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-15.1.0.tgz#816a4a2128da169d0471093baeccc6d2f17a4613"
integrity sha512-cCD7jLTqyPdjEPBo/Xk4Iu8jxjuZgZJ3e/oET3L+ZwOuap/7Cw3dH/TJSsZKs1TQLZ2IHpIlRAKw82ef06kmMw==
dependencies:
"@opentelemetry/api" "^1.4.0"
tdigest "^0.1.1"

prom-client@^14.1.0:
version "14.1.0"
resolved "https://registry.npmjs.org/prom-client/-/prom-client-14.1.0.tgz"
Expand Down
Loading