wiki-cafe/node-oauth
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed un-neccessaryy custom query parsing code

Browse Source
This commit is contained in:
ciaranj 2010-04-19 19:12:58 +01:00
parent a5d074ab5d
commit bbc7a741fc
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/oauth.js
View File

@ -1,6 +1,7 @@
var sha1= require('./sha1'), var sha1= require('./sha1'),
http= require('http'), http= require('http'),
URL= require('url'); URL= require('url'),
querystring= require('querystring');
exports.OAuth= function(requestUrl, accessUrl, authorizeUrl, consumerKey, consumerSecret, version, signatureMethod) { exports.OAuth= function(requestUrl, accessUrl, authorizeUrl, consumerKey, consumerSecret, version, signatureMethod) {
this._requestUrl= requestUrl; this._requestUrl= requestUrl;
@ -54,16 +55,6 @@ exports.OAuth.prototype._normalizeUrl= function(url) {
return parsedUrl.protocol + "//" + parsedUrl.hostname + port + parsedUrl.pathname; return parsedUrl.protocol + "//" + parsedUrl.hostname + port + parsedUrl.pathname;
} }
exports.OAuth.prototype._splitQueryString= function(stringToSplit) {
var result= {};
var parameters= stringToSplit.split("&");
for(var key in parameters) {
var parameterPair= parameters[key].split("=");
result[parameterPair[0]]= parameterPair[1];
}
return result;
}
// Takes a literal in, then returns a sorted array // Takes a literal in, then returns a sorted array
exports.OAuth.prototype._sortRequestParams= function(argumentsHash) { exports.OAuth.prototype._sortRequestParams= function(argumentsHash) {
var argument_pairs= []; var argument_pairs= [];
@ -132,7 +123,6 @@ exports.OAuth.prototype._getNonce= function(nonceSize) {
} }
exports.OAuth.prototype.getOauthAccessToken= function(oauth_token, oauth_token_secret, callback) { exports.OAuth.prototype.getOauthAccessToken= function(oauth_token, oauth_token_secret, callback) {
require('sys').puts('getOauthAccessToken')
var oauthParameters= { var oauthParameters= {
"oauth_timestamp": this._getTimestamp(), "oauth_timestamp": this._getTimestamp(),
"oauth_nonce": this._getNonce(32), "oauth_nonce": this._getNonce(32),
@ -167,7 +157,7 @@ exports.OAuth.prototype.getOauthAccessToken= function(oauth_token, oauth_token_s
if( response.statusCode != 200 ) { if( response.statusCode != 200 ) {
callback( response.statusCode +" : " + data ); callback( response.statusCode +" : " + data );
} else { } else {
var results= self._splitQueryString(data); var results= querystring.parse( data );
var oauth_token= results["oauth_token"]; var oauth_token= results["oauth_token"];
results["oauth_token"]= undefined; results["oauth_token"]= undefined;
var oauth_token_secret= results["oauth_token_secret"]; var oauth_token_secret= results["oauth_token_secret"];
@ -179,9 +169,7 @@ exports.OAuth.prototype.getOauthAccessToken= function(oauth_token, oauth_token_s
request.end(); request.end();
} }
exports.OAuth.prototype.getOAuthRequestToken= function(callback) { exports.OAuth.prototype.getOAuthRequestToken= function(callback) {
require('sys').puts('getOauthRequestToken')
var oauthParameters= { var oauthParameters= {
"oauth_timestamp": this._getTimestamp(), "oauth_timestamp": this._getTimestamp(),
"oauth_nonce": this._getNonce(32), "oauth_nonce": this._getNonce(32),
@ -190,7 +178,6 @@ exports.OAuth.prototype.getOAuthRequestToken= function(callback) {
"oauth_consumer_key": this._consumerKey "oauth_consumer_key": this._consumerKey
}; };
var method= "POST"; var method= "POST";
require('sys').puts(this._requestUrl)
var sig= this._getSignature( method, this._requestUrl, this._normaliseRequestParams(oauthParameters)); var sig= this._getSignature( method, this._requestUrl, this._normaliseRequestParams(oauthParameters));
@ -226,7 +213,7 @@ exports.OAuth.prototype.getOAuthRequestToken= function(callback) {
if( response.statusCode != 200 ) { if( response.statusCode != 200 ) {
callback( response.statusCode +" : " + data ); callback( response.statusCode +" : " + data );
} else { } else {
var results= self._splitQueryString(data); var results= querystring.parse(data);
var oauth_token= results["oauth_token"]; var oauth_token= results["oauth_token"];
var oauth_token_secret= results["oauth_token_secret"]; var oauth_token_secret= results["oauth_token_secret"];