chore: constants extraction and logic change (#245)

* chore: small improvements * chore: constants * chore: removed useless async
nearform · Oct 11, 2023 · 5961f1c · 5961f1c
1 parent 42737e3
commit 5961f1c
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 16 deletions.
diff --git a/src/get-jwks.js b/src/get-jwks.js
@@ -6,18 +6,21 @@ const jwkToPem = require('jwk-to-pem')
 
 const { errorCode, GetJwksError } = require('./error')
 
+const ONE_MINUTE = 60 * 1000
+const FIVE_SECONDS = 5 * 1000
+
 function ensureTrailingSlash(domain) {
-  return domain.endsWith('/') ? domain : `${domain}/`
+  return domain[domain.length - 1] === '/' ? domain : `${domain}/`
 }
 
 function ensureNoLeadingSlash(path) {
-  return path.startsWith('/') ? path.substring(1) : path
+  return path[0] === '/' ? path.substring(1) : path
 }
 
 function buildGetJwks(options = {}) {
   const max = options.max || 100
-  const ttl = options.ttl || 60 * 1000 /* 1 minute */
-  const timeout = options.timeout || 5 * 1000 /* 5 seconds */
+  const ttl = options.ttl || ONE_MINUTE
+  const timeout = options.timeout || FIVE_SECONDS
   const issuersWhitelist = (options.issuersWhitelist || options.allowedDomains || []).map(ensureTrailingSlash)
   const checkIssuer = options.checkIssuer
   const providerDiscovery = options.providerDiscovery || false
@@ -83,7 +86,7 @@ function buildGetJwks(options = {}) {
     }
 
     const jwkPromise = retrieveJwk(normalizedDomain, alg, kid).catch(
-      async err => {
+      err => {
         const stale = staleCache.get(cacheKey)
 
         cache.delete(cacheKey)
@@ -118,7 +121,7 @@ function buildGetJwks(options = {}) {
       })
     }
 
-    if (!body.keys || body.keys.length === 0) {
+    if (!body.keys?.length) {
       throw new GetJwksError(errorCode.NO_JWKS)
     }
 

diff --git a/test/constants.js b/test/constants.js
@@ -36,13 +36,17 @@ const jwks = {
     }
   ],
 }
+
 const privateKey = readFileSync(path.join(__dirname, 'private.pem'), 'utf8')
+
 const jwk = jwks.keys[1]
+
 const token = jwt.sign({ name: 'Jane Doe' }, privateKey, {
   algorithm: jwk.alg,
   issuer: domain,
   keyid: jwk.kid,
 })
+
 const oidcConfig = {
   issuer: 'https://localhost/',
   jwks_uri: 'https://localhost/.well-known/certs',

diff --git a/test/fast-jwt-integration.spec.js b/test/fast-jwt-integration.spec.js
@@ -7,11 +7,11 @@ const { createVerifier } = require('fast-jwt')
 const { jwks, token } = require('./constants')
 const buildGetJwks = require('../src/get-jwks')
 
-t.beforeEach(async () => {
+t.beforeEach(() => {
   nock.disableNetConnect()
 })
 
-t.afterEach(async () => {
+t.afterEach(() => {
   nock.cleanAll()
   nock.enableNetConnect()
 })

diff --git a/test/fastify-jwt-integrations.spec.js b/test/fastify-jwt-integrations.spec.js
@@ -8,11 +8,11 @@ const fjwt = require('@fastify/jwt')
 const { oidcConfig, jwks, token, domain } = require('./constants')
 const buildGetJwks = require('../src/get-jwks')
 
-t.beforeEach(async () => {
+t.beforeEach(() => {
   nock.disableNetConnect()
 })
 
-t.afterEach(async () => {
+t.afterEach(() => {
   nock.cleanAll()
   nock.enableNetConnect()
 })

diff --git a/test/getJwk.spec.js b/test/getJwk.spec.js
@@ -7,11 +7,11 @@ const { jwks, domain } = require('./constants')
 const buildGetJwks = require('../src/get-jwks')
 const { GetJwksError, errorCode } = require('../src/error')
 
-t.beforeEach(async () => {
+t.beforeEach(() => {
   nock.disableNetConnect()
 })
 
-t.afterEach(async () => {
+t.afterEach(() => {
   nock.cleanAll()
   nock.enableNetConnect()
 })

diff --git a/test/getJwkDiscovery.spec.js b/test/getJwkDiscovery.spec.js
@@ -7,11 +7,11 @@ const { oidcConfig, jwks, domain } = require('./constants')
 const buildGetJwks = require('../src/get-jwks')
 const { errorCode, GetJwksError } = require('../src/error')
 
-t.beforeEach(async () => {
+t.beforeEach(() => {
   nock.disableNetConnect()
 })
 
-t.afterEach(async () => {
+t.afterEach(() => {
   nock.cleanAll()
   nock.enableNetConnect()
 })

diff --git a/test/getJwksUri.spec.js b/test/getJwksUri.spec.js
@@ -8,11 +8,11 @@ const { domain } = require('./constants')
 const buildGetJwks = require('../src/get-jwks')
 const { GetJwksError, errorCode } = require('../src/error')
 
-t.beforeEach(async () => {
+t.beforeEach(() => {
   nock.disableNetConnect()
 })
 
-t.afterEach(async () => {
+t.afterEach(() => {
   nock.cleanAll()
   nock.enableNetConnect()
 })