Added support and test coverage for following 301 redirects
This commit is contained in:
parent
5707c480df
commit
d8b5731446
|
@ -353,8 +353,8 @@ exports.OAuth.prototype._performSecureRequest= function( oauth_token, oauth_toke
|
||||||
if ( response.statusCode >= 200 && response.statusCode <= 299 ) {
|
if ( response.statusCode >= 200 && response.statusCode <= 299 ) {
|
||||||
callback(null, data, response);
|
callback(null, data, response);
|
||||||
} else {
|
} else {
|
||||||
// Follow 302 redirects with Location HTTP header
|
// Follow 301 or 302 redirects with Location HTTP header
|
||||||
if(response.statusCode == 302 && response.headers && response.headers.location) {
|
if((response.statusCode == 301 || response.statusCode == 302) && response.headers && response.headers.location) {
|
||||||
self._performSecureRequest( oauth_token, oauth_token_secret, method, response.headers.location, extra_params, post_body, post_content_type, callback);
|
self._performSecureRequest( oauth_token, oauth_token_secret, method, response.headers.location, extra_params, post_body, post_content_type, callback);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
|
@ -600,6 +600,74 @@ vows.describe('OAuth').addBatch({
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
'And A 301 redirect is received' : {
|
||||||
|
'and there is a location header' : {
|
||||||
|
'it should (re)perform the secure request but with the new location' : function(oa) {
|
||||||
|
var op= oa._createClient;
|
||||||
|
var psr= oa._performSecureRequest;
|
||||||
|
var responseCounter = 1;
|
||||||
|
var callbackCalled = false;
|
||||||
|
var DummyResponse =function() {
|
||||||
|
if( responseCounter == 1 ){
|
||||||
|
this.statusCode= 301;
|
||||||
|
this.headers= {location:"http://redirectto.com"};
|
||||||
|
responseCounter++;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
this.statusCode= 200;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
DummyResponse.prototype= events.EventEmitter.prototype;
|
||||||
|
DummyResponse.prototype.setEncoding= function() {}
|
||||||
|
|
||||||
|
try {
|
||||||
|
oa._createClient= function( port, hostname, method, path, headers, sshEnabled ) {
|
||||||
|
return new DummyRequest( new DummyResponse() );
|
||||||
|
}
|
||||||
|
oa._performSecureRequest= function( oauth_token, oauth_token_secret, method, url, extra_params, post_body, post_content_type, callback ) {
|
||||||
|
if( responseCounter == 1 ) {
|
||||||
|
assert.equal(url, "http://originalurl.com");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
assert.equal(url, "http://redirectto.com");
|
||||||
|
}
|
||||||
|
return psr.call(oa, oauth_token, oauth_token_secret, method, url, extra_params, post_body, post_content_type, callback )
|
||||||
|
}
|
||||||
|
|
||||||
|
oa._performSecureRequest("token", "token_secret", 'POST', 'http://originalurl.com', {"scope": "foobar,1,2"}, null, null, function() {
|
||||||
|
// callback
|
||||||
|
assert.equal(responseCounter, 2);
|
||||||
|
callbackCalled= true;
|
||||||
|
});
|
||||||
|
assert.equal(callbackCalled, true)
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
oa._createClient= op;
|
||||||
|
oa._performSecureRequest= psr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
'but there is no location header' : {
|
||||||
|
'it should execute the callback, passing the HTTP Response code' : function(oa) {
|
||||||
|
var op= oa._createClient;
|
||||||
|
var callbackCalled = false;
|
||||||
|
try {
|
||||||
|
oa._createClient= function( port, hostname, method, path, headers, sshEnabled ) {
|
||||||
|
return new DummyRequest( new DummyResponse(301) );
|
||||||
|
}
|
||||||
|
oa._performSecureRequest("token", "token_secret", 'POST', 'http://originalurl.com', {"scope": "foobar,1,2"}, null, null, function(error) {
|
||||||
|
// callback
|
||||||
|
assert.equal(error.statusCode, 301);
|
||||||
|
callbackCalled= true;
|
||||||
|
});
|
||||||
|
assert.equal(callbackCalled, true)
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
oa._createClient= op;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
'And A 302 redirect is received' : {
|
'And A 302 redirect is received' : {
|
||||||
'and there is a location header' : {
|
'and there is a location header' : {
|
||||||
'it should (re)perform the secure request but with the new location' : function(oa) {
|
'it should (re)perform the secure request but with the new location' : function(oa) {
|
||||||
|
|
Loading…
Reference in New Issue