Skip to content

Commit

Permalink
Merge branch 'master' of http://github.com/coopernurse/node-oauth int…
Browse files Browse the repository at this point in the history 
…o merge_coopernurse

Conflicts:
	lib/oauth.js
  • Loading branch information
@ciaranj
ciaranj committed Oct 31, 2010
2 parents fedf577 + bd54d3f commit bfaa9c4
Showing 1 changed file with 24 additions and 24 deletions.
48 changes: 24 additions & 24 deletions lib/oauth.js
View file
Expand Up @@ -2,7 +2,7 @@ var crypto= require('crypto'),
sha1= require('./sha1'),
http= require('http'),
URL= require('url'),
querystring= require('querystring');
querystring= require('querystring');

exports.OAuth= function(requestUrl, accessUrl, consumerKey, consumerSecret, version, authorize_callback, signatureMethod, nonceSize, customHeaders) {
this._requestUrl= requestUrl;
Expand Down Expand Up @@ -51,22 +51,22 @@ exports.OAuth.prototype._decodeData= function(toDecode) {
}

exports.OAuth.prototype._getSignature= function(method, url, parameters, tokenSecret) {
var signatureBase= this._createSignatureBase(method, url, parameters);
return this._createSignature( signatureBase, tokenSecret );
var signatureBase= this._createSignatureBase(method, url, parameters);
return this._createSignature( signatureBase, tokenSecret );
}

exports.OAuth.prototype._normalizeUrl= function(url) {
var parsedUrl= URL.parse(url, true)
var port ="";
if( parsedUrl.port ) {
if( parsedUrl.port ) {
if( (parsedUrl.protocol == "http:" && parsedUrl.port != "80" ) ||
(parsedUrl.protocol == "https:" && parsedUrl.port != "443") ) {
port= ":" + parsedUrl.port;
}
}

if( !parsedUrl.pathname || parsedUrl.pathname == "" ) parsedUrl.pathname ="/";

return parsedUrl.protocol + "//" + parsedUrl.hostname + port + parsedUrl.pathname;
}

Expand All @@ -77,7 +77,7 @@ exports.OAuth.prototype._buildAuthorizationHeaders= function(orderedParameters)
// Whilst the all the parameters should be included within the signature, only the oauth_ arguments
// should appear within the authorization header.
var m = orderedParameters[i][0].match('^oauth_');
if( m && m[0] === "oauth_") {
if( m && ( m[0] === "oauth_" || m[0] === 'scope' ) ) {
authHeader+= this._encodeData(orderedParameters[i][0])+"=\""+ this._encodeData(orderedParameters[i][1])+"\",";
}
}
Expand All @@ -88,15 +88,15 @@ exports.OAuth.prototype._buildAuthorizationHeaders= function(orderedParameters)
// Takes a literal in, then returns a sorted array
exports.OAuth.prototype._sortRequestParams= function(argumentsHash) {
var argument_pairs= [];
for(var key in argumentsHash ) {
for(var key in argumentsHash ) {
argument_pairs[argument_pairs.length]= [key, argumentsHash[key]];
}
// Sort by name, then value.
argument_pairs.sort(function(a,b) {
if ( a[0]== b[0] ) {
return a[1] < b[1] ? -1 : 1;
return a[1] < b[1] ? -1 : 1;
}
else return a[0] < b[0] ? -1 : 1;
else return a[0] < b[0] ? -1 : 1;
});

return argument_pairs;
Expand All @@ -110,19 +110,19 @@ exports.OAuth.prototype._normaliseRequestParams= function(arguments) {
args+= "="
args+= this._encodeData( argument_pairs[i][1] );
if( i < argument_pairs.length-1 ) args+= "&";
}
}
return args;
}

exports.OAuth.prototype._createSignatureBase= function(method, url, parameters) {
url= this._encodeData( this._normalizeUrl(url) );
url= this._encodeData( this._normalizeUrl(url) );
parameters= this._encodeData( parameters );
return method.toUpperCase() + "&" + url + "&" + parameters;
}

exports.OAuth.prototype._createSignature= function(signatureBase, tokenSecret) {
if( tokenSecret === undefined ) var tokenSecret= "";
else tokenSecret= this._encodeData( tokenSecret );
else tokenSecret= this._encodeData( tokenSecret );
// consumerSecret is already encoded
var key= this._consumerSecret + "&" + tokenSecret;

Expand All @@ -147,7 +147,7 @@ exports.OAuth.prototype._getNonce= function(nonceSize) {
var chars= this.NONCE_CHARS;
var char_pos;
var nonce_chars_length= chars.length;

for (var i = 0; i < nonceSize; i++) {
char_pos= Math.floor(Math.random() * nonce_chars_length);
result[i]= chars[char_pos];
Expand Down Expand Up @@ -194,8 +194,8 @@ exports.OAuth.prototype._performSecureRequest= function( oauth_token, oauth_toke
var sig= this._getSignature( method, url, this._normaliseRequestParams(oauthParameters), oauth_token_secret);
var orderedParameters= this._sortRequestParams( oauthParameters );
orderedParameters[orderedParameters.length]= ["oauth_signature", sig];

var query="";
var query="";
for( var i= 0 ; i < orderedParameters.length; i++) {
query+= this._encodeData(orderedParameters[i][0])+"="+ this._encodeData(orderedParameters[i][1]) + "&";
}
Expand All @@ -222,15 +222,15 @@ exports.OAuth.prototype._performSecureRequest= function( oauth_token, oauth_toke

headers["Content-length"]= post_body ? post_body.length : 0; //Probably going to fail if not posting ascii
headers["Content-Type"]= post_content_type;

var path;
if( !parsedUrl.pathname || parsedUrl.pathname == "" ) parsedUrl.pathname ="/";
if( parsedUrl.query ) path= parsedUrl.pathname + "?"+ parsedUrl.query ;
else path= parsedUrl.pathname;

var request = oauthProvider.request(method, path , headers);
if( callback ) {
var data="";
var data="";
var self= this;
request.addListener('response', function (response) {
response.setEncoding('utf8');
Expand All @@ -245,7 +245,7 @@ exports.OAuth.prototype._performSecureRequest= function( oauth_token, oauth_toke
}
});
});

request.socket.addListener("error",callback);
if( method == "POST" && post_body != null && post_body != "" ) {
request.write(post_body);
Expand All @@ -258,7 +258,7 @@ exports.OAuth.prototype._performSecureRequest= function( oauth_token, oauth_toke
}
return request;
}

return;
}

Expand All @@ -269,7 +269,7 @@ exports.OAuth.prototype.getOAuthAccessToken= function(oauth_token, oauth_token_s
} else {
extraParams.oauth_verifier= oauth_verifier;
}

this._performSecureRequest( oauth_token, oauth_token_secret, "GET", this._accessUrl, extraParams, "", null, function(error, data, response) {
if( error ) callback(error);
else {
Expand Down Expand Up @@ -305,14 +305,14 @@ exports.OAuth.prototype.post= function(url, oauth_token, oauth_token_secret, pos
}
return this._performSecureRequest( oauth_token, oauth_token_secret, "POST", url, extra_params, post_body, post_content_type, callback );
}

exports.OAuth.prototype.getOAuthRequestToken= function(extraParams, callback) {
if( typeof extraParams == "function" ){
callback = extraParams;
extraParams = {};
}

// Callbacks are 1.0A related
// Callbacks are 1.0A related
if( this._authorize_callback ) {
extraParams["oauth_callback"]= this._authorize_callback;
}
Expand Down Expand Up @@ -361,12 +361,12 @@ exports.OAuth.prototype.signUrl= function(url, oauth_token, oauth_token_secret,
var orderedParameters= this._sortRequestParams( collectedParameters );
orderedParameters[orderedParameters.length]= ["oauth_signature", sig];

var query="";
var query="";
for( var i= 0 ; i < orderedParameters.length; i++) {
query+= orderedParameters[i][0]+"="+ this._encodeData(orderedParameters[i][1]) + "&";
}
query= query.substring(0, query.length-1);

return parsedUrl.protocol + "//"+ parsedUrl.host + parsedUrl.pathname + "?" + query;
};

Expand Down

0 comments on commit bfaa9c4

Please sign in to comment.