Merge pull request #105 from vsimonian/providerfields

feat(fields): Generate sign in form for providers with defined fields

boot/passport.js

@@ -32,12 +32,13 @@ module.exports = function (passport) {
  */
 
  if (settings.providers) {
- Object.keys(settings.providers).forEach(function (name) {
- var providerConf = settings.providers[name]
- , provider = ( providers[name] ? providers[name] : providerConf )
+ Object.keys(settings.providers).forEach(function (id) {
+ var providerConf = settings.providers[id]
+ , provider = ( providers[id] ? providers[id] : providerConf )
  ;
-
- passport.use(protocols.initialize(name, provider, providerConf));
+ var strategy = protocols.initialize(id, provider, providerConf);
+ strategy.name = id;
+ passport.use(strategy);
  });
  }
 

models/User.js

@@ -290,7 +290,7 @@ User.authenticate = function (email, password, callback) {
 User.lookup = function (req, info, callback) {
  if (req.user) { return callback(null, req.user); }
 
- var provider = req.params.provider
+ var provider = req.params.provider || req.body.provider
  , index = User.collection + ':' + provider
  ;
 
@@ -336,7 +336,7 @@ User.defineIndex({
  */
 
 User.connect = function (req, auth, info, callback) {
- var provider = providers[req.params.provider];
+ var provider = providers[req.params.provider || req.body.provider];
  // what if there's no provider param?
 
  // Try to find an existing user.

models/UserApplications.js

@@ -31,7 +31,7 @@ function userApplications (user, callback) {
  }, function (err, clients) {
  if (err) { return done(err); }
  done(null, clients);
- })
+ });
  },
 
  // Get the authorized scope for the user

providers/password.js

@@ -5,8 +5,12 @@
 module.exports = function (config) {
  return {
  id: 'password',
- name: 'local',
+ name: 'Email and Password',
  protocol: 'Password',
+ fields: [
+ { name: 'email', type: 'email' },
+ { name: 'password', type: 'password' }
+ ],
  usernameField: 'email',
  passReqToCallback: 'true'
  };