Skip to content

Commit

Permalink
+ .parseResponseBody
Browse files Browse the repository at this point in the history
  • Loading branch information
cloudcome committed Jul 5, 2017
1 parent 4543f73 commit ffea3fa
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 39 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "blear.node.weixin",
"version": "2.0.1",
"version": "2.0.2",
"description": "微信授权登录、JSSDK",
"scripts": {
"live": "browser-sync start --config bs-config.js",
Expand Down
93 changes: 55 additions & 38 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,12 @@ exports.getUserInfo = function (openId, accessToken, callback) {
*/
exports.request = requestWeixin;

/**
* 解析响应内容
* @type {parseResponseBody}
*/
exports.parseResponseBody = parseResponseBody;


// ===============================================

Expand Down Expand Up @@ -129,58 +135,69 @@ function getJSSDKApiTicket(callback) {
.serial(callback);
}


/**
* 解析微信返回内容
* @param callback
* 解析内容为 JSON 对象
* @param body
* @returns {*}
*/
function parseResponseCallback(callback) {
callback = fun.noop(callback);
function parseResponseBody(body) {
var ret = {};

try {
ret = JSON.parse(body);
ret.errcode = ret.errcode || 0;
} catch (err) {
ret.errcode = -1;
ret.errmsg = '数据解析失败';
}

return function (err, body) {
if (err) {
return callback(err);
}
if (ret.errcode !== 0) {
return callback(new TypeError(ret.errmsg || '未知错误'));
}

var ret = {};
if (ret.expires_in) {
ret.expires_in = ret.expires_in * 1000;
ret.expiresIn = ret.expires_in;
}

try {
ret = JSON.parse(body);
ret.errcode = ret.errcode || 0;
} catch (err) {
ret.errcode = -1;
ret.errmsg = '数据解析失败';
}
if (ret.access_token) {
ret.accessToken = ret.access_token;
}

if (ret.errcode !== 0) {
return callback(new TypeError(ret.errmsg || '未知错误'));
}
if (ret.refresh_token) {
ret.refreshToken = ret.refresh_token;
}

if (ret.expires_in) {
ret.expires_in = ret.expires_in * 1000;
ret.expiresIn = ret.expires_in;
}
if (ret.openid) {
ret.openId = ret.openid;
}

if (ret.access_token) {
ret.accessToken = ret.access_token;
}
if (ret.unionid) {
ret.unionId = ret.unionid;
}

if (ret.refresh_token) {
ret.refreshToken = ret.refresh_token;
}
if (ret.headimgurl) {
ret.avatar = ret.headimgurl;
}

if (ret.openid) {
ret.openId = ret.openid;
}
return ret;
}

if (ret.unionid) {
ret.unionId = ret.unionid;
}

if (ret.headimgurl) {
ret.avatar = ret.headimgurl;
/**
* 解析微信返回内容
* @param callback
*/
function parseResponseCallback(callback) {
callback = fun.noop(callback);

return function (err, body) {
if (err) {
return callback(err);
}

callback(null, ret);
callback(null, parseResponseBody(body));
};
}

Expand Down

0 comments on commit ffea3fa

Please sign in to comment.