Skip to content

Add idToken to TokenSet in SessionData #1978

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

Merged
arpit-jn merged 3 commits into from
Mar 28, 2025
+18 −1
Merged

Add idToken to TokenSet in SessionData #1978

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7dacab8
feat: add idToken support in AuthClient
kenkoooo Feb 20, 2025
65dbf98
added exampple to access id_token
tusharpandey13 Mar 28, 2025
ca1b5c2
Merge branch 'main' into feature/idtoken-in-tokenset
tusharpandey13 Mar 28, 2025
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
6 changes: 6 additions & 0 deletions src/server/auth-client.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2182,6 +2182,7 @@ ca/T0LLtgmbMmxSv/MmzIg==
tokenSet: {
accessToken: DEFAULT.accessToken,
refreshToken: DEFAULT.refreshToken,
idToken: expect.stringMatching(/^eyJhbGciOiJSUzI1NiJ9\..+\..+$/),
expiresAt: expect.any(Number)
},
internal: {
Expand Down Expand Up @@ -2289,6 +2290,7 @@ ca/T0LLtgmbMmxSv/MmzIg==
},
tokenSet: {
accessToken: DEFAULT.accessToken,
idToken: expect.any(String),
refreshToken: DEFAULT.refreshToken,
expiresAt: expect.any(Number)
},
Expand Down Expand Up @@ -2633,6 +2635,7 @@ ca/T0LLtgmbMmxSv/MmzIg==
tokenSet: {
accessToken: DEFAULT.accessToken,
refreshToken: DEFAULT.refreshToken,
idToken: expect.any(String),
expiresAt: expect.any(Number)
},
internal: {
Expand Down Expand Up @@ -3026,6 +3029,7 @@ ca/T0LLtgmbMmxSv/MmzIg==
tokenSet: {
accessToken: DEFAULT.accessToken,
refreshToken: DEFAULT.refreshToken,
idToken: expect.any(String),
expiresAt: expect.any(Number)
},
internal: {
Expand Down Expand Up @@ -3120,6 +3124,7 @@ ca/T0LLtgmbMmxSv/MmzIg==
tokenSet: {
accessToken: DEFAULT.accessToken,
refreshToken: DEFAULT.refreshToken,
idToken: expect.any(String),
expiresAt: expect.any(Number)
},
internal: {
Expand Down Expand Up @@ -3249,6 +3254,7 @@ ca/T0LLtgmbMmxSv/MmzIg==
tokenSet: {
accessToken: DEFAULT.accessToken,
refreshToken: DEFAULT.refreshToken,
idToken: expect.any(String),
expiresAt: expect.any(Number)
},
internal: {
Expand Down
3 changes: 2 additions & 1 deletion src/server/auth-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,7 @@ export class AuthClient {
user: idTokenClaims,
tokenSet: {
accessToken: oidcRes.access_token,
idToken: oidcRes.id_token,
scope: oidcRes.scope,
refreshToken: oidcRes.refresh_token,
expiresAt: Math.floor(Date.now() / 1000) + Number(oidcRes.expires_in)
Expand Down Expand Up @@ -565,7 +566,6 @@ export class AuthClient {
}
);
}

const res = NextResponse.json({
token: updatedTokenSet.accessToken,
scope: updatedTokenSet.scope,
Expand Down Expand Up @@ -684,6 +684,7 @@ export class AuthClient {
const updatedTokenSet = {
...tokenSet, // contains the existing `iat` claim to maintain the session lifetime
accessToken: oauthRes.access_token,
idToken: oauthRes.id_token,
expiresAt: accessTokenExpiresAt
};

Expand Down
1 change: 1 addition & 0 deletions src/types/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export interface TokenSet {
accessToken: string;
idToken?: string;
scope?: string;
refreshToken?: string;
expiresAt: number; // the time at which the access token expires in seconds since epoch
Expand Down