Merge pull request #37 from feathersjs/auth-prop

Fix old property name fallback for backwards compatibility
feathersjs · Aug 28, 2018 · 93f65d7 · 93f65d7
1 parent bb81f28
commit 93f65d7
Show file tree

Hide file tree

Showing 3 changed files with 114 additions and 21 deletions.
diff --git a/packages/authentication-oauth2/package-lock.json b/packages/authentication-oauth2/package-lock.json
diff --git a/packages/authentication-oauth2/src/express/handler.js b/packages/authentication-oauth2/src/express/handler.js
@@ -6,7 +6,7 @@ const debug = Debug('feathers-authentication-oauth2:handler');
 export default function OAuthHandler (options = {}) {
   return function (req, res, next) {
     const app = req.app;
-    const authSettings = app.get('authentication') || {};
+    const authSettings = app.get('auth') || app.get('authentication') || {};
     const entity = req[options.entity];
     const payload = req.payload;
     const params = {

diff --git a/packages/authentication-oauth2/src/index.js b/packages/authentication-oauth2/src/index.js
@@ -1,5 +1,4 @@
 import Debug from 'debug';
-import url from 'url';
 import auth from 'feathers-authentication';
 import { formatter as defaultFormatter } from 'feathers-rest';
 import { omit, pick, makeUrl } from 'feathers-commons';
@@ -38,7 +37,7 @@ export default function init (options = {}) {
       throw new Error(`You must provide a passport 'Strategy' instance.`);
     }
 
-    const authSettings = app.get('authentication') || {};
+    const authSettings = app.get('auth') || app.get('authentication') || {};
 
     // Attempt to pull options from the global auth config
     // for this provider.