Skip to content

Commit 221f7a4

Browse files
Andy SmircichAwk34
Andy Smircich
authored andcommitted
fix(server:oauth): fix sequelize syntax
closes #1654
1 parent d7cd347 commit 221f7a4

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

app/templates/server/api/user(auth)/user.model(sequelizeModels).js

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ module.exports = function(sequelize, DataTypes) {
3838
},
3939
provider: DataTypes.STRING,
4040
salt: DataTypes.STRING<% if (filters.oauth) { %>,<% if (filters.facebookAuth) { %>
41-
facebook: DataTypes.TEXT,<% } %><% if (filters.twitterAuth) { %>
42-
twitter: DataTypes.TEXT,<% } %><% if (filters.googleAuth) { %>
43-
google: DataTypes.TEXT,<% } %>
44-
github: DataTypes.TEXT<% } %>
41+
facebook: DataTypes.JSON,<% } %><% if (filters.twitterAuth) { %>
42+
twitter: DataTypes.JSON,<% } %><% if (filters.googleAuth) { %>
43+
google: DataTypes.JSON,<% } %>
44+
github: DataTypes.JSON<% } %>
4545

4646
}, {
4747

app/templates/server/auth(auth)/facebook(facebookAuth)/passport.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ export function setup(User, config) {
1313
},
1414
function(accessToken, refreshToken, profile, done) {
1515
<% if (filters.mongooseModels) { %>User.findOneAsync({<% }
16-
if (filters.sequelizeModels) { %>User.find({<% } %>
16+
if (filters.sequelizeModels) { %>User.find({where:{<% } %>
1717
'facebook.id': profile.id
18-
})
18+
<% if (filters.sequelizeModels) { %>}<% } %>})
1919
.then(user => {
2020
if (user) {
2121
return done(null, user);

app/templates/server/auth(auth)/google(googleAuth)/passport.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ export function setup(User, config) {
99
},
1010
function(accessToken, refreshToken, profile, done) {
1111
<% if (filters.mongooseModels) { %>User.findOneAsync({<% }
12-
if (filters.sequelizeModels) { %>User.find({<% } %>
12+
if (filters.sequelizeModels) { %>User.find({where:{<% } %>
1313
'google.id': profile.id
14-
})
14+
<% if (filters.sequelizeModels) { %>}<% } %>})
1515
.then(user => {
1616
if (user) {
1717
return done(null, user);

app/templates/server/auth(auth)/twitter(twitterAuth)/passport.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ export function setup(User, config) {
99
},
1010
function(token, tokenSecret, profile, done) {
1111
<% if (filters.mongooseModels) { %>User.findOneAsync({<% }
12-
if (filters.sequelizeModels) { %>User.find({<% } %>
13-
'twitter.id_str': profile.id
14-
})
12+
if (filters.sequelizeModels) { %>User.find({where:{<% } %>
13+
'twitter.id': profile.id
14+
<% if (filters.sequelizeModels) { %>}<% } %>})
1515
.then(user => {
1616
if (user) {
1717
return done(null, user);

0 commit comments

Comments
 (0)