fe / yohobuywap-node · Commits

Go to a project

Authored by 陈峰
Commit cf9c926257c4ead1bad0d94ac95b0964730dc9a2 1 parent 8a2b77b2

third login

Inline Side-by-side
Showing 8 changed files with 147 additions and 21 deletions
... ... @@ -228,10 +228,11 @@ const bind = {
let refer = helpers.urlFormat('/passport/bind/success?type=bind');
if (result && result.code && result.code === 200 && result.data.uid) {
return AuthHelper.syncUserSession(result.data.uid, req, res, result.data.session_key).then(() => {
result.data.refer = refer;
return result;
});
return AuthHelper.syncUserSession(result.data.uid, req, res, result.data.session_key)
.then((authData) => {
result.data.refer = _.get(authData, 'refer') || refer;
return result;
});
} else {
return { code: 400, message: '绑定失败', data: '' };
}
... ... @@ -262,10 +263,11 @@ const bind = {
let refer = helpers.urlFormat('/passport/bind/success', { sourceType: sourceType });
if (result && result.code && result.code === 200 && result.data.uid) {
return AuthHelper.syncUserSession(result.data.uid, req, res, result.data.session_key).then(() => {
result.data.refer = refer;
return result;
});
return AuthHelper.syncUserSession(result.data.uid, req, res, result.data.session_key)
.then((authData) => {
result.data.refer = _.get(authData, 'refer') || refer;
return result;
});
} else {
return { code: 400, message: '关联失败', data: '' };
}
... ...
... ... @@ -8,8 +8,9 @@
const _ = require('lodash');
const passport = require('passport');
// const md5 = require('yoho-md5');
const uuid = require('uuid');
const url = require('url');
const moment = require('moment');
const co = Promise.coroutine;
const cookie = global.yoho.cookie;
const helpers = global.yoho.helpers;
... ... @@ -19,6 +20,8 @@ const cache = global.yoho.cache;
const utils = require(global.utils);
const RegService = require('../models/reg-service');
const AuthHelper = require('../models/auth-helper');
const thirdAccount = require('../data/third-account.json');
const auth = require('../models/auth-helper');
const loginPage = `${config.siteUrl}/signin.html`;
... ... @@ -50,9 +53,10 @@ function doPassportCallback(openId, nickname, sourceType, req, res) {
refer: refer
});
} else if (result.code === 200 && result.data.uid) {
return AuthHelper.syncUserSession(result.data.uid, req, res, result.data.session_key).then(() => {
return refer;
});
return AuthHelper.syncUserSession(result.data.uid, req, res, result.data.session_key)
.then((authData) => {
return _.get(authData, 'refer') || refer;
});
}
}).then((redirectTo) => {
return res.redirect(redirectTo);
... ... @@ -63,6 +67,57 @@ function doPassportCallback(openId, nickname, sourceType, req, res) {
}
const common = {
// 第三方登录有货逻辑
thirdLogin(req, res, next) {
req.session.refer = req.get('referer'); // 记录来源地址
// TODO 记录token并验证有效期或者实现oauth
if (req.query.yh_type &&
req.query.yh_sign &&
req.query.yh_time &&
req.query.yh_backurl) {
let reqTime = moment(req.query.yh_time);
let nowTime = moment();
let timeDiff = nowTime.diff(reqTime);
if (!reqTime.isValid() ||
timeDiff >= 1000 * 60 * 120 || // 如果服务器之间大于10分钟验证失败
timeDiff < 0) {
return res.json({
code: 401,
message: 'yh_time已过期或者格式错误'
});
}
let account = thirdAccount[req.query.yh_type];
if (!account) {
return res.json({
code: 401,
message: 'yh_type验证失败'
});
}
let backurl = url.parse(req.query.yh_backurl);
let regDomain = new RegExp(`${account.domain.replace(/\./g, '\\.')}$`);
if (!regDomain.test(backurl.host || '')) {
return res.json({
code: 401,
message: 'refer回调域名验证失败'
});
}
let token = auth.thirdSign(req.query, account.clientSecret);
if (token.toLowerCase() !== req.query.yh_sign.toLowerCase()) {
return res.json({
code: 401,
message: 'yh_sign签名验证错误'
});
}
req.session.thirdType = req.query.yh_type;
req.session.thirdBackurl = req.query.yh_backurl;
}
next();
},
beforeLogin: (req, res, next) => {
if (req.session.passwordWeak) {
return res.redirect('/passport/password/resetpage');
... ... @@ -297,10 +352,11 @@ const local = {
return res.json(passwordWeakReturn);
}
AuthHelper.syncUserSession(user.uid, req, res, user.session_key).then(() => {
AuthHelper.syncUserSession(user.uid, req, res, user.session_key).then((authData) => {
if (user.weakPassword) {
return res.json(passwordWeakReturn);
} else {
user.href = _.get(authData, 'refer', user.href);
res.json({
code: 200,
data: user
... ...
... ... @@ -127,7 +127,7 @@ class Reg {
return res.json(regMobileAesResult);
}
yield AuthHelper.syncUserSession(regMobileAesResult.data.uid,
let authData = yield AuthHelper.syncUserSession(regMobileAesResult.data.uid,
req, res, regMobileAesResult.data.session_key);
// 返回跳转到来源页面
... ... @@ -156,7 +156,7 @@ class Reg {
message: '注册成功',
data: {
session: refer,
href: '//m.yohobuy.com/activity/invite-reg',
href: _.get(authData, 'refer') || '//m.yohobuy.com/activity/invite-reg',
msgDelivery: _.get(regMobileAesResult, 'data.msgDelivery', '')
}
});
... ...
... ... @@ -406,7 +406,7 @@ let setPassword = (req, res, next) => {
resultCopy = result;
return AuthHelper.syncUserSession(result.data.uid, req, res, result.data.session_key);
}).then(() => {
}).then((authData) => {
if (!resultCopy) {
return;
}
... ... @@ -438,7 +438,7 @@ let setPassword = (req, res, next) => {
message: '注册成功',
data: {
session: refer,
href: '//m.yohobuy.com/activity/invite-reg',
href: _.get(authData, 'refer') || '//m.yohobuy.com/activity/invite-reg',
msgDelivery: _.get(resultCopy, 'data.msgDelivery', '')
}
});
... ...
... ... @@ -351,11 +351,11 @@ exports.check = (req, res, next) => {
});
return AuthHelper.syncUserSession(info.data.uid, req, res, info.data.session_key);
})
.then(() => {
.then((authData) => {
res.json({
code: 200,
message: LOGIN_SUCCSS,
redirect: utils.refererLimit(req.cookies.refer)
redirect: _.get(authData, 'refer') || utils.refererLimit(req.cookies.refer)
});
delete req.session.smsLogin;
... ... @@ -418,14 +418,14 @@ exports.password = (req, res, next) => {
resultCopy = result;
return AuthHelper.syncUserSession(result.data.uid, req, res, result.data.session_key);
}).then(() => {
}).then((authData) => {
if (!resultCopy) {
return;
}
res.json({
code: 200,
message: LOGIN_SUCCSS,
redirect: utils.refererLimit(req.cookies.refer)
redirect: _.get(authData, 'refer') || utils.refererLimit(req.cookies.refer)
});
delete req.session.smsLogin;
}).catch(next);
... ...
{
"mars": {
"clientSecret": "f30368d65fcad4a265074948a2a2e6e6",
"domain": "yohomars.com"
},
"activity": {
"clientSecret": "3bd815162342d9733f06ab6811082c64",
"domain": "yoho.cn"
}
}
\ No newline at end of file
... ...
... ... @@ -6,6 +6,10 @@ const logger = global.yoho.logger;
const sign = global.yoho.sign;
const api = global.yoho.API;
const uuid = require('uuid');
const url = require('url');
const md5 = require('yoho-md5');
const moment = require('moment');
const thirdAccount = require('../data/third-account.json');
class Auth {
... ... @@ -73,6 +77,53 @@ class Auth {
return api.get('', param);
}
static thirdSign(params, clientSecret) {
let secretParams = {},
secretStr = '';
for (const k of Object.keys(params).sort()) {
if (k === 'yh_sign') {
continue;
}
secretParams[k] = params[k];
}
secretStr = _.join(_.map(secretParams, (v, k) => {
return `${k}=${v}`;
}), '&');
return md5(secretStr + clientSecret);
}
static thirdLogin(req, uid) {
if (req.session.thirdType && req.session.thirdBackurl && req.session.refer) {
let refer = url.parse(req.session.refer || '');
if (!/m\.yohobuy\.com$/.test(refer.host)) { // 非站内登录
let thirdBackurl = req.session.thirdBackurl;
let account = thirdAccount[req.session.thirdType];
let params = {
yh_uid: uid,
yh_type: req.session.thirdType,
yh_time: moment().format('YYYY-MM-DD HH:mm:ss')
};
let token = this.thirdSign(params, account.clientSecret);
params.yh_token = token;
let queryStr = _.join(_.map(params, (v, k) => {
return `${k}=${encodeURIComponent(v)}`;
}), '&');
thirdBackurl = `${thirdBackurl}${thirdBackurl.indexOf('?') > 0 ? '&' : '?'}${queryStr}`;
return {
refer: thirdBackurl
};
}
req.session.thirdType && (delete req.session.thirdType);
req.session.thirdBackurl && (delete req.session.thirdBackurl);
req.session.refer && (delete req.session.refer);
}
}
static syncUserSession(uid, req, res, sessionKey) {
let userId = {
toString: () => {
... ... @@ -132,6 +183,9 @@ class Auth {
domain: 'yohobuy.com',
expires: new Date(Date.now() + 2592000000) // 有效期一年
});
// 第三方登录逻辑
return this.thirdLogin(req, uid);
});
}
}
... ...
... ... @@ -179,12 +179,14 @@ router.get('/passport/login',
validateCode.load,
login.common.beforeLogin,
login.common.clearCookie,
login.common.thirdLogin,
login.loginShowCaptchaByIp,
loginNew.loginPage); // 普通登录
router.get('/passport/international',
validateCode.load,
login.common.beforeLogin,
login.common.clearCookie,
login.common.thirdLogin,
login.loginShowCaptchaByIp,
loginNew.international); // 国际账号登录
router.get('/passport/reg/index',
... ... @@ -203,6 +205,7 @@ router.get('/signin.html',
validateCode.load,
login.common.beforeLogin,
login.common.clearCookie,
login.common.thirdLogin,
smsNew.smsLoginPage); // 短信验证码登录
router.get('/reg.html',
validateCode.load,
... ... @@ -211,6 +214,7 @@ router.get('/login.html',
validateCode.load,
login.common.beforeLogin,
login.common.clearCookie,
login.common.thirdLogin,
login.loginShowCaptchaByIp,
loginNew.international); // 国际账号登录
... ...