Skip to content

Commit

Permalink
Added verified in token
Browse files Browse the repository at this point in the history
  • Loading branch information
jnkindi committed Jun 20, 2019
1 parent 8347ef5 commit 0bd78fe
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions controllers/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class User {
};
await UserVerificationModel.create(verification);

let userAccount = select.pick(result, ['id', 'firstname', 'lastname', 'username', 'email', 'image']);
let userAccount = select.pick(result, ['id', 'firstname', 'lastname', 'username', 'email', 'image', 'verified']);
const token = helper.generateToken(userAccount);
userAccount = select.pick(result, ['username', 'email', 'bio', 'image']);
return helper.authenticationResponse(res, token, userAccount);
Expand Down Expand Up @@ -103,7 +103,7 @@ class User {
// verify password
if (user && helper.comparePassword(password, user.password)) {
// return user and token
let userAccount = select.pick(user, ['id', 'firstname', 'lastname', 'username', 'email', 'image']);
let userAccount = select.pick(user, ['id', 'firstname', 'lastname', 'username', 'email', 'image', 'verified']);
const token = helper.generateToken(userAccount);
userAccount = select.pick(user, ['username', 'email', 'bio', 'image']);
return helper.authenticationResponse(res, token, userAccount);
Expand Down Expand Up @@ -160,9 +160,10 @@ class User {
image: req.user.image,
provider: req.user.provider,
provideruserid: req.user.provideruserid,
verified: true
};
const result = await UserModel.socialUsers(ruser);
let userAccount = select.pick(result, ['id', 'firstname', 'lastname', 'username', 'email', 'image']);
let userAccount = select.pick(result, ['id', 'firstname', 'lastname', 'username', 'email', 'image', 'verified']);
const token = helper.generateToken(userAccount);
userAccount = select.pick(result, ['username', 'email', 'bio', 'image']);
return res.redirect(`${process.env.FRONTEND_URL}?token=${token}`);
Expand Down

0 comments on commit 0bd78fe

Please sign in to comment.