弱密码中间件

@@ -176,6 +176,7 @@ try {
     const layoutTools = require('./doraemon/middleware/layout-tools');
     const layoutTools = require('./doraemon/middleware/layout-tools');
     const pageCache = require('./doraemon/middleware/page-cache');
     const pageCache = require('./doraemon/middleware/page-cache');
     const devtool = require('./doraemon/middleware/devtools');
     const devtool = require('./doraemon/middleware/devtools');
+    const weakPassCheck = require('./doraemon/middleware/weak-pass-check');
 
 
     // YOHO 前置中间件
     // YOHO 前置中间件
     app.use(setYohoData());
     app.use(setYohoData());
@@ -193,6 +194,8 @@ try {
         app.use(devtool());
         app.use(devtool());
     }
     }
 
 
+    app.use(weakPassCheck());
+
     require('./dispatch')(app);
     require('./dispatch')(app);
 
 
     app.all('*', errorHanlder.notFound()); // 404
     app.all('*', errorHanlder.notFound()); // 404

@@ -432,7 +432,8 @@ const weakPasswordPage = (req, res, next) => {
             resetPwd: {
             resetPwd: {
                 coverHref: result.url,
                 coverHref: result.url,
                 coverImg: result.img,
                 coverImg: result.img,
-                refer: refer
+                refer: refer,
+                isCanSkip: req.cookies.canSkip === 'Y'
             }
             }
         }));
         }));
     }).catch(next);
     }).catch(next);

@@ -166,7 +166,6 @@ const local = {
     },
     },
     login: (req, res, next) => {
     login: (req, res, next) => {
         passport.authenticate('local', (err, user) => {
         passport.authenticate('local', (err, user) => {
-            console.log(err, user, ' === ');
             if (err) {
             if (err) {
                 return res.json({
                 return res.json({
                     code: 400,
                     code: 400,
@@ -202,7 +201,7 @@ const local = {
             loginService.syncUserSession(user, req, res).then((noCertTip) => {
             loginService.syncUserSession(user, req, res).then((noCertTip) => {
                 // 弱密码
                 // 弱密码
                 if (user.code === 510) {
                 if (user.code === 510) {
-                    refer = `${config.siteUrl}/passport/back/weak?token=${user.token}&refer=${refer}`;
+                    refer = `${config.siteUrl}/passport/back/weak?refer=${refer}`;
                 } else if (noCertTip === true) {
                 } else if (noCertTip === true) {
                     refer = `${config.siteUrl}/passport/cert/tip?refer=${refer}`;
                     refer = `${config.siteUrl}/passport/cert/tip?refer=${refer}`;
                 }
                 }

@@ -41,7 +41,7 @@
                         <input id="reset-pwd-btn" class="btn reset-pwd-btn disable" type="button" value="重新登录" disabled="true">
                         <input id="reset-pwd-btn" class="btn reset-pwd-btn disable" type="button" value="重新登录" disabled="true">
                     </li>
                     </li>
                     <li class="input-container-li">
                     <li class="input-container-li">
-                        <a class="weak-pwd-pass" href="{{refer}}" data-url="{{refer}}">跳过<i class="iconfont right-icon"></i></a>
+                        <a class="weak-pwd-pass {{#unless isCanSkip}} hide{{/unless}}" href="{{refer}}" data-url="{{refer}}">跳过<i class="iconfont right-icon"></i></a>
                     </li>
                     </li>
                 </ul>
                 </ul>
             </form>
             </form>

+/**
+ * 弱密码检测
+ * @author: xiaoxiao.hao<xiaoxiao.hao@yoho.cn>
+ * @date: 2017/4/17
+ */
+
+'use strict';
+
+const helpers = global.yoho.helpers;
+
+module.exports = () => {
+    return (req, res, next) => {
+        let refer = req.method === 'GET' ? req.get('Referer') : '';
+
+        refer = helpers.urlFormat('/passport/back/weak', {
+            refer: refer && refer.indexOf('passport/back/weak') > -1 ? '/' : refer
+        });
+
+        if (!req.xhr && req.user && req.user.uid && req.user.uid.isValid() &&
+            req.cookies.CSToken && req.cookies.canSkip !== 'Y' && req.path.indexOf('passport/back/weak') < 0) {
+            return res.redirect(refer);
+        }
+
+        next();
+    };
+};