弱密码 auth 登录状态检测

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

@@ -38,7 +38,7 @@
                         </span>
                     </li>
                     <li class="input-container-li clearfix">
-                        <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 class="input-container-li">
                         <a class="weak-pwd-pass {{#unless isCanSkip}} hide{{/unless}}" href="{{refer}}" data-url="{{refer}}">跳过<i class="iconfont right-icon"></i></a>

@@ -6,14 +6,14 @@
                 <i class="iconfont">&#xe622;</i>
             </div>
             <p class="success-text-main">恭喜您！您已经成功修改了登录密码</p>
-            <p class="success-text-tip"><span id="count-down">5</span>秒后自动跳转至登录页</p>
+            <p class="success-text-tip"><span id="count-down">3</span>秒后自动跳转至登录页</p>
             <a class="success-btn" href="{{refer}}">重新登陆</a>
         </div>
     {{/ resetSuccess}}
 </div>
 <script type="text/javascript">
     (function() {
-        var count = 5,
+        var count = 3,
             countDown = document.getElementById('count-down');
 
 

@@ -26,6 +26,13 @@ module.exports = (req, res, next) => {
         }
 
         return res.redirect(loginPage);
+    } else if (!req.xhr && req.cookies.CSToken && req.cookies.canSkip && req.cookies.canSkip !== 'Y' &&
+            req.path.indexOf('passport/back/weak') < 0) {
+        // 登录状态，不是ajax请求 检测弱密码
+        return res.redirect(helpers.urlFormat('/passport/back/weak', {
+            refer: refer && refer.indexOf('passport/back/weak') > -1 ? '/' : refer
+        }));
     }
+
     next();
 };

-/**
- * 弱密码检测
- * @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 && req.cookies.canSkip !== 'Y' &&
-            req.path.indexOf('passport/back/weak') < 0) {
-            return res.redirect(refer);
-        }
-
-        next();
-    };
-};