perf: use optional chaining

fastify · Jan 7, 2025 · 75e6b48 · 75e6b48
1 parent c318c86
commit 75e6b48
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/jwt.js b/jwt.js
@@ -67,18 +67,14 @@ function validateOptions (options) {
   assert(!options.jwtSign || isString(options.jwtSign), 'Invalid options.jwtSign')
 
   if (
-    options.sign &&
-    options.sign.algorithm &&
-    options.sign.algorithm.includes('RS') &&
+    options.sign?.algorithm?.includes('RS') &&
     (typeof options.secret === 'string' ||
       options.secret instanceof Buffer)
   ) {
     throw new Error('RSA Signatures set as Algorithm in the options require a private and public key to be set as the secret')
   }
   if (
-    options.sign &&
-    options.sign.algorithm &&
-    options.sign.algorithm.includes('ES') &&
+    options.sign?.algorithm?.includes('ES') &&
     (typeof options.secret === 'string' ||
       options.secret instanceof Buffer)
   ) {
@@ -509,7 +505,7 @@ function fastifyJwt (fastify, options, next) {
         } else {
           const maybePromise = trusted(request, result)
 
-          if (maybePromise && maybePromise.then) {
+          if (maybePromise?.then) {
             maybePromise
               .then(trusted => trusted ? callback(null, result) : callback(new AuthorizationTokenUntrustedError()))
           } else if (maybePromise) {

diff --git a/test/options.test.js b/test/options.test.js
@@ -75,7 +75,7 @@ test('Options validation', function (t) {
         secret: 'sec',
         jwtSign: {}
       }).ready((error) => {
-        t.equal(error && error.message, 'Invalid options.jwtSign')
+        t.equal(error?.message, 'Invalid options.jwtSign')
       })
     })
 
@@ -111,7 +111,7 @@ test('Options validation', function (t) {
             sub: 'Some subject'
           }
         }).ready(function (error) {
-          t.equal(error && error.message, 'RSA Signatures set as Algorithm in the options require a private and public key to be set as the secret')
+          t.equal(error?.message, 'RSA Signatures set as Algorithm in the options require a private and public key to be set as the secret')
         })
       })
 
@@ -127,7 +127,7 @@ test('Options validation', function (t) {
             sub: 'Some subject'
           }
         }).ready(function (error) {
-          t.equal(error && error.message, 'ECDSA Signatures set as Algorithm in the options require a private and public key to be set as the secret')
+          t.equal(error?.message, 'ECDSA Signatures set as Algorithm in the options require a private and public key to be set as the secret')
         })
       })
     })