From e41e06382d0b478df71789bb6943a13d5e599fa2 Mon Sep 17 00:00:00 2001 From: Florian Ebmeier Date: Fri, 11 Jun 2021 17:09:38 +0200 Subject: [PATCH 1/2] Initial --- Verifier.ts | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Verifier.ts b/Verifier.ts index 310e82b..e662ef3 100644 --- a/Verifier.ts +++ b/Verifier.ts @@ -49,14 +49,9 @@ export class Verifier extends Actor> { result = result && this.verifyAudience(result.aud, audience) ? result : undefined if (result) { const now = Math.floor(Date.now() / 1000) - if (result?.iat && result.iat > 1000000000000) - result.iat = Math.floor(result.iat / 1000) - if (result?.exp && result.exp > 1000000000000) - result.exp = Math.floor(result.exp / 1000) - result = - (result.exp == undefined || result.exp > now) && (result.iat == undefined || result.iat <= now) - ? result - : undefined + const iat = result?.iat && result.iat > 1000000000000 ? Math.floor(result.iat / 1000) : result.iat + const exp = result?.exp && result.exp > 1000000000000 ? Math.floor(result.exp / 1000) : result.exp + result = (exp == undefined || exp > now) && (iat == undefined || iat <= now) ? result : undefined } if (result) { result.token = token From ed2a58d89c82e77689400215641032f4fc1d0605 Mon Sep 17 00:00:00 2001 From: Florian Ebmeier Date: Fri, 11 Jun 2021 17:10:18 +0200 Subject: [PATCH 2/2] Audience Fix --- Verifier.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Verifier.ts b/Verifier.ts index e662ef3..0f34873 100644 --- a/Verifier.ts +++ b/Verifier.ts @@ -62,8 +62,8 @@ export class Verifier extends Actor> { return result as T | undefined } private verifyAudience(audience: undefined | string | string[], allowed: string[]): boolean { + audience = audience ?? "" return ( - audience == undefined || allowed.length == 0 || (typeof audience == "string" && allowed.some(a => a == audience)) || (Array.isArray(audience) && audience.some(a => allowed.some(ta => ta == a)))