Skip to content

Commit

Permalink
start work on porting the reset password page
Browse files Browse the repository at this point in the history
  • Loading branch information
paglias committed Sep 21, 2017
1 parent 7a74d4c commit af516c1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
1 change: 1 addition & 0 deletions website/client/router.js
Expand Up @@ -100,6 +100,7 @@ const router = new VueRouter({
routes: [
{ name: 'register', path: '/register', component: RegisterLogin, meta: {requiresLogin: false} },
{ name: 'login', path: '/login', component: RegisterLogin, meta: {requiresLogin: false} },
{ name: 'resetPassword', path: '/reset-password', component: RegisterLogin, meta: {requiresLogin: false} },
{ name: 'tasks', path: '/', component: UserTasks },
{
path: '/inventory',
Expand Down
9 changes: 4 additions & 5 deletions website/server/controllers/top-level/auth.js
Expand Up @@ -27,11 +27,10 @@ api.resetPasswordSetNewOne = {
let user = await validatePasswordResetCodeAndFindUser(req.query.code);
let isValidCode = Boolean(user);

return renderPasswordResetPage({
res,
hasError: !isValidCode,
message: !isValidCode ? res.t('invalidPasswordResetCode') : null,
});
const hasError = !isValidCode;
const message = !isValidCode ? res.t('invalidPasswordResetCode') : null;

return res.redirect(`/reset-password?hasError=${hasError}&message=${message}`);
},
};

Expand Down

0 comments on commit af516c1

Please sign in to comment.