Merge branch 'master' of https://github.com/tolgaakyuz/passport-http-oauth into encoding

Author: jaredhanson

lib/passport-http-oauth/strategies/consumer.js

@@ -290,7 +290,7 @@ ConsumerStrategy.prototype.authenticate = function(req) {
 
       if (signatureMethod == 'HMAC-SHA1') {
         var key = consumerSecret + '&';
-        if (tokenSecret) { key += tokenSecret; }
+        if (tokenSecret) { key += utils.encode(tokenSecret); }
         var computedSignature = utils.hmacsha1(key, base);
 
         if (signature !== computedSignature) {

lib/passport-http-oauth/strategies/token.js

@@ -117,6 +117,7 @@ function TokenStrategy(options, consumer, verify, validate) {
   this._host = options.host || null;
   this._realm = options.realm || 'Users';
   this._ignoreVersion = options.ignoreVersion || false;
+  this.req = null;
 }
 
 /**
@@ -134,7 +135,8 @@ util.inherits(TokenStrategy, passport.Strategy);
 TokenStrategy.prototype.authenticate = function(req) {
   var params = undefined
     , header = null;
-
+    
+  this.req = req;
   if (req.headers && req.headers['authorization']) {
     var parts = req.headers['authorization'].split(' ');
     if (parts.length >= 2) {
@@ -220,7 +222,7 @@ TokenStrategy.prototype.authenticate = function(req) {
 
       if (signatureMethod == 'HMAC-SHA1') {
         var key = consumerSecret + '&';
-        if (tokenSecret) { key += tokenSecret; }
+        if (tokenSecret) { key += utils.encode(tokenSecret); }
         var computedSignature = utils.hmacsha1(key, base);
 
         if (signature !== computedSignature) {