Skip to content

Commit

Permalink
Merge 7121bf4 into 6029ea8
Browse files Browse the repository at this point in the history
  • Loading branch information
davdwhyte87 committed Apr 9, 2019
2 parents 6029ea8 + 7121bf4 commit e5d94ec
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ GOOGLE_CALLBACK_URL=
COOKIE_SECRET=

API_DOMAIN=localhost:3000

WEB_APP=localhost:3000/api/v1/users/confirm_account
6 changes: 3 additions & 3 deletions server/controllers/usersController.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ class UsersController {
await user.setRole(role);
const token = await generateToken({ user });
// generate confirm token
const confirmToken = await generateToken({ email: user.email });
const confirmationToken = await generateToken({ email: user.email });
// generate confirm link
const confrimLink = `${env('API_DOMAIN')}/api/v1/users/confirm_account?token=${confirmToken}`;
const confrimationLink = `${env('WEB_APP')}?token=${confirmationToken}`;
// send the user a mail
const data = {
email: user.email,
subject: 'Account confirmation',
mailContext: {
link: confrimLink
link: confrimationLink
},
template: 'signup'
};
Expand Down

0 comments on commit e5d94ec

Please sign in to comment.