Merge pull request strongloop#140 from ernie58/returnStrategy

Return the configured strategy

Author: superkhau

lib/passport-configurator.js

@@ -205,9 +205,10 @@ PassportConfigurator.prototype.configureProvider = function(name, options) {
     };
   };
 
+  var strategy;
   switch (authType) {
     case 'ldap':
-      passport.use(name, new AuthStrategy(_.defaults({
+      strategy = new AuthStrategy(_.defaults({
         usernameField: options.usernameField || 'username',
         passwordField: options.passwordField || 'password',
         session: options.session, authInfo: true,
@@ -235,10 +236,10 @@ PassportConfigurator.prototype.configureProvider = function(name, options) {
             done(null);
           }
         }
-      ));
+      );
       break;
     case 'local':
-      passport.use(name, new AuthStrategy(_.defaults({
+      strategy = new AuthStrategy(_.defaults({
         usernameField: options.usernameField || 'username',
         passwordField: options.passwordField || 'password',
         session: options.session, authInfo: true,
@@ -319,12 +320,12 @@ PassportConfigurator.prototype.configureProvider = function(name, options) {
             }
           });
         }
-      ));
+      );
       break;
     case 'oauth':
     case 'oauth1':
     case 'oauth 1.0':
-      passport.use(name, new AuthStrategy(_.defaults({
+      strategy = new AuthStrategy(_.defaults({
         consumerKey: options.consumerKey,
         consumerSecret: options.consumerSecret,
         callbackURL: callbackURL,
@@ -347,10 +348,10 @@ PassportConfigurator.prototype.configureProvider = function(name, options) {
               }, options, loginCallback(req, done));
           }
         }
-      ));
+      );
       break;
     case 'openid':
-      passport.use(name, new AuthStrategy(_.defaults({
+      strategy = new AuthStrategy(_.defaults({
         returnURL: options.returnURL,
         realm: options.realm,
         callbackURL: callbackURL,
@@ -370,10 +371,10 @@ PassportConfigurator.prototype.configureProvider = function(name, options) {
               { identifier: identifier }, options, loginCallback(req, done));
           }
         }
-      ));
+      );
       break;
     case 'openid connect':
-      passport.use(name, new AuthStrategy(_.defaults({
+      strategy = new AuthStrategy(_.defaults({
         clientID: clientID,
         clientSecret: clientSecret,
         callbackURL: callbackURL,
@@ -397,10 +398,10 @@ PassportConfigurator.prototype.configureProvider = function(name, options) {
               options, loginCallback(req, done));
           }
         }
-      ));
+      );
       break;
     default:
-      passport.use(name, new AuthStrategy(_.defaults({
+      strategy = new AuthStrategy(_.defaults({
         clientID: clientID,
         clientSecret: clientSecret,
         callbackURL: callbackURL,
@@ -424,9 +425,11 @@ PassportConfigurator.prototype.configureProvider = function(name, options) {
               options, loginCallback(req, done));
           }
         }
-      ));
+      );
   }
 
+  passport.use(name, strategy);
+
   var defaultCallback = function(req, res, next) {
     // The default callback
     passport.authenticate(name, _.defaults({ session: session },
@@ -575,4 +578,6 @@ PassportConfigurator.prototype.configureProvider = function(name, options) {
     var queryString = url + separator + fieldValuePair;
     return queryString;
   }
+
+  return strategy;
 };

test/configure-provider.test.js

@@ -0,0 +1,63 @@
+var loopback = require('loopback');
+var m = require('./init');
+var mock = require('mock-require');
+var PassportConfigurator = require('../lib/passport-configurator.js');
+var assert = require('assert');
+
+describe('configureProvider', function() {
+  var app;
+  var passportConfigurator;
+
+  function LDAPStrategy(options, verify) {};
+  function LocalStrategy(options, verify) {};
+  function OAuth1Strategy(options, verify) {};
+  function OAuth2Strategy(options, verify) {};
+  function OpenIDStrategy(options, verify) {};
+  function OpenIDConnectStrategy(options, verify) {};
+
+  function testReturnType(Strategy, module, authScheme) {
+    var options = {
+      'authScheme': authScheme,
+      'module': module,
+    };
+    var strategy = passportConfigurator.configureProvider(authScheme + 'ProviderName', options);
+    assert(strategy instanceof Strategy);
+  }
+
+  before('setup loopback and configurator', function() {
+    app = loopback();
+    passportConfigurator = new PassportConfigurator(app);
+  });
+  before('mock specific strategies', function() {
+    mock('passport-ldapauth', LDAPStrategy);
+    mock('passport-local', LocalStrategy);
+    mock('passport-oauth1', OAuth1Strategy);
+    mock('passport-oauth2', OAuth2Strategy);
+    mock('passport-openid', OpenIDStrategy);
+    mock('passport-openidconnect', OpenIDConnectStrategy);
+  });
+
+  it('returns an LDAPStrategy', function() {
+    testReturnType(LDAPStrategy, 'passport-ldapauth', 'ldap');
+  });
+
+  it('returns an LocalStrategy', function() {
+    testReturnType(LocalStrategy, 'passport-local', 'local');
+  });
+
+  it('returns an Oauth1Strategy', function() {
+    testReturnType(OAuth1Strategy, 'passport-oauth1', 'oauth1');
+  });
+
+  it('returns an Oauth2Strategy', function() {
+    testReturnType(OAuth2Strategy, 'passport-oauth2', 'oauth2');
+  });
+
+  it('returns an OpenIdStrategy', function() {
+    testReturnType(OpenIDStrategy, 'passport-openid', 'openid');
+  });
+
+  it('returns an OpenIdConnectStrategy', function() {
+    testReturnType(OpenIDConnectStrategy, 'passport-openidconnect', 'openid connect');
+  });
+});