This repository has been archived by the owner on Oct 13, 2021. It is now read-only.
created user flag option #16
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dee-kryvenko
commented
Apr 15, 2017
app/config/passport.js
Outdated
| @@ -4,6 +4,7 @@ module.exports = function (passport, passportHelpers, models, moment, BasicStrat | |||
|
|
|||
| let UserAuthToken = models.userAuthToken; | |||
| let User = models.user; | |||
| let flag = User.flag; | |||
app/config/passport.js
Outdated
| @@ -16,6 +17,7 @@ module.exports = function (passport, passportHelpers, models, moment, BasicStrat | |||
| }, function (err, user) { | |||
| if (err) return done(err); | |||
| if (!user) return done(null, false); | |||
| if (flag = false) return done(null, false); | |||
There was a problem hiding this comment.
if (!user.flag) return done(null, false);
app/models/user.js
Outdated
| @@ -10,21 +10,23 @@ module.exports = function (modelHelpers, connection, mongoose) { | |||
| email: {type: String, required: true}, | |||
| name: {type: String, required: true}, | |||
| avatar: String, | |||
| roles: [{type: mongoose.Schema.Types.ObjectId, ref: 'UserRole'}] | |||
| roles: [{type: mongoose.Schema.Types.ObjectId, ref: 'UserRole'}], | |||
| flag : {type: boolean} | |||
There was a problem hiding this comment.
flag: {type: boolean, required: true, default: false}
There was a problem hiding this comment.
Also please let's change name of this field to something that makes sense, for instance isActivated
app/models/user.js
Outdated
| }); | ||
|
|
||
| userSchema.methods.toString = function () { | ||
| return this.username; | ||
| }; | ||
|
|
||
| userSchema.statics.generateNew = function (username, password, email, name, avatar, defaultRole) { | ||
| userSchema.statics.generateNew = function (username, password, email, name, avatar, defaultRole, flag) { |
There was a problem hiding this comment.
As discussed we don't need this flag to be passed outside, we know it should be false by default
app/models/user.js
Outdated
| return new User({ | ||
| username: username, | ||
| password: password, | ||
| email: email, | ||
| name: name, | ||
| avatar: avatar, | ||
| roles: [defaultRole] | ||
| roles: [defaultRole], | ||
| flag : {type: boolean, required: true} |
dee-kryvenko
commented
Apr 19, 2017
| @@ -10,21 +10,23 @@ module.exports = function (modelHelpers, connection, mongoose) { | |||
| email: {type: String, required: true}, | |||
| name: {type: String, required: true}, | |||
| avatar: String, | |||
| roles: [{type: mongoose.Schema.Types.ObjectId, ref: 'UserRole'}] | |||
| roles: [{type: mongoose.Schema.Types.ObjectId, ref: 'UserRole'}], | |||
| emailConfirmed : {type: boolean} | |||
There was a problem hiding this comment.
should be emailConfirmed: {type: boolean, required: true, default: false}
dee-kryvenko
commented
Apr 19, 2017
| }); | ||
|
|
||
| userSchema.methods.toString = function () { | ||
| return this.username; | ||
| }; | ||
|
|
||
| userSchema.statics.generateNew = function (username, password, email, name, avatar, defaultRole) { | ||
| userSchema.statics.generateNew = function (username, password, email, name, avatar, defaultRole,) { |
There was a problem hiding this comment.
trailing , should be removed
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.