Merge pull request #387 from metrico/386_fix

#fix: 386 fastify-auth is outdated
metrico · Nov 10, 2023 · 8d770ea · 8d770ea
2 parents ba97754 + 1858ac0
commit 8d770ea
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 113 deletions.
diff --git a/lib/handlers/errors.js b/lib/handlers/errors.js
@@ -28,6 +28,12 @@ const handler = (err, req, res) => {
       message: err.message
     })
   }
+  if (err.name && err.name === 'FastifyError') {
+    return res.status(err.statusCode).send({
+      statusCode: err.statusCode,
+      message: err.message
+    })
+  }
   if (err.name && err.name === 'UnauthorizedError') {
     return res.status(401).send({
       statusCode: 401,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,6 +40,7 @@
     "@fastify/static": "^6.12.0",
     "@fastify/websocket": "^8.2.0",
     "@fastify/url-data": "^5.4.0",
+    "@fastify/basic-auth": "^5.1.0",
     "@qxip/influx-line-protocol-parser": "^0.2.1",
     "@qxip/plugnplay": "^3.3.1",
     "@stricjs/router": "^5.0.6",
@@ -49,7 +50,6 @@
     "date-fns": "^2.27.0",
     "fast-querystring": "^1.1.0",
     "fastify": "^4.24.3",
-    "fastify-basic-auth": "^2.3.0",
     "fastify-metrics": "^10.3.3",
     "fastify-plugin": "^4.5.1",
     "glob": "^7.1.2",

diff --git a/qryn_node.js b/qryn_node.js
@@ -182,7 +182,7 @@ let fastify = require('fastify')({
 
     const validate = checkAuth.bind(this)
 
-    fastify.register(require('fastify-basic-auth'), {
+    fastify.register(require('@fastify/basic-auth'), {
       validate,
       authenticate: true
     })