Bump simple-oauth2 from 1.6.0 to 3.4.0 (#49)

* Bump simple-oauth2 from 1.6.0 to 3.4.0

Bumps [simple-oauth2](https://github.com/lelylan/simple-oauth2) from 1.6.0 to 3.4.0.
- [Release notes](https://github.com/lelylan/simple-oauth2/releases)
- [Changelog](https://github.com/lelylan/simple-oauth2/blob/master/CHANGELOG.md)
- [Commits](lelylan/simple-oauth2@1.6.0...3.4.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* Upgrade dependencies (#51)

Co-authored-by: Thomas Heymann <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Thomas Heymann <[email protected]>
Co-authored-by: Thomas Heymann <[email protected]>

Author: 3 people

index.js

@@ -6,6 +6,7 @@ const fp = require('fastify-plugin')
 const oauth2Module = require('simple-oauth2')
 
 const promisify = require('util').promisify || require('es6-promisify').promisify
+const callbackify = require('util').callbackify
 
 function defaultGenerateStateFunction () {
   return defaultState
@@ -73,10 +74,10 @@ const oauthPlugin = fp(function (fastify, options, next) {
   }
 
   const cbk = function (o, code, callback) {
-    return o.oauth2.authorizationCode.getToken({
+    return callbackify(o.oauth2.authorizationCode.getToken.bind(o.oauth2.authorizationCode, {
       code: code,
       redirect_uri: callbackUri
-    }, callback)
+    }))(callback)
   }
 
   function getAccessTokenFromAuthorizationCodeFlowCallbacked (request, callback) {
@@ -102,7 +103,7 @@ const oauthPlugin = fp(function (fastify, options, next) {
 
   function getNewAccessTokenUsingRefreshTokenCallbacked (refreshToken, params, callback) {
     const accessToken = fastify[name].oauth2.accessToken.create({ refresh_token: refreshToken })
-    accessToken.refresh(params, callback)
+    callbackify(accessToken.refresh.bind(accessToken, params))(callback)
   }
   const getNewAccessTokenUsingRefreshTokenPromisified = promisify(getNewAccessTokenUsingRefreshTokenCallbacked)
 
@@ -112,7 +113,6 @@ const oauthPlugin = fp(function (fastify, options, next) {
     }
     getNewAccessTokenUsingRefreshTokenCallbacked(refreshToken, params, callback)
   }
-
   const oauth2 = oauth2Module.create(credentials)
 
   if (startRedirectPath) {

package.json

@@ -37,6 +37,6 @@
   "dependencies": {
     "es6-promisify": "^6.0.0",
     "fastify-plugin": "^2.0.0",
-    "simple-oauth2": "^1.6.0"
+    "simple-oauth2": "^3.4.0"
   }
 }

test.js

@@ -39,9 +39,17 @@ function makeRequests (t, fastify) {
       }
 
       const githubScope = nock('https://github.com')
-        .post('/login/oauth/access_token', 'code=my-code&redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Fcallback&grant_type=authorization_code&client_id=my-client-id&client_secret=my-secret')
+        .post('/login/oauth/access_token', 'grant_type=authorization_code&code=my-code&redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Fcallback', {
+          reqheaders: {
+            authorization: 'Basic bXktY2xpZW50LWlkOm15LXNlY3JldA=='
+          }
+        })
         .reply(200, RESPONSE_BODY)
-        .post('/login/oauth/access_token', 'grant_type=refresh_token&refresh_token=my-refresh-token&client_id=my-client-id&client_secret=my-secret')
+        .post('/login/oauth/access_token', 'grant_type=refresh_token&refresh_token=my-refresh-token', {
+          reqheaders: {
+            authorization: 'Basic bXktY2xpZW50LWlkOm15LXNlY3JldA=='
+          }
+        })
         .reply(200, RESPONSE_BODY_REFRESHED)
 
       fastify.inject({