|
...
|
...
|
@@ -10,10 +10,12 @@ const passport = require('passport'); |
|
|
|
|
|
|
|
// const md5 = require('yoho-md5');
|
|
|
|
const uuid = require('uuid');
|
|
|
|
const co = Promise.coroutine;
|
|
|
|
const cookie = global.yoho.cookie;
|
|
|
|
const helpers = global.yoho.helpers;
|
|
|
|
const log = global.yoho.logger;
|
|
|
|
const config = global.yoho.config;
|
|
|
|
const cache = global.yoho.cache;
|
|
|
|
const utils = require(global.utils);
|
|
|
|
const RegService = require('../models/reg-service');
|
|
|
|
const AuthHelper = require('../models/auth-helper');
|
|
...
|
...
|
@@ -122,21 +124,10 @@ const local = { |
|
|
|
req.session.captchaValidCount = 5;
|
|
|
|
}
|
|
|
|
|
|
|
|
// 先清除cookie
|
|
|
|
// res.clearCookie('LE' + md5('_LOGIN_EXPIRE'), {
|
|
|
|
// domain: 'yohobuy.com'
|
|
|
|
// });
|
|
|
|
|
|
|
|
// 设置登录有效时间30分钟, 防机器刷，cache不稳定，改为cookie
|
|
|
|
// res.cookie('LE' + md5('_LOGIN_EXPIRE'), (new Date()).getTime() / 1000 + 1800);
|
|
|
|
|
|
|
|
// 170406 账户密码方式登录可以选择是否开启验证码，默认开关是关闭状态，此时开启验证码，开关开启，无需验证
|
|
|
|
let captchaShow = _.get(req.app.locals.wap, 'close.loginValidation', false);
|
|
|
|
|
|
|
|
res.render('login', {
|
|
|
|
width750: true,
|
|
|
|
loginIndex: true, // 模板中使用JS的标识
|
|
|
|
captchaShow: !captchaShow, // 170306 因为暴力破解密码问题，要求每次都展示验证码
|
|
|
|
captchaShow: req.yoho.captchaShow,
|
|
|
|
backUrl: 'javascript:history.go(-1)', // eslint-disable-line
|
|
|
|
showHeaderImg: true, // 控制显示头部图片
|
|
|
|
isPassportPage: true, // 模板中模块标识
|
|
...
|
...
|
@@ -166,22 +157,11 @@ const local = { |
|
|
|
req.session.captchaValidCount = 5;
|
|
|
|
}
|
|
|
|
|
|
|
|
// 先清除cookie
|
|
|
|
// res.clearCookie('LE' + md5('_LOGIN_EXPIRE'), {
|
|
|
|
// domain: 'yohobuy.com'
|
|
|
|
// });
|
|
|
|
|
|
|
|
// 设置登录有效时间30分钟, 防机器刷，cache不稳定，改为cookie
|
|
|
|
// res.cookie('LE' + md5('_LOGIN_EXPIRE'), (new Date()).getTime() / 1000 + 1800);
|
|
|
|
|
|
|
|
// 170406 账户密码方式登录可以选择是否开启验证码，默认开关是关闭状态，此时开启验证码，开关开启，无需验证
|
|
|
|
let captchaShow = _.get(req.app.locals.wap, 'close.loginValidation', false);
|
|
|
|
|
|
|
|
res.render('international', {
|
|
|
|
width750: true,
|
|
|
|
backUrl: 'javascript:history.go(-1)', // eslint-disable-line
|
|
|
|
loginInternational: true, // 模板中使用JS的标识
|
|
|
|
captchaShow: !captchaShow, // 170306 因为暴力破解密码问题，要求每次都展示验证码
|
|
|
|
captchaShow: req.yoho.captchaShow,
|
|
|
|
isPassportPage: true, // 模板中模块标识
|
|
|
|
headerText: '登录',
|
|
|
|
areaCode: '+86', // 默认区号
|
|
...
|
...
|
@@ -211,6 +191,8 @@ const local = { |
|
|
|
captchaShow: true
|
|
|
|
};
|
|
|
|
|
|
|
|
cache.set(`loginErrorIp:${req.yoho.clientIp}`, true, 3600).catch(log.error);
|
|
|
|
|
|
|
|
res.json(obj);
|
|
|
|
} else {
|
|
|
|
let refer = req.cookies.refer;
|
|
...
|
...
|
@@ -406,6 +388,36 @@ exports.user = function(req, res, next) { |
|
|
|
res.jsonp(result);
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* 中间件
|
|
|
|
* 根据用户登录是否成功决定是否展示验证码
|
|
|
|
*/
|
|
|
|
exports.loginShowCaptchaByIp = function(req, res, next) {
|
|
|
|
// 总开关状态
|
|
|
|
req.yoho.captchaShow = !_.get(req.app.locals.wap, 'close.loginValidation', false);
|
|
|
|
|
|
|
|
// 开关打开，不走任何验证逻辑
|
|
|
|
if (!req.yoho.captchaShow) {
|
|
|
|
return next();
|
|
|
|
} else {
|
|
|
|
req.yoho.captchaShow = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
co(function*() {
|
|
|
|
let hasErrorLog = yield cache.get(`loginErrorIp:${req.yoho.clientIp}`);
|
|
|
|
|
|
|
|
log.info(`Pagerender clientip ${req.yoho.clientIp} status is ` + hasErrorLog);
|
|
|
|
|
|
|
|
if (hasErrorLog) {
|
|
|
|
req.yoho.captchaShow = true;
|
|
|
|
}
|
|
|
|
next();
|
|
|
|
})().catch(function(e) {
|
|
|
|
req.yoho.captchaShow = true;
|
|
|
|
next();
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
exports.common = common;
|
|
|
|
exports.local = local;
|
|
|
|
exports.wechat = wechat;
|
...
|
...
|
|
