Skip to content

Commit

Permalink
chore: make it use the prettier config that is there
Browse files Browse the repository at this point in the history
  • Loading branch information
coel committed Jan 12, 2024
1 parent 4a73c0d commit 943f759
Show file tree
Hide file tree
Showing 29 changed files with 426 additions and 555 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/build-test-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ jobs:
matrix:
node-version: [18.x]
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 8
- name: Setting up Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'pnpm'
- name: Enabling pre-post scripts
run: pnpm config set enable-pre-post-scripts true
- run: pnpm install
- run: pnpm build
- run: pnpm test
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 8
- name: Setting up Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'pnpm'
- name: Enabling pre-post scripts
run: pnpm config set enable-pre-post-scripts true
- run: pnpm install
- run: pnpm build
- run: pnpm test
4 changes: 1 addition & 3 deletions .prettier.yml → .prettierrc.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
trailingComma: "es5"
trailingComma: 'es5'
tabWidth: 2
printWidth: 85
useTabs: true
semi: true
singleQuote: true

1 change: 0 additions & 1 deletion generator-config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
templateDir: ./templates
additionalProperties:
artifactId: kinde-typescript-sdk

2 changes: 1 addition & 1 deletion lib/__tests__/mocks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const fetchClient = jest.fn().mockImplementation(
export const getMockAccessToken = (
domain: string = '[email protected]',
isExpired: boolean = false,
isExpClaimMissing: boolean = false,
isExpClaimMissing: boolean = false
) => {
const iat = Math.floor(Date.now() / 1000);
const exp = isExpClaimMissing ? undefined : isExpired ? iat : iat + 1000000;
Expand Down
41 changes: 9 additions & 32 deletions lib/__tests__/sdk/oauth2-flows/AuthCodeWithPKCE.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,8 @@ describe('AuthCodeWitPKCE', () => {
await client.handleRedirectFromAuthDomain(sessionManager, callbackURL);
expect(mocks.fetchClient).toHaveBeenCalledTimes(1);

const foundRefreshToken = await sessionManager.getSessionItem(
'refresh_token'
);
const foundAccessToken = await sessionManager.getSessionItem(
'access_token'
);
const foundRefreshToken = await sessionManager.getSessionItem('refresh_token');
const foundAccessToken = await sessionManager.getSessionItem('access_token');
const foundIdToken = await sessionManager.getSessionItem('id_token');

expect(foundAccessToken).toBe(mockAccessToken.token);
Expand All @@ -164,10 +160,7 @@ describe('AuthCodeWitPKCE', () => {

it('return an existing token if an unexpired token is available', async () => {
const mockAccessToken = mocks.getMockAccessToken(clientConfig.authDomain);
await sessionManager.setSessionItem(
'access_token',
mockAccessToken.token
);
await sessionManager.setSessionItem('access_token', mockAccessToken.token);
const client = new AuthCodeWithPKCE(clientConfig);
const token = await client.getToken(sessionManager);
expect(token).toBe(mockAccessToken.token);
Expand All @@ -179,10 +172,7 @@ describe('AuthCodeWitPKCE', () => {
clientConfig.authDomain,
true
);
await sessionManager.setSessionItem(
'access_token',
mockAccessToken.token
);
await sessionManager.setSessionItem('access_token', mockAccessToken.token);
await expect(async () => {
const client = new AuthCodeWithPKCE(clientConfig);
await client.getToken(sessionManager);
Expand All @@ -204,10 +194,7 @@ describe('AuthCodeWitPKCE', () => {
clientConfig.authDomain,
true
);
await sessionManager.setSessionItem(
'access_token',
expiredAccessToken.token
);
await sessionManager.setSessionItem('access_token', expiredAccessToken.token);
await sessionManager.setSessionItem('refresh_token', 'refresh_token');

const body = new URLSearchParams({
Expand Down Expand Up @@ -246,10 +233,7 @@ describe('AuthCodeWitPKCE', () => {
clientConfig.authDomain,
true
);
await sessionManager.setSessionItem(
'access_token',
expiredAccessToken.token
);
await sessionManager.setSessionItem('access_token', expiredAccessToken.token);
await sessionManager.setSessionItem('refresh_token', 'refresh_token');

const headerOverrides: SDKHeaderOverrideOptions = {
Expand Down Expand Up @@ -292,22 +276,15 @@ describe('AuthCodeWitPKCE', () => {
clientConfig.authDomain,
true
);
await sessionManager.setSessionItem(
'access_token',
expiredAccessToken.token
);
await sessionManager.setSessionItem('access_token', expiredAccessToken.token);
await sessionManager.setSessionItem('refresh_token', 'refresh_token');

const client = new AuthCodeWithPKCE(clientConfig);
await client.getToken(sessionManager);
expect(mocks.fetchClient).toHaveBeenCalledTimes(1);

const foundRefreshToken = await sessionManager.getSessionItem(
'refresh_token'
);
const foundAccessToken = await sessionManager.getSessionItem(
'access_token'
);
const foundRefreshToken = await sessionManager.getSessionItem('refresh_token');
const foundAccessToken = await sessionManager.getSessionItem('access_token');
const foundIdToken = await sessionManager.getSessionItem('id_token');

expect(foundAccessToken).toBe(newAccessToken.token);
Expand Down
75 changes: 18 additions & 57 deletions lib/__tests__/sdk/oauth2-flows/AuthorizationCode.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ import {
type SDKHeaderOverrideOptions,
} from '../../../sdk/oauth2-flows';

import {
KindeSDKError, KindeSDKErrorCode
} from '../../../sdk/exceptions';
import { KindeSDKError, KindeSDKErrorCode } from '../../../sdk/exceptions';

describe('AuthorizationCode', () => {
const { sessionManager } = mocks;
Expand Down Expand Up @@ -39,9 +37,7 @@ describe('AuthorizationCode', () => {
const client = new AuthorizationCode(clientConfig, clientSecret);
const authURL = await client.createAuthorizationURL(sessionManager);
const searchParams = new URLSearchParams(authURL.search);
expect(searchParams.get('scope')).toBe(
AuthorizationCode.DEFAULT_TOKEN_SCOPES
);
expect(searchParams.get('scope')).toBe(AuthorizationCode.DEFAULT_TOKEN_SCOPES);
});

it('uses provided scope and audience if given in url options', async () => {
Expand Down Expand Up @@ -86,9 +82,7 @@ describe('AuthorizationCode', () => {
const searchParams = new URLSearchParams(authURL.search);
const state = searchParams.get('state');
const stateKey = AuthorizationCode.STATE_KEY;
const storedState = (await sessionManager.getSessionItem(
stateKey
)) as string;
const storedState = (await sessionManager.getSessionItem(stateKey)) as string;
expect(storedState).toBe(state);
});

Expand Down Expand Up @@ -173,12 +167,8 @@ describe('AuthorizationCode', () => {
await client.handleRedirectFromAuthDomain(sessionManager, callbackURL);
expect(mocks.fetchClient).toHaveBeenCalledTimes(1);

const foundRefreshToken = await sessionManager.getSessionItem(
'refresh_token'
);
const foundAccessToken = await sessionManager.getSessionItem(
'access_token'
);
const foundRefreshToken = await sessionManager.getSessionItem('refresh_token');
const foundAccessToken = await sessionManager.getSessionItem('access_token');
const foundIdToken = await sessionManager.getSessionItem('id_token');

expect(foundAccessToken).toBe(mockAccessToken.token);
Expand All @@ -195,10 +185,7 @@ describe('AuthorizationCode', () => {

it('return an existing token if an unexpired token is available', async () => {
const mockAccessToken = mocks.getMockAccessToken(clientConfig.authDomain);
await sessionManager.setSessionItem(
'access_token',
mockAccessToken.token
);
await sessionManager.setSessionItem('access_token', mockAccessToken.token);
const client = new AuthorizationCode(clientConfig, clientSecret);
const token = await client.getToken(sessionManager);
expect(token).toBe(mockAccessToken.token);
Expand All @@ -217,10 +204,7 @@ describe('AuthorizationCode', () => {
clientConfig.authDomain,
true
);
await sessionManager.setSessionItem(
'access_token',
mockAccessToken.token
);
await sessionManager.setSessionItem('access_token', mockAccessToken.token);
await expect(async () => {
const client = new AuthorizationCode(clientConfig, clientSecret);
await client.getToken(sessionManager);
Expand All @@ -240,10 +224,7 @@ describe('AuthorizationCode', () => {
clientConfig.authDomain,
true
);
await sessionManager.setSessionItem(
'access_token',
expiredAccessToken.token
);
await sessionManager.setSessionItem('access_token', expiredAccessToken.token);
await sessionManager.setSessionItem('refresh_token', 'refresh_token');

await expect(async () => {
Expand All @@ -268,10 +249,7 @@ describe('AuthorizationCode', () => {
clientConfig.authDomain,
true
);
await sessionManager.setSessionItem(
'access_token',
expiredAccessToken.token
);
await sessionManager.setSessionItem('access_token', expiredAccessToken.token);
await sessionManager.setSessionItem('refresh_token', 'refresh_token');

const body = new URLSearchParams({
Expand Down Expand Up @@ -311,10 +289,7 @@ describe('AuthorizationCode', () => {
clientConfig.authDomain,
true
);
await sessionManager.setSessionItem(
'access_token',
expiredAccessToken.token
);
await sessionManager.setSessionItem('access_token', expiredAccessToken.token);
await sessionManager.setSessionItem('refresh_token', 'refresh_token');

const headerOverrides: SDKHeaderOverrideOptions = {
Expand Down Expand Up @@ -360,22 +335,15 @@ describe('AuthorizationCode', () => {
clientConfig.authDomain,
true
);
await sessionManager.setSessionItem(
'access_token',
expiredAccessToken.token
);
await sessionManager.setSessionItem('access_token', expiredAccessToken.token);
await sessionManager.setSessionItem('refresh_token', 'refresh_token');

const client = new AuthorizationCode(clientConfig, clientSecret);
await client.getToken(sessionManager);
expect(mocks.fetchClient).toHaveBeenCalledTimes(1);

const foundRefreshToken = await sessionManager.getSessionItem(
'refresh_token'
);
const foundAccessToken = await sessionManager.getSessionItem(
'access_token'
);
const foundRefreshToken = await sessionManager.getSessionItem('refresh_token');
const foundAccessToken = await sessionManager.getSessionItem('access_token');
const foundIdToken = await sessionManager.getSessionItem('id_token');

expect(foundAccessToken).toBe(newAccessToken.token);
Expand All @@ -395,7 +363,8 @@ describe('AuthorizationCode', () => {
const getTokenFn = async () => await client.getToken(sessionManager);
await expect(getTokenFn).rejects.toBeInstanceOf(KindeSDKError);
await expect(getTokenFn).rejects.toHaveProperty(
'errorCode', KindeSDKErrorCode.FAILED_TOKENS_REFRESH_ATTEMPT
'errorCode',
KindeSDKErrorCode.FAILED_TOKENS_REFRESH_ATTEMPT
);
});
});
Expand All @@ -408,10 +377,7 @@ describe('AuthorizationCode', () => {

it('fetches user profile using the available access token', async () => {
const mockAccessToken = mocks.getMockAccessToken(clientConfig.authDomain);
await sessionManager.setSessionItem(
'access_token',
mockAccessToken.token
);
await sessionManager.setSessionItem('access_token', mockAccessToken.token);

const headers = new Headers();
headers.append('Authorization', `Bearer ${mockAccessToken.token}`);
Expand All @@ -437,10 +403,7 @@ describe('AuthorizationCode', () => {

it('commits fetched user details to memory store', async () => {
const mockAccessToken = mocks.getMockAccessToken(clientConfig.authDomain);
await sessionManager.setSessionItem(
'access_token',
mockAccessToken.token
);
await sessionManager.setSessionItem('access_token', mockAccessToken.token);
const userDetails = {
family_name: 'family_name',
given_name: 'give_name',
Expand All @@ -456,9 +419,7 @@ describe('AuthorizationCode', () => {
const client = new AuthorizationCode(clientConfig, clientSecret);
await client.getUserProfile(sessionManager);
expect(mocks.fetchClient).toHaveBeenCalledTimes(1);
expect(await sessionManager.getSessionItem('user')).toStrictEqual(
userDetails
);
expect(await sessionManager.getSessionItem('user')).toStrictEqual(userDetails);
});
});
});
8 changes: 2 additions & 6 deletions lib/__tests__/sdk/oauth2-flows/ClientCredentials.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,7 @@ describe('ClientCredentials', () => {
it('return access token if an unexpired token is available in memory', async () => {
const { authDomain } = clientConfig;
const { token: mockAccessToken } = mocks.getMockAccessToken(authDomain);
await commitTokenToMemory(
sessionManager,
mockAccessToken,
'access_token'
);
await commitTokenToMemory(sessionManager, mockAccessToken, 'access_token');

const client = new ClientCredentials(clientConfig);
const accessToken = await client.getToken(sessionManager);
Expand Down Expand Up @@ -94,7 +90,7 @@ describe('ClientCredentials', () => {
);
await sessionManager.setSessionItem('access_token', expiredMockAccessToken);
const { token: mockAccessToken } = mocks.getMockAccessToken(
clientConfig.authDomain,
clientConfig.authDomain
);
mocks.fetchClient.mockResolvedValue({
json: () => ({ access_token: mockAccessToken }),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,34 +51,26 @@ describe('BrowserSessionManager', () => {
});

describe('setBrowserSessionItem()', () => {
it('stores a value against the provided key in the browser\'s session storage', async () => {
it("stores a value against the provided key in the browser's session storage", async () => {
const sessionItemKey = 'session-item-key';
const sessionItemValue = 'session-item-value';
await sessionManager.setSessionItemBrowser(
sessionItemKey,
sessionItemValue
);
await sessionManager.setSessionItemBrowser(sessionItemKey, sessionItemValue);
expect(await sessionManager.getSessionItemBrowser(sessionItemKey)).toBe(
sessionItemValue
);
});
});

describe('removeBrowserSessionItem()', () => {
it('removes a session item from the browser\'s session storage', async () => {
it("removes a session item from the browser's session storage", async () => {
const sessionItemKey = 'session-item-key';
const sessionItemValue = 'session-item-value';
await sessionManager.setSessionItemBrowser(
sessionItemKey,
sessionItemValue
);
await sessionManager.setSessionItemBrowser(sessionItemKey, sessionItemValue);
expect(await sessionManager.getSessionItemBrowser(sessionItemKey)).toBe(
sessionItemValue
);
await sessionManager.removeSessionItemBrowser(sessionItemKey);
expect(await sessionManager.getSessionItemBrowser(sessionItemKey)).toBe(
null
);
expect(await sessionManager.getSessionItemBrowser(sessionItemKey)).toBe(null);
});
});
});
Loading

0 comments on commit 943f759

Please sign in to comment.