From 8a12f2da2d9ff0c02eb2288d536afa5ff8501b71 Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Tue, 14 Nov 2023 15:21:12 +0100 Subject: [PATCH 01/10] fix(typescript): fix typescript type DecodedJwt --- src/index.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.d.ts b/src/index.d.ts index 73f794f..fd416d8 100644 --- a/src/index.d.ts +++ b/src/index.d.ts @@ -65,8 +65,8 @@ type SignerCallback = (e: Error | TokenError | null, token: string) => void type VerifierCallback = (e: Error | TokenError | null, payload: any) => void type DecodedJwt = { - header: { [key: string]: any }, - payload: string, + header: Record, + payload: any, signature: string } From f6fc3355863f92137f59c38b9c07b3f0b2fc3f3f Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Wed, 15 Nov 2023 07:27:05 +0100 Subject: [PATCH 02/10] Update types.spec.ts --- test/types.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/types.spec.ts b/test/types.spec.ts index f6c07f3..23f2a4d 100644 --- a/test/types.spec.ts +++ b/test/types.spec.ts @@ -48,7 +48,7 @@ decoder(Buffer.from('FOO')) const verifierSync = createVerifier({ key: 'KEY', algorithms: ['RS256'], requiredClaims: ['aud'], checkTyp: 'JWT' }) verifierSync('2134') -const verifierAsync = createVerifier({ key: () => 'KEY', algorithms: ['RS256'] }) +const verifierAsync = createVerifier({ key: ((_decodedJwt: DecodedJwt) => 'KEY', algorithms: ['RS256'] }) verifierAsync('123').then(console.log, console.log) verifierAsync(Buffer.from('456'), (_e: Error | null, _token?: string) => {}) From 53f8436da190bfd244162d235c69313c279f52e9 Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Wed, 15 Nov 2023 07:39:00 +0100 Subject: [PATCH 03/10] fix: export missing typescript types --- src/index.d.ts | 8 ++++---- test/types.spec.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/index.d.ts b/src/index.d.ts index fd416d8..d0c268f 100644 --- a/src/index.d.ts +++ b/src/index.d.ts @@ -61,16 +61,16 @@ declare class TokenError extends Error { [key: string]: any } -type SignerCallback = (e: Error | TokenError | null, token: string) => void -type VerifierCallback = (e: Error | TokenError | null, payload: any) => void +export type SignerCallback = (e: Error | TokenError | null, token: string) => void +export type VerifierCallback = (e: Error | TokenError | null, payload: any) => void -type DecodedJwt = { +export type DecodedJwt = { header: Record, payload: any, signature: string } -type KeyFetcher = +export type KeyFetcher = | ((DecodedJwt: DecodedJwt) => Promise) | ((DecodedJwt: DecodedJwt, cb: (err: Error | TokenError | null, key: string | Buffer) => void) => void) diff --git a/test/types.spec.ts b/test/types.spec.ts index 23f2a4d..a357581 100644 --- a/test/types.spec.ts +++ b/test/types.spec.ts @@ -48,7 +48,7 @@ decoder(Buffer.from('FOO')) const verifierSync = createVerifier({ key: 'KEY', algorithms: ['RS256'], requiredClaims: ['aud'], checkTyp: 'JWT' }) verifierSync('2134') -const verifierAsync = createVerifier({ key: ((_decodedJwt: DecodedJwt) => 'KEY', algorithms: ['RS256'] }) +const verifierAsync = createVerifier({ key: (_decodedJwt: DecodedJwt) => 'KEY', algorithms: ['RS256'] }) verifierAsync('123').then(console.log, console.log) verifierAsync(Buffer.from('456'), (_e: Error | null, _token?: string) => {}) From 82c9062bb7c82fa5549f3813f1c0a637a1ef10c2 Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Fri, 17 Nov 2023 15:17:18 +0100 Subject: [PATCH 04/10] Update index.d.ts --- src/index.d.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/index.d.ts b/src/index.d.ts index d0c268f..e952ca2 100644 --- a/src/index.d.ts +++ b/src/index.d.ts @@ -61,16 +61,16 @@ declare class TokenError extends Error { [key: string]: any } -export type SignerCallback = (e: Error | TokenError | null, token: string) => void -export type VerifierCallback = (e: Error | TokenError | null, payload: any) => void +type SignerCallback = (e: Error | TokenError | null, token: string) => void +type VerifierCallback = (e: Error | TokenError | null, payload: any) => void -export type DecodedJwt = { - header: Record, +type DecodedJwt = { + header: { key[string]: any }, payload: any, signature: string } -export type KeyFetcher = +type KeyFetcher = | ((DecodedJwt: DecodedJwt) => Promise) | ((DecodedJwt: DecodedJwt, cb: (err: Error | TokenError | null, key: string | Buffer) => void) => void) From 10b5bafba1365b1b7d3d5ecf63f4883d9211e7e7 Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Fri, 17 Nov 2023 15:17:53 +0100 Subject: [PATCH 05/10] Update index.d.ts --- src/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.d.ts b/src/index.d.ts index e952ca2..1034bd8 100644 --- a/src/index.d.ts +++ b/src/index.d.ts @@ -65,7 +65,7 @@ type SignerCallback = (e: Error | TokenError | null, token: string) => void type VerifierCallback = (e: Error | TokenError | null, payload: any) => void type DecodedJwt = { - header: { key[string]: any }, + header: { [key: string]: any }, payload: any, signature: string } From adcfae4708570a3600827587778a993778331e62 Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Fri, 17 Nov 2023 15:23:09 +0100 Subject: [PATCH 06/10] Update types.spec.ts --- test/types.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/types.spec.ts b/test/types.spec.ts index a357581..f6c07f3 100644 --- a/test/types.spec.ts +++ b/test/types.spec.ts @@ -48,7 +48,7 @@ decoder(Buffer.from('FOO')) const verifierSync = createVerifier({ key: 'KEY', algorithms: ['RS256'], requiredClaims: ['aud'], checkTyp: 'JWT' }) verifierSync('2134') -const verifierAsync = createVerifier({ key: (_decodedJwt: DecodedJwt) => 'KEY', algorithms: ['RS256'] }) +const verifierAsync = createVerifier({ key: () => 'KEY', algorithms: ['RS256'] }) verifierAsync('123').then(console.log, console.log) verifierAsync(Buffer.from('456'), (_e: Error | null, _token?: string) => {}) From c07be0fbee4ba7a0f7493a4d78dab8175bb774a3 Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Fri, 17 Nov 2023 15:23:31 +0100 Subject: [PATCH 07/10] Update index.d.ts --- src/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.d.ts b/src/index.d.ts index 1034bd8..47ca291 100644 --- a/src/index.d.ts +++ b/src/index.d.ts @@ -66,7 +66,7 @@ type VerifierCallback = (e: Error | TokenError | null, payload: any) => void type DecodedJwt = { header: { [key: string]: any }, - payload: any, + payload: object, signature: string } From 99b46b201f57ecaf8dc4b6fac5d0677f9bf26455 Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Fri, 17 Nov 2023 15:30:06 +0100 Subject: [PATCH 08/10] Update types.spec.ts --- test/types.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/types.spec.ts b/test/types.spec.ts index f6c07f3..a67f810 100644 --- a/test/types.spec.ts +++ b/test/types.spec.ts @@ -63,7 +63,8 @@ createVerifier({ // Dynamic key in async style createVerifier({ clockTimestamp: 10, - async key(_decodedJwt: DecodedJwt) { + async key(decodedJwt: DecodedJwt) { + if(decodedJwt.payload.iss) return 'ISS_KEY' return 'KEY' } })('456').then(console.log, console.log) From ee90fdd786cdb45985f306394b4e09b0544ba90d Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Fri, 17 Nov 2023 15:30:41 +0100 Subject: [PATCH 09/10] Update index.d.ts --- src/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.d.ts b/src/index.d.ts index 47ca291..1034bd8 100644 --- a/src/index.d.ts +++ b/src/index.d.ts @@ -66,7 +66,7 @@ type VerifierCallback = (e: Error | TokenError | null, payload: any) => void type DecodedJwt = { header: { [key: string]: any }, - payload: object, + payload: any, signature: string } From 48fbb6c80924a42b3bf2998481ac6f341b309d3d Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Fri, 17 Nov 2023 16:10:01 +0100 Subject: [PATCH 10/10] Update types.spec.ts --- test/types.spec.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/types.spec.ts b/test/types.spec.ts index a67f810..d0db95a 100644 --- a/test/types.spec.ts +++ b/test/types.spec.ts @@ -64,7 +64,9 @@ createVerifier({ createVerifier({ clockTimestamp: 10, async key(decodedJwt: DecodedJwt) { - if(decodedJwt.payload.iss) return 'ISS_KEY' + if (decodedJwt.payload.iss) { + return 'ISS_KEY' + } return 'KEY' } })('456').then(console.log, console.log)