Merge pull request #4 from MathieuLescure/master

Fix a bug when using GET instead of POST
drudge · Aug 31, 2014 · cbd4eaf · cbd4eaf
2 parents eea5304 + 4f1e7b8
commit cbd4eaf
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/lib/passport-twitter-token/strategy.js b/lib/passport-twitter-token/strategy.js
@@ -77,9 +77,9 @@ TwitterTokenStrategy.prototype.authenticate = function(req, options) {
   }
 
   var self = this;
-  var token = req.body.oauth_token || req.query.oauth_token;
-  var tokenSecret = req.body.oauth_token_secret || req.query.oauth_token_secret;
-  var userId = req.body.user_id || req.query.user_id;
+  var token = lookup(req.body, 'oauth_token') || lookup(req.query, 'oauth_token');
+  var tokenSecret = lookup(req.body, 'oauth_token_secret') || lookup(req.query, 'oauth_token_secret');
+  var userId = lookup(req.body, 'user_id') || lookup(req.query, 'user_id');
   var params = { user_id: userId };
 
   self._loadUserProfile(token, tokenSecret, params, function(err, profile) {
@@ -107,6 +107,18 @@ TwitterTokenStrategy.prototype.authenticate = function(req, options) {
       }
     }
   });
+
+  function lookup(obj, field) {
+    if (!obj) { return null; }
+    var chain = field.split(']').join('').split('[');
+    for (var i = 0, len = chain.length; i < len; i++) {
+      var prop = obj[chain[i]];
+      if (typeof(prop) === 'undefined') { return null; }
+      if (typeof(prop) !== 'object') { return prop; }
+      obj = prop;
+    }
+    return null;
+  }
 }
 
 /**