Update fastify to v3 (#44)

* update fastify to v3

* add dependabot config

* add github actions config

* add plugin version

* update fastify version

Author: frikille

.dependabot/config.yml

@@ -0,0 +1,5 @@
+version: 1
+update_configs:
+  - package_manager: "javascript"
+    directory: "/"
+    update_schedule: "daily"

.github/workflows/ci.yml

@@ -0,0 +1,18 @@
+name: CI workflow
+on: [push, pull_request]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [10.x, 12.x, 14.x]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - name: Install Dependencies
+      run: npm install --ignore-scripts
+    - name: Test
+      run: npm test

.travis.yml

@@ -1,5 +1,7 @@
 # fastify-oauth2
 
+![CI workflow](https://github.com/fastify/fastify-oauth2/workflows/CI%20workflow/badge.svg)
+
 Wrap around [`simple-oauth2`](https://github.com/lelylan/simple-oauth2) library.
 
 ## Install

README.md

@@ -1,10 +1,9 @@
-import * as fastify from 'fastify';
-import * as http from 'http';
+import { FastifyRequest, FastifyInstance, RawServerBase, RawRequestDefaultExpression, RawReplyDefaultExpression, FastifyError } from 'fastify';
 
-declare function fastifyOauth2(
-  instance: fastify.FastifyInstance<http.Server, http.IncomingMessage, http.ServerResponse>,
-  options: fastifyOauth2.FastifyOAuth2Options,
-  callback: (err?: fastify.FastifyError) => void,
+declare function fastifyOauth2 (
+  instance: FastifyInstance<RawServerBase, RawRequestDefaultExpression<RawServerBase>, RawReplyDefaultExpression<RawServerBase>>,
+  opts: fastifyOauth2.FastifyOAuth2Options,
+  next: (err?: FastifyError) => void
 ): void;
 
 declare namespace fastifyOauth2 {
@@ -25,11 +24,11 @@ declare namespace fastifyOauth2 {
 
   interface OAuth2Namespace {
     getAccessTokenFromAuthorizationCodeFlow(
-      request: fastify.FastifyRequest<http.IncomingMessage>,
+      request: FastifyRequest,
     ): Promise<OAuth2Token>;
 
     getAccessTokenFromAuthorizationCodeFlow(
-      request: fastify.FastifyRequest<http.IncomingMessage>,
+      request: FastifyRequest,
       callback: (token: OAuth2Token) => void,
     ): void;
 

index.d.ts

@@ -132,6 +132,9 @@ const oauthPlugin = fp(function (fastify, options, next) {
   }
 
   next()
+}, {
+  fastify: '>=3.x',
+  name: 'fastify-oauth2'
 })
 
 oauthPlugin.FACEBOOK_CONFIGURATION = {

index.js

@@ -1,6 +1,7 @@
-import * as fastify from 'fastify';
+import fastify, { FastifyInstance } from 'fastify';
 import * as fastifyOauth2 from '.';
 import { expectType, expectError, expectAssignable } from 'tsd';
+import { Server, IncomingMessage, ServerResponse } from 'http';
 
 /**
  * Preparing some data for testing.
@@ -43,7 +44,6 @@ expectType<fastifyOauth2.ProviderConfiguration>(auth);
 expectType<string[]>(scope);
 expectType<fastifyOauth2.Credentials>(credentials);
 
-expectType<void>(fastifyOauth2(server, OAuth2Options, () => {}));
 expectError(fastifyOauth2()); // error because missing required arguments
 expectError(fastifyOauth2(server, {}, () => {})); // error because missing required options
 

index.test-d.ts

@@ -25,7 +25,7 @@
   ],
   "homepage": "https://github.com/fastify/fastify-oauth2#readme",
   "devDependencies": {
-    "fastify": "^2.0.1",
+    "fastify": "^3.0.0-rc.1",
     "nock": "^9.0.0",
     "pre-commit": "^1.2.2",
     "simple-get": "^3.0.2",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "es6-promisify": "^6.0.0",
-    "fastify-plugin": "^1.0.1",
+    "fastify-plugin": "^2.0.0",
     "simple-oauth2": "^1.6.0"
   }
 }

package.json

@@ -479,6 +479,6 @@ t.test('already decorated', t => {
       callbackUri: '/callback'
     })
     .ready(err => {
-      t.strictSame(err.message, 'FST_ERR_DEC_ALREADY_PRESENT: The decorator \'githubOAuth2\' has already been added!')
+      t.strictSame(err.message, 'The decorator \'githubOAuth2\' has already been added!')
     })
 })