Supports OAuth Providers that don't end connections neatly (Google!)
This commit is contained in:
parent
8ba869ff41
commit
0643395b2e
|
@ -0,0 +1,4 @@
|
||||||
|
// Returns true if this is a host that closes *before* it ends?!?!
|
||||||
|
module.exports.isAnEarlyCloseHost= function( hostName ) {
|
||||||
|
return hostName.match(".*google.com$")
|
||||||
|
}
|
37
lib/oauth.js
37
lib/oauth.js
|
@ -3,7 +3,8 @@ var crypto= require('crypto'),
|
||||||
http= require('http'),
|
http= require('http'),
|
||||||
https= require('https'),
|
https= require('https'),
|
||||||
URL= require('url'),
|
URL= require('url'),
|
||||||
querystring= require('querystring');
|
querystring= require('querystring'),
|
||||||
|
OAuthUtils= require('./_utils');
|
||||||
|
|
||||||
exports.OAuth= function(requestUrl, accessUrl, consumerKey, consumerSecret, version, authorize_callback, signatureMethod, nonceSize, customHeaders) {
|
exports.OAuth= function(requestUrl, accessUrl, consumerKey, consumerSecret, version, authorize_callback, signatureMethod, nonceSize, customHeaders) {
|
||||||
this._isEcho = false;
|
this._isEcho = false;
|
||||||
|
@ -344,12 +345,14 @@ exports.OAuth.prototype._performSecureRequest= function( oauth_token, oauth_toke
|
||||||
if( callback ) {
|
if( callback ) {
|
||||||
var data="";
|
var data="";
|
||||||
var self= this;
|
var self= this;
|
||||||
request.on('response', function (response) {
|
|
||||||
response.setEncoding('utf8');
|
// Some hosts *cough* google appear to close the connection early / send no content-length header
|
||||||
response.on('data', function (chunk) {
|
// allow this behaviour.
|
||||||
data+=chunk;
|
var allowEarlyClose= OAuthUtils.isAnEarlyCloseHost( parsedUrl.hostname );
|
||||||
});
|
var callbackCalled= false;
|
||||||
response.on('end', function () {
|
function passBackControl( response ) {
|
||||||
|
if(!callbackCalled) {
|
||||||
|
callbackCalled= true;
|
||||||
if ( response.statusCode >= 200 && response.statusCode <= 299 ) {
|
if ( response.statusCode >= 200 && response.statusCode <= 299 ) {
|
||||||
callback(null, data, response);
|
callback(null, data, response);
|
||||||
} else {
|
} else {
|
||||||
|
@ -361,10 +364,28 @@ exports.OAuth.prototype._performSecureRequest= function( oauth_token, oauth_toke
|
||||||
callback({ statusCode: response.statusCode, data: data }, data, response);
|
callback({ statusCode: response.statusCode, data: data }, data, response);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
request.on('response', function (response) {
|
||||||
|
response.setEncoding('utf8');
|
||||||
|
response.on('data', function (chunk) {
|
||||||
|
data+=chunk;
|
||||||
|
});
|
||||||
|
response.on('end', function () {
|
||||||
|
passBackControl( response );
|
||||||
|
});
|
||||||
|
response.on('close', function () {
|
||||||
|
if( allowEarlyClose ) {
|
||||||
|
passBackControl( response );
|
||||||
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
request.on("error", callback);
|
request.on("error", function(err) {
|
||||||
|
callbackCalled= true;
|
||||||
|
callback( err )
|
||||||
|
});
|
||||||
|
|
||||||
if( (method == "POST" || method =="PUT") && post_body != null && post_body != "" ) {
|
if( (method == "POST" || method =="PUT") && post_body != null && post_body != "" ) {
|
||||||
request.write(post_body);
|
request.write(post_body);
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
var querystring= require('querystring'),
|
var querystring= require('querystring'),
|
||||||
crypto= require('crypto'),
|
crypto= require('crypto'),
|
||||||
https= require('https'),
|
https= require('https'),
|
||||||
URL= require('url');
|
URL= require('url'),
|
||||||
|
OAuthUtils= require('./_utils');
|
||||||
|
|
||||||
exports.OAuth2= function(clientId, clientSecret, baseSite, authorizePath, accessTokenPath) {
|
exports.OAuth2= function(clientId, clientSecret, baseSite, authorizePath, accessTokenPath) {
|
||||||
this._clientId= clientId;
|
this._clientId= clientId;
|
||||||
|
@ -61,20 +62,37 @@ exports.OAuth2.prototype._request= function(method, url, headers, access_token,
|
||||||
headers: realHeaders
|
headers: realHeaders
|
||||||
};
|
};
|
||||||
|
|
||||||
request = https.request(options, function (response) {
|
// Some hosts *cough* google appear to close the connection early / send no content-length header
|
||||||
response.addListener("data", function (chunk) {
|
// allow this behaviour.
|
||||||
result+= chunk
|
var allowEarlyClose= OAuthUtils.isAnEarlyCloseHost(options.host);
|
||||||
});
|
var callbackCalled= false;
|
||||||
response.addListener("end", function () {
|
function passBackControl( response, result ) {
|
||||||
|
if(!callbackCalled) {
|
||||||
|
callbackCalled=true;
|
||||||
if( response.statusCode != 200 ) {
|
if( response.statusCode != 200 ) {
|
||||||
callback({ statusCode: response.statusCode, data: result });
|
callback({ statusCode: response.statusCode, data: result });
|
||||||
} else {
|
} else {
|
||||||
callback(null, result, response);
|
callback(null, result, response);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
request = https.request(options, function (response) {
|
||||||
|
response.on("data", function (chunk) {
|
||||||
|
result+= chunk
|
||||||
|
});
|
||||||
|
response.on("close", function (err) {
|
||||||
|
if( allowEarlyClose ) {
|
||||||
|
passBackControl( response, result );
|
||||||
|
}
|
||||||
|
});
|
||||||
|
response.addListener("end", function () {
|
||||||
|
passBackControl( response, result );
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
request.on('error', function(e) {
|
request.on('error', function(e) {
|
||||||
|
callbackCalled= true;
|
||||||
callback(e);
|
callback(e);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue