Skip to content

Commit 943f759

Browse files
coelcoel
committed
chore: make it use the prettier config that is there
1 parent 4a73c0d commit 943f759

29 files changed

+426
-555
lines changed

‎.github/workflows/build-test-ci.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ jobs:
1919
matrix:
2020
node-version: [18.x]
2121
steps:
22-
- uses: actions/checkout@v3
23-
- uses: pnpm/action-setup@v2
24-
with:
25-
version: 8
26-
- name: Setting up Node.js ${{ matrix.node-version }}
27-
uses: actions/setup-node@v3
28-
with:
29-
node-version: ${{ matrix.node-version }}
30-
cache: 'pnpm'
31-
- name: Enabling pre-post scripts
32-
run: pnpm config set enable-pre-post-scripts true
33-
- run: pnpm install
34-
- run: pnpm build
35-
- run: pnpm test
22+
- uses: actions/checkout@v3
23+
- uses: pnpm/action-setup@v2
24+
with:
25+
version: 8
26+
- name: Setting up Node.js ${{ matrix.node-version }}
27+
uses: actions/setup-node@v3
28+
with:
29+
node-version: ${{ matrix.node-version }}
30+
cache: 'pnpm'
31+
- name: Enabling pre-post scripts
32+
run: pnpm config set enable-pre-post-scripts true
33+
- run: pnpm install
34+
- run: pnpm build
35+
- run: pnpm test

‎.prettier.yml renamed to ‎.prettierrc.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
trailingComma: "es5"
1+
trailingComma: 'es5'
22
tabWidth: 2
33
printWidth: 85
4-
useTabs: true
54
semi: true
65
singleQuote: true
7-

‎generator-config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
templateDir: ./templates
22
additionalProperties:
33
artifactId: kinde-typescript-sdk
4-

‎lib/__tests__/mocks.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export const fetchClient = jest.fn().mockImplementation(
1212
export const getMockAccessToken = (
1313
domain: string = 'local-testing@kinde.com',
1414
isExpired: boolean = false,
15-
isExpClaimMissing: boolean = false,
15+
isExpClaimMissing: boolean = false
1616
) => {
1717
const iat = Math.floor(Date.now() / 1000);
1818
const exp = isExpClaimMissing ? undefined : isExpired ? iat : iat + 1000000;

‎lib/__tests__/sdk/oauth2-flows/AuthCodeWithPKCE.spec.ts

Lines changed: 9 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,8 @@ describe('AuthCodeWitPKCE', () => {
142142
await client.handleRedirectFromAuthDomain(sessionManager, callbackURL);
143143
expect(mocks.fetchClient).toHaveBeenCalledTimes(1);
144144

145-
const foundRefreshToken = await sessionManager.getSessionItem(
146-
'refresh_token'
147-
);
148-
const foundAccessToken = await sessionManager.getSessionItem(
149-
'access_token'
150-
);
145+
const foundRefreshToken = await sessionManager.getSessionItem('refresh_token');
146+
const foundAccessToken = await sessionManager.getSessionItem('access_token');
151147
const foundIdToken = await sessionManager.getSessionItem('id_token');
152148

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

165161
it('return an existing token if an unexpired token is available', async () => {
166162
const mockAccessToken = mocks.getMockAccessToken(clientConfig.authDomain);
167-
await sessionManager.setSessionItem(
168-
'access_token',
169-
mockAccessToken.token
170-
);
163+
await sessionManager.setSessionItem('access_token', mockAccessToken.token);
171164
const client = new AuthCodeWithPKCE(clientConfig);
172165
const token = await client.getToken(sessionManager);
173166
expect(token).toBe(mockAccessToken.token);
@@ -179,10 +172,7 @@ describe('AuthCodeWitPKCE', () => {
179172
clientConfig.authDomain,
180173
true
181174
);
182-
await sessionManager.setSessionItem(
183-
'access_token',
184-
mockAccessToken.token
185-
);
175+
await sessionManager.setSessionItem('access_token', mockAccessToken.token);
186176
await expect(async () => {
187177
const client = new AuthCodeWithPKCE(clientConfig);
188178
await client.getToken(sessionManager);
@@ -204,10 +194,7 @@ describe('AuthCodeWitPKCE', () => {
204194
clientConfig.authDomain,
205195
true
206196
);
207-
await sessionManager.setSessionItem(
208-
'access_token',
209-
expiredAccessToken.token
210-
);
197+
await sessionManager.setSessionItem('access_token', expiredAccessToken.token);
211198
await sessionManager.setSessionItem('refresh_token', 'refresh_token');
212199

213200
const body = new URLSearchParams({
@@ -246,10 +233,7 @@ describe('AuthCodeWitPKCE', () => {
246233
clientConfig.authDomain,
247234
true
248235
);
249-
await sessionManager.setSessionItem(
250-
'access_token',
251-
expiredAccessToken.token
252-
);
236+
await sessionManager.setSessionItem('access_token', expiredAccessToken.token);
253237
await sessionManager.setSessionItem('refresh_token', 'refresh_token');
254238

255239
const headerOverrides: SDKHeaderOverrideOptions = {
@@ -292,22 +276,15 @@ describe('AuthCodeWitPKCE', () => {
292276
clientConfig.authDomain,
293277
true
294278
);
295-
await sessionManager.setSessionItem(
296-
'access_token',
297-
expiredAccessToken.token
298-
);
279+
await sessionManager.setSessionItem('access_token', expiredAccessToken.token);
299280
await sessionManager.setSessionItem('refresh_token', 'refresh_token');
300281

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

305-
const foundRefreshToken = await sessionManager.getSessionItem(
306-
'refresh_token'
307-
);
308-
const foundAccessToken = await sessionManager.getSessionItem(
309-
'access_token'
310-
);
286+
const foundRefreshToken = await sessionManager.getSessionItem('refresh_token');
287+
const foundAccessToken = await sessionManager.getSessionItem('access_token');
311288
const foundIdToken = await sessionManager.getSessionItem('id_token');
312289

313290
expect(foundAccessToken).toBe(newAccessToken.token);

‎lib/__tests__/sdk/oauth2-flows/AuthorizationCode.spec.ts

Lines changed: 18 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ import {
88
type SDKHeaderOverrideOptions,
99
} from '../../../sdk/oauth2-flows';
1010

11-
import {
12-
KindeSDKError, KindeSDKErrorCode
13-
} from '../../../sdk/exceptions';
11+
import { KindeSDKError, KindeSDKErrorCode } from '../../../sdk/exceptions';
1412

1513
describe('AuthorizationCode', () => {
1614
const { sessionManager } = mocks;
@@ -39,9 +37,7 @@ describe('AuthorizationCode', () => {
3937
const client = new AuthorizationCode(clientConfig, clientSecret);
4038
const authURL = await client.createAuthorizationURL(sessionManager);
4139
const searchParams = new URLSearchParams(authURL.search);
42-
expect(searchParams.get('scope')).toBe(
43-
AuthorizationCode.DEFAULT_TOKEN_SCOPES
44-
);
40+
expect(searchParams.get('scope')).toBe(AuthorizationCode.DEFAULT_TOKEN_SCOPES);
4541
});
4642

4743
it('uses provided scope and audience if given in url options', async () => {
@@ -86,9 +82,7 @@ describe('AuthorizationCode', () => {
8682
const searchParams = new URLSearchParams(authURL.search);
8783
const state = searchParams.get('state');
8884
const stateKey = AuthorizationCode.STATE_KEY;
89-
const storedState = (await sessionManager.getSessionItem(
90-
stateKey
91-
)) as string;
85+
const storedState = (await sessionManager.getSessionItem(stateKey)) as string;
9286
expect(storedState).toBe(state);
9387
});
9488

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

176-
const foundRefreshToken = await sessionManager.getSessionItem(
177-
'refresh_token'
178-
);
179-
const foundAccessToken = await sessionManager.getSessionItem(
180-
'access_token'
181-
);
170+
const foundRefreshToken = await sessionManager.getSessionItem('refresh_token');
171+
const foundAccessToken = await sessionManager.getSessionItem('access_token');
182172
const foundIdToken = await sessionManager.getSessionItem('id_token');
183173

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

196186
it('return an existing token if an unexpired token is available', async () => {
197187
const mockAccessToken = mocks.getMockAccessToken(clientConfig.authDomain);
198-
await sessionManager.setSessionItem(
199-
'access_token',
200-
mockAccessToken.token
201-
);
188+
await sessionManager.setSessionItem('access_token', mockAccessToken.token);
202189
const client = new AuthorizationCode(clientConfig, clientSecret);
203190
const token = await client.getToken(sessionManager);
204191
expect(token).toBe(mockAccessToken.token);
@@ -217,10 +204,7 @@ describe('AuthorizationCode', () => {
217204
clientConfig.authDomain,
218205
true
219206
);
220-
await sessionManager.setSessionItem(
221-
'access_token',
222-
mockAccessToken.token
223-
);
207+
await sessionManager.setSessionItem('access_token', mockAccessToken.token);
224208
await expect(async () => {
225209
const client = new AuthorizationCode(clientConfig, clientSecret);
226210
await client.getToken(sessionManager);
@@ -240,10 +224,7 @@ describe('AuthorizationCode', () => {
240224
clientConfig.authDomain,
241225
true
242226
);
243-
await sessionManager.setSessionItem(
244-
'access_token',
245-
expiredAccessToken.token
246-
);
227+
await sessionManager.setSessionItem('access_token', expiredAccessToken.token);
247228
await sessionManager.setSessionItem('refresh_token', 'refresh_token');
248229

249230
await expect(async () => {
@@ -268,10 +249,7 @@ describe('AuthorizationCode', () => {
268249
clientConfig.authDomain,
269250
true
270251
);
271-
await sessionManager.setSessionItem(
272-
'access_token',
273-
expiredAccessToken.token
274-
);
252+
await sessionManager.setSessionItem('access_token', expiredAccessToken.token);
275253
await sessionManager.setSessionItem('refresh_token', 'refresh_token');
276254

277255
const body = new URLSearchParams({
@@ -311,10 +289,7 @@ describe('AuthorizationCode', () => {
311289
clientConfig.authDomain,
312290
true
313291
);
314-
await sessionManager.setSessionItem(
315-
'access_token',
316-
expiredAccessToken.token
317-
);
292+
await sessionManager.setSessionItem('access_token', expiredAccessToken.token);
318293
await sessionManager.setSessionItem('refresh_token', 'refresh_token');
319294

320295
const headerOverrides: SDKHeaderOverrideOptions = {
@@ -360,22 +335,15 @@ describe('AuthorizationCode', () => {
360335
clientConfig.authDomain,
361336
true
362337
);
363-
await sessionManager.setSessionItem(
364-
'access_token',
365-
expiredAccessToken.token
366-
);
338+
await sessionManager.setSessionItem('access_token', expiredAccessToken.token);
367339
await sessionManager.setSessionItem('refresh_token', 'refresh_token');
368340

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

373-
const foundRefreshToken = await sessionManager.getSessionItem(
374-
'refresh_token'
375-
);
376-
const foundAccessToken = await sessionManager.getSessionItem(
377-
'access_token'
378-
);
345+
const foundRefreshToken = await sessionManager.getSessionItem('refresh_token');
346+
const foundAccessToken = await sessionManager.getSessionItem('access_token');
379347
const foundIdToken = await sessionManager.getSessionItem('id_token');
380348

381349
expect(foundAccessToken).toBe(newAccessToken.token);
@@ -395,7 +363,8 @@ describe('AuthorizationCode', () => {
395363
const getTokenFn = async () => await client.getToken(sessionManager);
396364
await expect(getTokenFn).rejects.toBeInstanceOf(KindeSDKError);
397365
await expect(getTokenFn).rejects.toHaveProperty(
398-
'errorCode', KindeSDKErrorCode.FAILED_TOKENS_REFRESH_ATTEMPT
366+
'errorCode',
367+
KindeSDKErrorCode.FAILED_TOKENS_REFRESH_ATTEMPT
399368
);
400369
});
401370
});
@@ -408,10 +377,7 @@ describe('AuthorizationCode', () => {
408377

409378
it('fetches user profile using the available access token', async () => {
410379
const mockAccessToken = mocks.getMockAccessToken(clientConfig.authDomain);
411-
await sessionManager.setSessionItem(
412-
'access_token',
413-
mockAccessToken.token
414-
);
380+
await sessionManager.setSessionItem('access_token', mockAccessToken.token);
415381

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

438404
it('commits fetched user details to memory store', async () => {
439405
const mockAccessToken = mocks.getMockAccessToken(clientConfig.authDomain);
440-
await sessionManager.setSessionItem(
441-
'access_token',
442-
mockAccessToken.token
443-
);
406+
await sessionManager.setSessionItem('access_token', mockAccessToken.token);
444407
const userDetails = {
445408
family_name: 'family_name',
446409
given_name: 'give_name',
@@ -456,9 +419,7 @@ describe('AuthorizationCode', () => {
456419
const client = new AuthorizationCode(clientConfig, clientSecret);
457420
await client.getUserProfile(sessionManager);
458421
expect(mocks.fetchClient).toHaveBeenCalledTimes(1);
459-
expect(await sessionManager.getSessionItem('user')).toStrictEqual(
460-
userDetails
461-
);
422+
expect(await sessionManager.getSessionItem('user')).toStrictEqual(userDetails);
462423
});
463424
});
464425
});

‎lib/__tests__/sdk/oauth2-flows/ClientCredentials.spec.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,7 @@ describe('ClientCredentials', () => {
6161
it('return access token if an unexpired token is available in memory', async () => {
6262
const { authDomain } = clientConfig;
6363
const { token: mockAccessToken } = mocks.getMockAccessToken(authDomain);
64-
await commitTokenToMemory(
65-
sessionManager,
66-
mockAccessToken,
67-
'access_token'
68-
);
64+
await commitTokenToMemory(sessionManager, mockAccessToken, 'access_token');
6965

7066
const client = new ClientCredentials(clientConfig);
7167
const accessToken = await client.getToken(sessionManager);
@@ -94,7 +90,7 @@ describe('ClientCredentials', () => {
9490
);
9591
await sessionManager.setSessionItem('access_token', expiredMockAccessToken);
9692
const { token: mockAccessToken } = mocks.getMockAccessToken(
97-
clientConfig.authDomain,
93+
clientConfig.authDomain
9894
);
9995
mocks.fetchClient.mockResolvedValue({
10096
json: () => ({ access_token: mockAccessToken }),

‎lib/__tests__/sdk/session-managers/BrowserSessionManager.browser.spec.ts

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,34 +51,26 @@ describe('BrowserSessionManager', () => {
5151
});
5252

5353
describe('setBrowserSessionItem()', () => {
54-
it('stores a value against the provided key in the browser\'s session storage', async () => {
54+
it("stores a value against the provided key in the browser's session storage", async () => {
5555
const sessionItemKey = 'session-item-key';
5656
const sessionItemValue = 'session-item-value';
57-
await sessionManager.setSessionItemBrowser(
58-
sessionItemKey,
59-
sessionItemValue
60-
);
57+
await sessionManager.setSessionItemBrowser(sessionItemKey, sessionItemValue);
6158
expect(await sessionManager.getSessionItemBrowser(sessionItemKey)).toBe(
6259
sessionItemValue
6360
);
6461
});
6562
});
6663

6764
describe('removeBrowserSessionItem()', () => {
68-
it('removes a session item from the browser\'s session storage', async () => {
65+
it("removes a session item from the browser's session storage", async () => {
6966
const sessionItemKey = 'session-item-key';
7067
const sessionItemValue = 'session-item-value';
71-
await sessionManager.setSessionItemBrowser(
72-
sessionItemKey,
73-
sessionItemValue
74-
);
68+
await sessionManager.setSessionItemBrowser(sessionItemKey, sessionItemValue);
7569
expect(await sessionManager.getSessionItemBrowser(sessionItemKey)).toBe(
7670
sessionItemValue
7771
);
7872
await sessionManager.removeSessionItemBrowser(sessionItemKey);
79-
expect(await sessionManager.getSessionItemBrowser(sessionItemKey)).toBe(
80-
null
81-
);
73+
expect(await sessionManager.getSessionItemBrowser(sessionItemKey)).toBe(null);
8274
});
8375
});
8476
});

0 commit comments

Comments
 (0)