Skip to content

Fix creating Session from tokens #4201

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

Open
NoelDeMartin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix creating Session from tokens #4201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions packages/node/src/Session.static.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { validate } from "uuid";
import type * as Jose from "jose";
import type * as OpenIdClient from "openid-client";
import { Session } from "./Session";
import { randomUUID } from "crypto";

// Camelcase identifiers are required in the OIDC specification.
/* eslint-disable camelcase*/
Expand Down Expand Up @@ -166,9 +167,10 @@ describe("Session static functions", () => {

describe("Session.fromTokens", () => {
it("creates a session with the provided tokens", async () => {
const mockedAccessToken = randomUUID();
const mockedIdToken = await mockIdToken({});
const tokenSet: SessionTokenSet = {
accessToken: "access.token.jwt",
accessToken: mockedAccessToken,
idToken: mockedIdToken,
clientId: mockClientId,
issuer: mockOpConfig().issuer,
Expand All @@ -195,7 +197,9 @@ describe("Session static functions", () => {
}) as typeof fetch;
await session.fetch("https://some.resource");
// @ts-expect-error We know headers is initialized.
expect(headers.get("Authorization")).toBe(`Bearer ${mockedIdToken}`);
expect(headers.get("Authorization")).toBe(
`Bearer ${mockedAccessToken}`,
);
globalThis.fetch = globalFetch;
});

Expand All @@ -207,9 +211,10 @@ describe("Session static functions", () => {
publicKey: await exportJWK(dpopKeyPair.publicKey),
};

const mockedAccessToken = randomUUID();
const mockedIdToken = await mockIdToken({});
const tokenSet: SessionTokenSet = {
accessToken: "access.token.jwt",
accessToken: mockedAccessToken,
idToken: mockedIdToken,
clientId: mockClientId,
issuer: mockOpConfig().issuer,
Expand All @@ -230,7 +235,7 @@ describe("Session static functions", () => {
}) as typeof fetch;
await session.fetch("https://some.resource");
// @ts-expect-error We know headers is initialized.
expect(headers.get("Authorization")).toBe(`DPoP ${mockedIdToken}`);
expect(headers.get("Authorization")).toBe(`DPoP ${mockedAccessToken}`);
// @ts-expect-error We know headers is initialized.
expect(headers.get("dpop")).not.toBeNull();
globalThis.fetch = globalFetch;
Expand Down
4 changes: 2 additions & 2 deletions packages/node/src/Session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,12 +284,12 @@ export class Session implements IHasSessionEventListener {
if (
isExpired ||
webId === undefined ||
sessionTokenSet.idToken === undefined
sessionTokenSet.accessToken === undefined
) {
return session;
}

const fetch = buildAuthenticatedFetch(sessionTokenSet.idToken, {
const fetch = buildAuthenticatedFetch(sessionTokenSet.accessToken, {
dpopKey: sessionTokenSet.dpopKey,
expiresIn: sessionTokenSet.expiresAt
? sessionTokenSet.expiresAt - Date.now()
Expand Down