fix(server:oauth): fix sequelize syntax

closes #1654
angular-fullstack · Feb 25, 2016 · 221f7a4 · 221f7a4
1 parent d7cd347
commit 221f7a4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/app/templates/server/api/user(auth)/user.model(sequelizeModels).js b/app/templates/server/api/user(auth)/user.model(sequelizeModels).js
@@ -38,10 +38,10 @@ module.exports = function(sequelize, DataTypes) {
     },
     provider: DataTypes.STRING,
     salt: DataTypes.STRING<% if (filters.oauth) { %>,<% if (filters.facebookAuth) { %>
-    facebook: DataTypes.TEXT,<% } %><% if (filters.twitterAuth) { %>
-    twitter: DataTypes.TEXT,<% } %><% if (filters.googleAuth) { %>
-    google: DataTypes.TEXT,<% } %>
-    github: DataTypes.TEXT<% } %>
+    facebook: DataTypes.JSON,<% } %><% if (filters.twitterAuth) { %>
+    twitter: DataTypes.JSON,<% } %><% if (filters.googleAuth) { %>
+    google: DataTypes.JSON,<% } %>
+    github: DataTypes.JSON<% } %>
 
   }, {
 

diff --git a/app/templates/server/auth(auth)/facebook(facebookAuth)/passport.js b/app/templates/server/auth(auth)/facebook(facebookAuth)/passport.js
@@ -13,9 +13,9 @@ export function setup(User, config) {
   },
   function(accessToken, refreshToken, profile, done) {
     <% if (filters.mongooseModels) { %>User.findOneAsync({<% }
-       if (filters.sequelizeModels) { %>User.find({<% } %>
+       if (filters.sequelizeModels) { %>User.find({where:{<% } %>
       'facebook.id': profile.id
-    })
+    <% if (filters.sequelizeModels) { %>}<% } %>})
       .then(user => {
         if (user) {
           return done(null, user);

diff --git a/app/templates/server/auth(auth)/google(googleAuth)/passport.js b/app/templates/server/auth(auth)/google(googleAuth)/passport.js
@@ -9,9 +9,9 @@ export function setup(User, config) {
   },
   function(accessToken, refreshToken, profile, done) {
     <% if (filters.mongooseModels) { %>User.findOneAsync({<% }
-       if (filters.sequelizeModels) { %>User.find({<% } %>
+       if (filters.sequelizeModels) { %>User.find({where:{<% } %>
       'google.id': profile.id
-    })
+    <% if (filters.sequelizeModels) { %>}<% } %>})
       .then(user => {
         if (user) {
           return done(null, user);

diff --git a/app/templates/server/auth(auth)/twitter(twitterAuth)/passport.js b/app/templates/server/auth(auth)/twitter(twitterAuth)/passport.js
@@ -9,9 +9,9 @@ export function setup(User, config) {
   },
   function(token, tokenSecret, profile, done) {
     <% if (filters.mongooseModels) { %>User.findOneAsync({<% }
-       if (filters.sequelizeModels) { %>User.find({<% } %>
-      'twitter.id_str': profile.id
-    })
+       if (filters.sequelizeModels) { %>User.find({where:{<% } %>
+      'twitter.id': profile.id
+    <% if (filters.sequelizeModels) { %>}<% } %>})
       .then(user => {
         if (user) {
           return done(null, user);