Simplified redirectOptions (#44)

feathersjs · Aug 28, 2018 · 5ddf5a9 · 5ddf5a9
1 parent 638655b
commit 5ddf5a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/packages/authentication-oauth2/src/index.js b/packages/authentication-oauth2/src/index.js
@@ -67,7 +67,7 @@ export default function init (options = {}) {
 
     // register OAuth middleware
     debug(`Registering '${name}' Express OAuth middleware`);
-    app.get(oauth2Settings.path, auth.express.authenticate(name, oauth2Settings[name]));
+    app.get(oauth2Settings.path, auth.express.authenticate(name, oauth2Settings));
     app.get(
       oauth2Settings.callbackPath,
       auth.express.authenticate(name, oauth2Settings),

diff --git a/packages/authentication-oauth2/test/index.test.js b/packages/authentication-oauth2/test/index.test.js
@@ -114,13 +114,13 @@ describe('feathers-authentication-oauth2', () => {
 
     it('registers the redirect options on strategy options', () => {
       sinon.spy(authentication.express, 'authenticate');
-
-      const mergedOptions = Object.assign({}, config, globalConfig)
+      
+      const mergedOptions = Object.assign({}, config, globalConfig);
       app.configure(oauth2(mergedOptions));
       app.setup();
-      
-      const strategyOptions = mergedOptions[config.name]
-      expect(authentication.express.authenticate).to.have.been.calledWith(config.name, strategyOptions);
+
+      delete mergedOptions.Strategy;
+      expect(authentication.express.authenticate).to.have.been.calledWith(config.name, sinon.match(mergedOptions));
 
       authentication.express.authenticate.restore();
     });