Updated to Fastify v4 (#154)

* Updated to Fastify v4

* fixed ts

Signed-off-by: Matteo Collina <hello@matteocollina.com>

.github/workflows/ci.yml

@@ -14,10 +14,9 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - 10
-          - 12
           - 14
           - 16
+          - 18
         os:
           - macOS-latest
           - windows-latest

auth.d.ts

@@ -1,4 +1,4 @@
-import { FastifyPlugin, FastifyRequest, FastifyReply, preHandlerHookHandler, FastifyInstance } from 'fastify';
+import { FastifyPluginCallback, FastifyRequest, FastifyReply, preHandlerHookHandler, FastifyInstance } from 'fastify';
 
 export type FastifyAuthFunction = (
   this: FastifyInstance,
@@ -19,5 +19,5 @@ declare module 'fastify' {
   }
 }
 
-declare const fastifyAuth: FastifyPlugin;
+declare const fastifyAuth: FastifyPluginCallback;
 export default fastifyAuth;

auth.js

@@ -73,10 +73,14 @@ function auth (functions, opts) {
         return
       }
 
-      const maybePromise = func(that.request, that.reply, that.onAuth)
+      try {
+        const maybePromise = func(that.request, that.reply, that.onAuth)
 
-      if (maybePromise && typeof maybePromise.then === 'function') {
-        maybePromise.then(results => that.onAuth(null, results), that.onAuth)
+        if (maybePromise && typeof maybePromise.then === 'function') {
+          maybePromise.then(results => that.onAuth(null, results), that.onAuth)
+        }
+      } catch (err) {
+        this.onAuth(err)
       }
     }
 
@@ -118,4 +122,4 @@ function auth (functions, opts) {
   }
 }
 
-module.exports = fp(checkAuth, '3.x')
+module.exports = fp(checkAuth, '4.x')

example-async.js

@@ -5,10 +5,10 @@ const Fastify = require('fastify')
 function build (opts) {
   const fastify = Fastify(opts)
 
-  fastify.register(require('fastify-jwt'), { secret: 'supersecret' })
-  fastify.register(require('fastify-leveldb'), { name: 'authdb-async' })
+  fastify.register(require('@fastify/jwt'), { secret: 'supersecret' })
+  fastify.register(require('@fastify/leveldb'), { name: 'authdb-async' })
   fastify.register(require('./auth'))
-  fastify.after(routes)
+  fastify.register(routes)
 
   fastify.decorate('verifyJWTandLevel', verifyJWTandLevel)
   fastify.decorate('verifyUserAndPassword', verifyUserAndPassword)
@@ -65,7 +65,7 @@ function build (opts) {
     }
   }
 
-  function routes () {
+  async function routes (fastify) {
     fastify.route({
       method: 'POST',
       url: '/register',
@@ -138,9 +138,8 @@ if (require.main === module) {
       level: 'info'
     }
   })
-  fastify.listen(3000, err => {
+  fastify.listen({ port: 3000, host: '0.0.0.0' }, err => {
     if (err) throw err
-    console.log(`Server listenting at http://localhost:${fastify.server.address().port}`)
   })
 }
 

example-composited.js

@@ -136,9 +136,8 @@ if (require.main === module) {
       level: 'info'
     }
   })
-  fastify.listen(3000, '0.0.0.0', err => {
+  fastify.listen({ port: 3000, host: '0.0.0.0' }, err => {
     if (err) throw err
-    console.log(`Server listenting at http://${JSON.stringify(fastify.server.address())}`)
   })
 }
 

example.js

@@ -24,8 +24,8 @@ const Fastify = require('fastify')
 function build (opts) {
   const fastify = Fastify(opts)
 
-  fastify.register(require('fastify-jwt'), { secret: 'supersecret' })
-  fastify.register(require('fastify-leveldb'), { name: 'authdb' })
+  fastify.register(require('@fastify/jwt'), { secret: 'supersecret' })
+  fastify.register(require('@fastify/leveldb'), { name: 'authdb' })
   fastify.register(require('./auth')) // just 'fastify-auth' IRL
   fastify.after(routes)
 
@@ -170,9 +170,8 @@ if (require.main === module) {
       level: 'info'
     }
   })
-  fastify.listen(3000, err => {
+  fastify.listen({ port: 3000 }, err => {
     if (err) throw err
-    console.log(`Server listening at http://localhost:${fastify.server.address().port}`)
   })
 }
 

package.json

@@ -30,9 +30,10 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "fastify": "^3.0.0",
-    "fastify-jwt": "^3.0.0",
-    "fastify-leveldb": "^3.0.0",
+    "@fastify/jwt": "^6.0.0",
+    "@fastify/leveldb": "^5.0.0",
+    "@types/node": "^17.0.32",
+    "fastify": "^4.0.0-rc.2",
     "pre-commit": "^1.2.2",
     "rimraf": "^3.0.2",
     "standard": "^17.0.0",

test/example.test.js

@@ -102,8 +102,9 @@ test('Auth not successful', t => {
     t.error(err)
     const payload = JSON.parse(res.payload)
     t.same(payload, {
+      code: 'FAST_JWT_MALFORMED',
       error: 'Unauthorized',
-      message: 'Token not valid',
+      message: 'The token is malformed.',
       statusCode: 401
     })
   })