Skip to content

feat: support session cookies #66

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.

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
3 changes: 2 additions & 1 deletion lib/__tests__/sdk/oauth2-flows/ClientCredentials.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ describe('ClientCredentials', () => {
sessionManager,
mockAccessToken,
'access_token',
validationDetails
validationDetails,
'persistent'
);

const client = new ClientCredentials(clientConfig);
Expand Down
9 changes: 6 additions & 3 deletions lib/__tests__/sdk/utilities/token-utils.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ describe('token-utils', () => {
sessionManager,
mockAccessToken,
'access_token',
validationDetails
validationDetails,
'persistent'
);
expect(await sessionManager.getSessionItem('access_token')).toBe(
mockAccessToken
Expand All @@ -79,7 +80,8 @@ describe('token-utils', () => {
sessionManager,
mockAccessToken,
'access_token',
validationDetails
validationDetails,
'persistent'
);
};
await expect(commitTokenFn).rejects.toBeInstanceOf(KindeSDKError);
Expand All @@ -96,7 +98,8 @@ describe('token-utils', () => {
sessionManager,
mockIdToken,
'id_token',
validationDetails
validationDetails,
'persistent'
);

const storedUser = await getUserFromSession(sessionManager, validationDetails);
Expand Down
13 changes: 10 additions & 3 deletions lib/sdk/oauth2-flows/ClientCredentials.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createLocalJWKSet } from 'jose';
import { createLocalJWKSet, jwtVerify } from 'jose';
import { type SessionManager } from '../session-managers/index.js';
import * as utilities from '../utilities/index.js';
import { getSDKHeader } from '../version.js';
Expand Down Expand Up @@ -54,13 +54,20 @@ export class ClientCredentials {
if (accessToken && !isTokenExpired) {
return accessToken;
}

const payload = await this.fetchAccessTokenFor(sessionManager);

const key = await this.tokenValidationDetails.keyProvider();
const result = await jwtVerify(payload.access_token, key);

const sessionType =
result.payload.ksp === 'non_persistent' ? 'session' : 'persistent';

await utilities.commitTokenToSession(
sessionManager,
payload.access_token,
'access_token',
this.tokenValidationDetails
this.tokenValidationDetails,
sessionType
);
return payload.access_token;
}
Expand Down
6 changes: 5 additions & 1 deletion lib/sdk/session-managers/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ type Awaitable<T> = Promise<T>;

export interface SessionManager {
getSessionItem: <T = unknown>(itemKey: string) => Awaitable<T | unknown | null>;
setSessionItem: <T = unknown>(itemKey: string, itemValue: T) => Awaitable<void>;
setSessionItem: <T = unknown>(
itemKey: string,
itemValue: T,
sessionType?: string
) => Awaitable<void>;
removeSessionItem: (itemKey: string) => Awaitable<void>;
destroySession: () => Awaitable<void>;
}
20 changes: 15 additions & 5 deletions lib/sdk/utilities/token-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ export const commitTokenToSession = async (
sessionManager: SessionManager,
token: string,
type: TokenType,
validationDetails: TokenValidationDetailsType
validationDetails: TokenValidationDetailsType,
sessionType: string
): Promise<void> => {
if (!token) {
await sessionManager.removeSessionItem(type);
Expand All @@ -37,7 +38,7 @@ export const commitTokenToSession = async (
}
}

await sessionManager.setSessionItem(type, token);
await sessionManager.setSessionItem(type, token, sessionType);
};

/**
Expand All @@ -51,24 +52,33 @@ export const commitTokensToSession = async (
tokens: TokenCollection,
validationDetails: TokenValidationDetailsType
): Promise<void> => {
const key = await validationDetails.keyProvider();
const result = await jwtVerify(tokens.access_token, key);

const sessionType =
result.payload.ksp === 'non_persistent' ? 'session' : 'persistent';

await Promise.all([
commitTokenToSession(
sessionManager,
tokens.refresh_token,
'refresh_token',
validationDetails
validationDetails,
sessionType
),
commitTokenToSession(
sessionManager,
tokens.access_token,
'access_token',
validationDetails
validationDetails,
sessionType
),
commitTokenToSession(
sessionManager,
tokens.id_token,
'id_token',
validationDetails
validationDetails,
sessionType
),
]);
};
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"postbuild": "node sdk-version.js clean && ncp ./package-cjs.json ./dist-cjs/package.json && ncp ./package-esm.json ./dist/package.json",
"prebuild": "node sdk-version.js && rimraf dist dist-cjs lib/models lib/apis",
"lint": "eslint . && prettier . --check",
"lint:fix": "eslint --fix . && prettier . --check",
"lint:fix": "eslint --fix . && prettier . --write",
"test": "jest --passWithNoTests",
"lint-staged": "lint-staged",
"husky": "husky install",
Expand Down