From 17e56fe70c9269af7a3adfed5ead42f3d95fbb45 Mon Sep 17 00:00:00 2001 From: Waqas Ahmed Date: Tue, 21 Jun 2016 15:15:11 +0500 Subject: [PATCH 1/2] Removed redundant check --- .../app/server/api/user(auth)/user.model(mongooseModels).js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/templates/app/server/api/user(auth)/user.model(mongooseModels).js b/templates/app/server/api/user(auth)/user.model(mongooseModels).js index 5394bad3c..d11f5d4d1 100644 --- a/templates/app/server/api/user(auth)/user.model(mongooseModels).js +++ b/templates/app/server/api/user(auth)/user.model(mongooseModels).js @@ -95,10 +95,6 @@ UserSchema .path('email') .validate(function(value, respond) { var self = this; - <%_ if(filters.oauth) { _%> - if (authTypes.indexOf(this.provider) !== -1) { - return respond(true); - }<% } %> return this.constructor.findOne({ email: value }).exec() .then(function(user) { if (user) { From 0945adcb1cbeab586597cc46ad505932fc79af12 Mon Sep 17 00:00:00 2001 From: Waqas Ahmed Date: Tue, 21 Jun 2016 15:23:21 +0500 Subject: [PATCH 2/2] Change twitter id to string --- .../app/server/auth(auth)/twitter(twitterAuth)/passport.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/app/server/auth(auth)/twitter(twitterAuth)/passport.js b/templates/app/server/auth(auth)/twitter(twitterAuth)/passport.js index 16c34339c..6bb678064 100644 --- a/templates/app/server/auth(auth)/twitter(twitterAuth)/passport.js +++ b/templates/app/server/auth(auth)/twitter(twitterAuth)/passport.js @@ -8,6 +8,9 @@ export function setup(User, config) { callbackURL: config.twitter.callbackURL }, function(token, tokenSecret, profile, done) { + if(!isNAN(profile._json.id)){ + profile._json.id = profile._json.id.toString(); + } <% if (filters.mongooseModels) { %>User.findOne({'twitter.id': profile.id}).exec()<% } if (filters.sequelizeModels) { %>User.find({where:{'twitter.id': profile.id}})<% } %> .then(user => {