|
@ -152,10 +152,16 @@ class AuthController extends SiteController { |
|
|
return res.redirect('/welcome/login'); |
|
|
return res.redirect('/welcome/login'); |
|
|
} |
|
|
} |
|
|
this.log.info('user logging in', { user: user.username }); |
|
|
this.log.info('user logging in', { user: user.username }); |
|
|
req.login(user, (error) => { |
|
|
req.login(user, async (error) => { |
|
|
if (error) { |
|
|
if (error) { |
|
|
return next(error); |
|
|
return next(error); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// scrub login return URL from session
|
|
|
|
|
|
delete req.session.loginReturnTo; |
|
|
|
|
|
await this.saveSession(req); |
|
|
|
|
|
|
|
|
|
|
|
// redirect to whatever was wanted
|
|
|
return res.redirect(redirectUri); |
|
|
return res.redirect(redirectUri); |
|
|
}); |
|
|
}); |
|
|
})(req, res, next); |
|
|
})(req, res, next); |
|
|