Authored by 郭成尧

authcode-ok

@@ -8,6 +8,7 @@ const userModel = require('../../serverAPI/user'); @@ -8,6 +8,7 @@ const userModel = require('../../serverAPI/user');
8 const addressModel = require('../../serverAPI/user/address'); 8 const addressModel = require('../../serverAPI/user/address');
9 const orderModel = require('../models/order'); 9 const orderModel = require('../models/order');
10 const crypto = global.yoho.crypto; 10 const crypto = global.yoho.crypto;
  11 +const authcode = require(global.utils + '/authcode');
11 12
12 exports.orderEnsure = (req, res, next) => { 13 exports.orderEnsure = (req, res, next) => {
13 let headerData = headerModel.setNav({ 14 let headerData = headerModel.setNav({
@@ -180,7 +181,7 @@ exports.orderSub = (req, res) => { @@ -180,7 +181,7 @@ exports.orderSub = (req, res) => {
180 if (testQyhUnion.client_id) { 181 if (testQyhUnion.client_id) {
181 unionKey = encryData; 182 unionKey = encryData;
182 } else { 183 } else {
183 - // unionKey = helpers.unionDecode(req.cookies._QYH_UNION, 'q_union_yohobuy'); // TODO 这个方法没有 184 + unionKey = authcode(req.cookies._QYH_UNION, 'q_union_yohobuy');
184 } 185 }
185 } else { 186 } else {
186 unionKey = '{"client_id":' + req.cookies.mkt_code + '}'; 187 unionKey = '{"client_id":' + req.cookies.mkt_code + '}';
@@ -14,8 +14,8 @@ const getTimestamp = function() { @@ -14,8 +14,8 @@ const getTimestamp = function() {
14 return parseInt(unixtimeMs / 1000, 10); 14 return parseInt(unixtimeMs / 1000, 10);
15 }; 15 };
16 16
17 -module.exports = function(str, operation, key, expiry) {  
18 - operation = operation ? operation : 'encode'; 17 +module.exports = function(str, key, expiry, operation) {
  18 + operation = operation ? operation : 'decode';
19 key = key ? key : ''; 19 key = key ? key : '';
20 expiry = expiry ? expiry : 0; 20 expiry = expiry ? expiry : 0;
21 let tmpstr, tmp; 21 let tmpstr, tmp;
@@ -115,5 +115,3 @@ module.exports = function(str, operation, key, expiry) { @@ -115,5 +115,3 @@ module.exports = function(str, operation, key, expiry) {
115 115
116 return s; 116 return s;
117 }; 117 };
118 -  
119 -// console.log(module.exports('abcdef123', 'encode', 'key123', 99))