Skip to content

Commit 36748f7

Browse files
committed
refactor(user.model): fix eslint warning, and resolved mongoose deprecation warning
1 parent fb067f4 commit 36748f7

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

Diff for: templates/app/server/api/user(auth)/user.model(mongooseModels).js

+5-5
Original file line numberDiff line numberDiff line change
@@ -99,22 +99,22 @@ UserSchema
9999
// Validate email is not taken
100100
UserSchema
101101
.path('email')
102-
.validate(function(value, respond) {
102+
.validate(function(value) {
103103
<%_ if(filters.oauth) { -%>
104104
if(authTypes.indexOf(this.provider) !== -1) {
105-
return respond(true);
105+
return true;
106106
}
107107

108108
<%_ } -%>
109109
return this.constructor.findOne({ email: value }).exec()
110110
.then(user => {
111111
if(user) {
112112
if(this.id === user.id) {
113-
return respond(true);
113+
return true;
114114
}
115-
return respond(false);
115+
return false;
116116
}
117-
return respond(true);
117+
return true;
118118
})
119119
.catch(function(err) {
120120
throw err;

Diff for: templates/app/server/config/seed(models).js

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ export default function seedDatabaseIfNeeded() {
1717
<% if (filters.mongooseModels) { %>Thing.find({}).remove()<% }
1818
if (filters.sequelizeModels) { %>return Thing.destroy({ where: {} })<% } %>
1919
.then(() => {
20-
<% if (filters.mongooseModels) { %>return Thing.create({<% }
21-
if (filters.sequelizeModels) { %>return Thing.bulkCreate([{<% } %>
20+
<% if (filters.mongooseModels) { %>let thing = Thing.create({<% }
21+
if (filters.sequelizeModels) { %>let thing = Thing.bulkCreate([{<% } %>
2222
name: 'Development Tools',
2323
info: 'Integration with popular tools such as Webpack, Gulp, Babel, TypeScript, Karma, '
2424
+ 'Mocha, ESLint, Node Inspector, Livereload, Protractor, Pug, '
@@ -47,6 +47,7 @@ export default function seedDatabaseIfNeeded() {
4747
+ 'and openshift subgenerators'
4848
<% if (filters.mongooseModels) { %>});<% }
4949
if (filters.sequelizeModels) { %>}]);<% } %>
50+
return thing;
5051
})
5152
.then(() => console.log('finished populating things'))
5253
.catch(err => console.log('error populating things', err));

0 commit comments

Comments
 (0)