step-change

@@ -37,8 +37,6 @@ passport.use(new LocalStrategy({
     let clientIp = req.yoho.clientIp || '';
     let clientIp = req.yoho.clientIp || '';
     let isSkip = req.body.isskip;
     let isSkip = req.body.isskip;
 
 
-    console.log('loginPost:', req.session.passwordWeakIgnore);
-
     if (isNaN(parseInt(area, 0)) || _.isEmpty(username) || _.isEmpty(password)) {
     if (isNaN(parseInt(area, 0)) || _.isEmpty(username) || _.isEmpty(password)) {
         logger.info(`【Passport Login】bad params, area:${area} account:${username} password:${password}`);
         logger.info(`【Passport Login】bad params, area:${area} account:${username} password:${password}`);
         return done('登录参数错误', null);
         return done('登录参数错误', null);
@@ -74,7 +72,7 @@ passport.use(new LocalStrategy({
         } else if (result.code && result.code === 4189) {
         } else if (result.code && result.code === 4189) {
             done({code: 4189}, null);
             done({code: 4189}, null);
         } else if (result.code && result.code === 510) {
         } else if (result.code && result.code === 510) {
-            done({code: 510, data: result.data}, null);
+            done(null, Object.assign(result.data, {weakPassword: true}));
         } else {
         } else {
             done('账号或密码不正确', null);
             done('账号或密码不正确', null);
         }
         }

@@ -192,14 +192,6 @@ const local = {
                     };
                     };
 
 
                     return res.json(obj);
                     return res.json(obj);
-                } else if (err.code === 510) {
-                    req.session.passwordWeak = err.data;
-                    return res.json({
-                        code: 510,
-                        url: '/passport/password/resetpage',
-                        pwdTip: _.get(err, 'data.pwdTip', '密码应为6-20位字母、数字的组合'),
-                        uid: _.get(err, 'data.uid', '')
-                    });
                 } else {
                 } else {
                     let obj = {
                     let obj = {
                         code: 400,
                         code: 400,
@@ -231,11 +223,35 @@ const local = {
                 res.cookie('_LOGIN_TYPE', 0, {
                 res.cookie('_LOGIN_TYPE', 0, {
                     domain: 'm.yohobuy.com'
                     domain: 'm.yohobuy.com'
                 });
                 });
+
+
+                // 弱密码返回数据
+                let passwordWeakReturn;
+
+                if (user.weakPassword) {
+                    req.session.passwordWeak = user;
+                    passwordWeakReturn = {
+                        code: 510,
+                        url: '/passport/password/resetpage',
+                        pwdTip: _.get(user, 'pwdTip', '密码应为6-20位字母、数字的组合'),
+                        uid: _.get(user, 'uid', '')
+                    };
+                }
+
+                // 不可以跳过，不登录用户
+                if (user.weakPassword && user.canSkip !== 'Y') {
+                    return res.json(passwordWeakReturn);
+                }
+
                 AuthHelper.syncUserSession(user.uid, req, res, user.session_key).then(() => {
                 AuthHelper.syncUserSession(user.uid, req, res, user.session_key).then(() => {
-                    res.json({
-                        code: 200,
-                        data: user
-                    });
+                    if (user.weakPassword) {
+                        return res.json(passwordWeakReturn);
+                    } else {
+                        res.json({
+                            code: 200,
+                            data: user
+                        });
+                    }
                 }).catch(next);
                 }).catch(next);
             }
             }
         })(req, res, next);
         })(req, res, next);

@@ -2,7 +2,7 @@
  * @Author: Targaryen
  * @Author: Targaryen
  * @Date: 2017-04-13 10:21:07
  * @Date: 2017-04-13 10:21:07
  * @Last Modified by: Targaryen
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-04-14 17:51:10
+ * @Last Modified time: 2017-04-17 15:52:03
  */
  */
 
 
 /* ********************
 /* ********************
@@ -11,10 +11,25 @@
 
 
 'use strict';
 'use strict';
 
 
+const config = global.yoho.config;
+const utils = require(global.utils);
 const reset = require('../models/reset');
 const reset = require('../models/reset');
 
 
 const passwordResetPage = (req, res) => {
 const passwordResetPage = (req, res) => {
     let passwordWeakObj = req.session.passwordWeak;
     let passwordWeakObj = req.session.passwordWeak;
+    let refer = req.cookies.refer;
+
+    if (refer) {
+        refer = decodeURI(req.cookies.refer);
+    } else {
+        refer = `${config.siteUrl}/home`;
+    }
+
+    if (/sign|login/.test(refer)) {
+        refer = `${config.siteUrl}/home`;
+    }
+
+    refer = utils.refererLimit(refer);
 
 
     res.render('reset/password', {
     res.render('reset/password', {
         width750: true,
         width750: true,
@@ -22,7 +37,7 @@ const passwordResetPage = (req, res) => {
         page: 'reset',
         page: 'reset',
         pageStyle: 'passport-body',
         pageStyle: 'passport-body',
         title: '重置密码',
         title: '重置密码',
-        canSkip: passwordWeakObj.canSkip === 'Y'
+        canSkip: passwordWeakObj.canSkip === 'Y' ? refer : false
     });
     });
 };
 };
 
 
@@ -34,8 +49,9 @@ const passwordResetPage = (req, res) => {
  */
  */
 const passwordReset = (req, res, next) => {
 const passwordReset = (req, res, next) => {
     let passwordWeakObj = req.session.passwordWeak;
     let passwordWeakObj = req.session.passwordWeak;
+    let uid = req.user.uid;
 
 
-    if (!passwordWeakObj.uid || !passwordWeakObj.token) {
+    if (!uid || !passwordWeakObj.token) {
         return res.json({
         return res.json({
             code: 400,
             code: 400,
             massage: '非法请求'
             massage: '非法请求'
@@ -45,7 +61,7 @@ const passwordReset = (req, res, next) => {
     req.session.passwordWeak = null;
     req.session.passwordWeak = null;
 
 
     reset.resetPassword({
     reset.resetPassword({
-        uid: passwordWeakObj.uid,
+        uid: uid,
         oldPwd: req.body.oldPwd,
         oldPwd: req.body.oldPwd,
         newPwd: req.body.newPwd,
         newPwd: req.body.newPwd,
         token: passwordWeakObj.token
         token: passwordWeakObj.token

@@ -4,7 +4,7 @@
     </div>
     </div>
     {{#if canSkip}}
     {{#if canSkip}}
     <div class="ignore" id="ignoreBtn">
     <div class="ignore" id="ignoreBtn">
-        <span>跳过</span>
+        <a href="{{canSkip}}"><span>跳过</span></a>
     </div>
     </div>
     {{/if}}
     {{/if}}
     <div class="tip">
     <div class="tip">

@@ -15,10 +15,13 @@
         margin-right: 60px;
         margin-right: 60px;
         padding: 12px 32px;
         padding: 12px 32px;
         border-radius: 32px;
         border-radius: 32px;
-        color: #fff;
         border: 1px solid #fff;
         border: 1px solid #fff;
     }
     }
 
 
+    .ignore a {
+        color: #fff;
+    }
+
     .tip {
     .tip {
         text-align: center;
         text-align: center;
         font-size: 16px;
         font-size: 16px;