fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit ec25c136637ebab589b52c29659ab74c4f2d267f 2 parents 6c1f2e09 840d0a34

Merge branch 'feature/resetPassword' into release/5.6

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
... ... @@ -2,7 +2,7 @@
* @Author: Targaryen
* @Date: 2017-04-13 10:21:07
* @Last Modified by: Targaryen
* @Last Modified time: 2017-04-17 15:52:03
* @Last Modified time: 2017-04-18 09:55:57
*/
/* ********************
... ... @@ -49,7 +49,7 @@ const passwordResetPage = (req, res) => {
*/
const passwordReset = (req, res, next) => {
let passwordWeakObj = req.session.passwordWeak;
let uid = req.user.uid;
let uid = req.user && req.user.uid || passwordWeakObj.uid;
if (!uid || !passwordWeakObj.token) {
return res.json({
... ...