Authored by htoooth

fix lib

... ... @@ -10,6 +10,8 @@ const sign = global.yoho.sign;
const cookie = global.yoho.cookie;
const config = global.yoho.config;
const crypto = global.yoho.crypto;
const authcode = require(`${global.utils}/authcode`);
const AUTH_TIME = 2592000000;
const Promise = require('bluebird');
... ... @@ -60,7 +62,7 @@ const syncUserSession = (uid, req, res, sessionKey) => {
res.cookie('isStudent', isStudent, {
domain: config.cookieDomain
});
res.cookie('_SESSION', sessionKey, {
res.cookie('_SESSION_KEY', authcode(sessionKey, '_SESSION_KEY', AUTH_TIME, 'encode'), {
domain: config.cookieDomain
});
... ...
... ... @@ -2,11 +2,16 @@
const Fn = require('lodash/fp');
const cookie = global.yoho.cookie;
const authcode = require(`${global.utils}/authcode`);
// const loginService = require('../../apps/passport/models/login-service');
// const _ = require('lodash');
// const cache = global.yoho.cache;
function decrypt(word) {
return authcode(word, '_SESSION_KEY');
}
module.exports = () => {
return (req, res, next) => {
... ... @@ -14,7 +19,7 @@ module.exports = () => {
req.fullUrl = () => req.protocol + '://' + req.get('host') + req.originalUrl;
// 从 cookie 读取 UID
if (req.cookies._UID && req.cookies._SESSION) {
if (req.cookies._UID && req.cookies._SESSION_KEY) {
let uidCookie = req.cookies._UID.split('::');
... ... @@ -26,12 +31,13 @@ module.exports = () => {
req.user.vip = getVip(uidCookie); // 2
req.user.token = getToken(uidCookie); // 3
req.user.isStudent = req.cookies.isStudent || 0;
req.user.uid = {
toString() {
return this.uid;
},
uid: cookie.getUid(req),
sessionKey: req.cookies._SESSION,
sessionKey: decrypt(req.cookies._SESSION_KEY),
isValid() {
return this.uid && this.sessionKey;
}
... ...
... ... @@ -64,7 +64,7 @@
"urlencode": "^1.1.0",
"uuid": "^2.0.2",
"yoho-express-session": "^2.0.0",
"yoho-node-lib": "0.2.8",
"yoho-node-lib": "0.2.10",
"yoho-zookeeper": "^1.0.8"
},
"devDependencies": {
... ...