fixed repeated login error, no longer throws duplicate user error

This commit is contained in:
Sahat Yalkabov
2013-11-19 01:57:13 -05:00
parent 20011d257d
commit dd0dbd7138
2 changed files with 33 additions and 18 deletions

View File

@ -39,21 +39,23 @@ passport.use(new FacebookStrategy({
callbackURL: config.facebook.callbackUrl || "http://localhost:8000/auth/facebook/callback" callbackURL: config.facebook.callbackUrl || "http://localhost:8000/auth/facebook/callback"
}, },
function (accessToken, refreshToken, profile, done) { function (accessToken, refreshToken, profile, done) {
User.findOne({ $where: profile.provider + '==' + profile.id }, function(err, existingUser) { console.log(profile.provider);
if (existingUser) { console.log(profile.id);
done(null, existingUser); User.findOne({ facebook: profile.id }, function(err, existingUser) {
} else { console.log(err);
var user = new User({ console.log(existingUser);
firstName: profile.name.givenName, if (existingUser) return done(null, existingUser);
lastName: profile.name.familyName, var user = new User({
provider: profile.provider firstName: profile.name.givenName,
}); lastName: profile.name.familyName,
user[profile.provider] = profile.id; provider: profile.provider
user.save(function(err) { });
if (err) throw err; user[profile.provider] = profile.id;
done(null, user);
}); user.save(function(err) {
} if (err) throw err;
done(null, user);
});
}); });
} }

View File

@ -2,13 +2,26 @@ var mongoose = require('mongoose'),
bcrypt = require('bcrypt'); bcrypt = require('bcrypt');
var userSchema = new mongoose.Schema({ var userSchema = new mongoose.Schema({
email: { type: String, unique: true },
firstName: { type: String, required: true}, firstName: { type: String, required: true},
lastName: { type: String, required: true}, lastName: { type: String, required: true},
email: { type: String, required: true, unique: true }, password: String,
password: { type: String, required: true}, admin: { type: Boolean, default: false },
admin: { type: Boolean, default: false } provider: String,
facebook: String,
google: String
}); });
userSchema.path('password').validate(function(password) {
if (this.provider) return true;
return password.length;
}, 'Password cannot be blank');
userSchema.path('email').validate(function(email) {
if (this.provider) return true;
return email.length;
}, 'Email cannot be blank');
userSchema.pre('save', function(next) { userSchema.pre('save', function(next) {
var user = this; var user = this;
var SALT_FACTOR = 5; var SALT_FACTOR = 5;