|
@@ -12,6 +12,7 @@ const cookie = global.yoho.cookie; |
|
@@ -12,6 +12,7 @@ const cookie = global.yoho.cookie; |
|
12
|
const helpers = global.yoho.helpers;
|
12
|
const helpers = global.yoho.helpers;
|
|
13
|
const log = global.yoho.logger;
|
13
|
const log = global.yoho.logger;
|
|
14
|
const config = global.yoho.config;
|
14
|
const config = global.yoho.config;
|
|
|
|
15
|
+const RegService = require('../models/reg-service');
|
|
15
|
const AuthHelper = require('../models/auth-helper');
|
16
|
const AuthHelper = require('../models/auth-helper');
|
|
16
|
|
17
|
|
|
17
|
const loginPage = `${config.siteUrl}/passport/login`;
|
18
|
const loginPage = `${config.siteUrl}/passport/login`;
|
|
@@ -94,7 +95,7 @@ const local = { |
|
@@ -94,7 +95,7 @@ const local = { |
|
94
|
weiboLoginUrl: '/passport/login/sina', // 微博登录的URL链接
|
95
|
weiboLoginUrl: '/passport/login/sina', // 微博登录的URL链接
|
|
95
|
qqLoginUrl: '/passport/login/qq', // 腾讯QQ登录的URL链接
|
96
|
qqLoginUrl: '/passport/login/qq', // 腾讯QQ登录的URL链接
|
|
96
|
wechatLoginUrl: '/passport/login/wechat', // 微信登录的URL链接
|
97
|
wechatLoginUrl: '/passport/login/wechat', // 微信登录的URL链接
|
|
97
|
- internationalUrl: '/login.html', // 国际号登录的URL链接
|
98
|
+ internationalUrl: '/passport/international', // 国际号登录的URL链接
|
|
98
|
phoneRetriveUrl: '/passport/back/mobile', // 通过手机号找回密码的URL链接
|
99
|
phoneRetriveUrl: '/passport/back/mobile', // 通过手机号找回密码的URL链接
|
|
99
|
emailRetriveUrl: '/passport/back/email', // 通过邮箱找回密码的URL链接
|
100
|
emailRetriveUrl: '/passport/back/email', // 通过邮箱找回密码的URL链接
|
|
100
|
module: 'passport',
|
101
|
module: 'passport',
|
|
@@ -102,6 +103,36 @@ const local = { |
|
@@ -102,6 +103,36 @@ const local = { |
|
102
|
title: '登录'
|
103
|
title: '登录'
|
|
103
|
});
|
104
|
});
|
|
104
|
},
|
105
|
},
|
|
|
|
106
|
+ international: (req, res) => {
|
|
|
|
107
|
+ // 先清除cookie
|
|
|
|
108
|
+ res.clearCookie('LE' + md5('_LOGIN_EXPIRE'), {
|
|
|
|
109
|
+ domain: 'yohobuy.com'
|
|
|
|
110
|
+ });
|
|
|
|
111
|
+
|
|
|
|
112
|
+ // 设置登录有效时间30分钟, 防机器刷,cache不稳定,改为cookie
|
|
|
|
113
|
+ res.cookie('LE' + md5('_LOGIN_EXPIRE'), (new Date()).getTime() / 1000 + 1800);
|
|
|
|
114
|
+
|
|
|
|
115
|
+ // 清除cookie
|
|
|
|
116
|
+ res.clearCookie('_UID', {
|
|
|
|
117
|
+ domain: 'yohobuy.com'
|
|
|
|
118
|
+ });
|
|
|
|
119
|
+ res.clearCookie('_TOKEN', {
|
|
|
|
120
|
+ domain: 'yohobuy.com'
|
|
|
|
121
|
+ });
|
|
|
|
122
|
+
|
|
|
|
123
|
+ res.render('international', {
|
|
|
|
124
|
+ // 返回的URL链接
|
|
|
|
125
|
+ backUrl: 'javascript:history.go(-1)', // eslint-disable-line
|
|
|
|
126
|
+ loginInternational: true, // 模板中使用JS的标识
|
|
|
|
127
|
+ isPassportPage: true, // 模板中模块标识
|
|
|
|
128
|
+ headerText: '登录',
|
|
|
|
129
|
+ areaCode: '+86', // 默认区号
|
|
|
|
130
|
+ countrys: RegService.getAreaData(), // 地区信息列表
|
|
|
|
131
|
+ module: 'passport',
|
|
|
|
132
|
+ page: 'international',
|
|
|
|
133
|
+ title: '国际账号登录'
|
|
|
|
134
|
+ });
|
|
|
|
135
|
+ },
|
|
105
|
login: (req, res, next) => {
|
136
|
login: (req, res, next) => {
|
|
106
|
passport.authenticate('local', (err, user) => {
|
137
|
passport.authenticate('local', (err, user) => {
|
|
107
|
if (err) {
|
138
|
if (err) {
|