From 3881c566731ae7843dfdba82134f4382ecf9ece4 Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Fri, 19 Jul 2024 09:31:42 +0100 Subject: [PATCH 1/3] perf: use spread over object.assign --- index.js | 2 +- lib/verify-bearer-auth-factory.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index a633912..30ca9f2 100644 --- a/index.js +++ b/index.js @@ -5,7 +5,7 @@ const verifyBearerAuthFactory = require('./lib/verify-bearer-auth-factory') const { FST_BEARER_AUTH_INVALID_LOG_LEVEL } = require('./lib/errors') function fastifyBearerAuth (fastify, options, done) { - options = Object.assign({ addHook: true, verifyErrorLogLevel: 'error' }, options) + options = {addHook: true, verifyErrorLogLevel: 'error', ...options} if ( Object.prototype.hasOwnProperty.call(fastify.log, 'error') === false || diff --git a/lib/verify-bearer-auth-factory.js b/lib/verify-bearer-auth-factory.js index aa17167..0366a9c 100644 --- a/lib/verify-bearer-auth-factory.js +++ b/lib/verify-bearer-auth-factory.js @@ -26,7 +26,7 @@ const defaultOptions = { } module.exports = function verifyBearerAuthFactory (options, done) { - const _options = Object.assign({}, defaultOptions, options) + const _options = { ...defaultOptions, ...options} if (_options.keys instanceof Set) { _options.keys = Array.from(_options.keys) } else if (Array.isArray(_options.keys)) { From c1701dad270cfeae70d3bdd51baa94bf8bb2108b Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Fri, 19 Jul 2024 09:43:10 +0100 Subject: [PATCH 2/3] chore: fix linting --- index.js | 2 +- lib/verify-bearer-auth-factory.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index 30ca9f2..25ab65e 100644 --- a/index.js +++ b/index.js @@ -5,7 +5,7 @@ const verifyBearerAuthFactory = require('./lib/verify-bearer-auth-factory') const { FST_BEARER_AUTH_INVALID_LOG_LEVEL } = require('./lib/errors') function fastifyBearerAuth (fastify, options, done) { - options = {addHook: true, verifyErrorLogLevel: 'error', ...options} + options = { addHook: true, verifyErrorLogLevel: 'error', ...options } if ( Object.prototype.hasOwnProperty.call(fastify.log, 'error') === false || diff --git a/lib/verify-bearer-auth-factory.js b/lib/verify-bearer-auth-factory.js index 0366a9c..59bae5f 100644 --- a/lib/verify-bearer-auth-factory.js +++ b/lib/verify-bearer-auth-factory.js @@ -26,7 +26,7 @@ const defaultOptions = { } module.exports = function verifyBearerAuthFactory (options, done) { - const _options = { ...defaultOptions, ...options} + const _options = { ...defaultOptions, ...options } if (_options.keys instanceof Set) { _options.keys = Array.from(_options.keys) } else if (Array.isArray(_options.keys)) { From 62f7099b4e919d8cb2401a285ced90c271af50ed Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Fri, 19 Jul 2024 09:50:54 +0100 Subject: [PATCH 3/3] Update verify-bearer-auth-factory.js Co-authored-by: Aras Abbasi Signed-off-by: Frazer Smith --- lib/verify-bearer-auth-factory.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/verify-bearer-auth-factory.js b/lib/verify-bearer-auth-factory.js index 59bae5f..a9214c5 100644 --- a/lib/verify-bearer-auth-factory.js +++ b/lib/verify-bearer-auth-factory.js @@ -26,7 +26,7 @@ const defaultOptions = { } module.exports = function verifyBearerAuthFactory (options, done) { - const _options = { ...defaultOptions, ...options } + const _options = { ...defaultOptions, ...options } if (_options.keys instanceof Set) { _options.keys = Array.from(_options.keys) } else if (Array.isArray(_options.keys)) {