|
...
|
...
|
@@ -19,7 +19,7 @@ const RegService = require('../models/reg-service'); |
|
|
|
const AuthHelper = require('../models/auth-helper');
|
|
|
|
const logger = global.yoho.logger;
|
|
|
|
|
|
|
|
const loginPage = `${config.siteUrl}/passport/login`;
|
|
|
|
const loginPage = `${config.siteUrl}/signin.html`;
|
|
|
|
|
|
|
|
function doPassportCallback(openId, nickname, sourceType, req, res) {
|
|
|
|
let shoppingKey = cookie.getShoppingKey(req);
|
|
...
|
...
|
@@ -112,11 +112,8 @@ const local = { |
|
|
|
res.render('login', {
|
|
|
|
width750: true,
|
|
|
|
loginIndex: true, // 模板中使用JS的标识
|
|
|
|
|
|
|
|
// captchaShow: _.get(req.session, 'login.errorCount') <= 0,
|
|
|
|
useGeetest: _.get(req.app.locals.wap, 'geetest.validation', true), // 使用极验证
|
|
|
|
captchaShow: true, // 170306 因为暴力破解密码问题，要求每次都展示验证码
|
|
|
|
|
|
|
|
// 返回的URL链接
|
|
|
|
backUrl: 'javascript:history.go(-1)', // eslint-disable-line
|
|
|
|
showHeaderImg: true, // 控制显示头部图片
|
|
|
|
isPassportPage: true, // 模板中模块标识
|
|
...
|
...
|
@@ -132,7 +129,12 @@ const local = { |
|
|
|
module: 'passport',
|
|
|
|
page: 'login',
|
|
|
|
title: '登录',
|
|
|
|
reg: true
|
|
|
|
reg: true,
|
|
|
|
loadJs: [
|
|
|
|
{
|
|
|
|
src: global.yoho.config.geetestJs
|
|
|
|
}
|
|
|
|
]
|
|
|
|
});
|
|
|
|
},
|
|
|
|
international: (req, res) => {
|
|
...
|
...
|
@@ -161,12 +163,9 @@ const local = { |
|
|
|
|
|
|
|
res.render('international', {
|
|
|
|
width750: true,
|
|
|
|
|
|
|
|
// 返回的URL链接
|
|
|
|
backUrl: 'javascript:history.go(-1)', // eslint-disable-line
|
|
|
|
loginInternational: true, // 模板中使用JS的标识
|
|
|
|
|
|
|
|
// captchaShow: _.get(req.session, 'login.errorCount') <= 0,
|
|
|
|
useGeetest: _.get(req.app.locals.wap, 'geetest.validation', true), // 使用极验证
|
|
|
|
captchaShow: true, // 170306 因为暴力破解密码问题，要求每次都展示验证码
|
|
|
|
isPassportPage: true, // 模板中模块标识
|
|
|
|
headerText: '登录',
|
|
...
|
...
|
@@ -174,21 +173,21 @@ const local = { |
|
|
|
countrys: RegService.getAreaData(), // 地区信息列表
|
|
|
|
module: 'passport',
|
|
|
|
page: 'international',
|
|
|
|
title: '国际账号登录'
|
|
|
|
title: '国际账号登录',
|
|
|
|
loadJs: [
|
|
|
|
{
|
|
|
|
src: global.yoho.config.geetestJs
|
|
|
|
}
|
|
|
|
]
|
|
|
|
});
|
|
|
|
},
|
|
|
|
login: (req, res, next) => {
|
|
|
|
|
|
|
|
// 170306 因为暴力破解密码问题，要求每次都校验验证码
|
|
|
|
_.set(req.session, 'login.errorCount', 0);
|
|
|
|
|
|
|
|
let count = _.get(req.session, 'login.errorCount');
|
|
|
|
// 使用极验证
|
|
|
|
let useGeetest = _.get(req.app.locals.wap, 'geetest.validation', true);
|
|
|
|
|
|
|
|
if (count == null) { // eslint-disable-line
|
|
|
|
_.set(req.session, 'login.errorCount', 3);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (count <= 0) {
|
|
|
|
// 关闭极验证的时候使用有货自有验证码
|
|
|
|
if (!useGeetest) {
|
|
|
|
let captchaInput = req.body.captcha;
|
|
|
|
let captchaCode = _.get(req.session, 'captcha');
|
|
|
|
let testCode = req.body.yohobuy;
|
|
...
|
...
|
@@ -201,7 +200,7 @@ const local = { |
|
|
|
captchaShow: true
|
|
|
|
};
|
|
|
|
|
|
|
|
logger.info(`验证码校验结果：${captchaInput.toString() === captchaCode},user:${captchaInput};server:${captchaCode}`);
|
|
|
|
logger.info(`captcha validate result：${captchaInput.toString() === captchaCode},user:${captchaInput};server:${captchaCode}`);
|
|
|
|
|
|
|
|
--req.session.captchaValidCount;
|
|
|
|
|
|
...
|
...
|
@@ -226,8 +225,6 @@ const local = { |
|
|
|
}
|
|
|
|
|
|
|
|
passport.authenticate('local', (err, user) => {
|
|
|
|
let loginSession = req.session.login;
|
|
|
|
|
|
|
|
if (err || !user) {
|
|
|
|
let obj = {
|
|
|
|
code: 400,
|
|
...
|
...
|
@@ -235,12 +232,6 @@ const local = { |
|
|
|
data: ''
|
|
|
|
};
|
|
|
|
|
|
|
|
--loginSession.errorCount;
|
|
|
|
|
|
|
|
if (loginSession.errorCount <= 0) {
|
|
|
|
obj.captchaShow = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
res.json(obj);
|
|
|
|
} else {
|
|
|
|
let refer = req.cookies.refer;
|
...
|
...
|
|
