Merge pull request #5 from tomhughes/gh-pages

Encode parameters correctly when building an OAuth base string

index.js

@@ -8,15 +8,15 @@ var ohauth = {};
 
 ohauth.qsString = function(obj) {
     return Object.keys(obj).sort().map(function(key) {
-        return encodeURIComponent(key) + '=' +
-            encodeURIComponent(obj[key]);
+        return ohauth.percentEncode(key) + '=' +
+            ohauth.percentEncode(obj[key]);
     }).join('&');
 };
 
 ohauth.stringQs = function(str) {
     return str.split('&').reduce(function(obj, pair){
         var parts = pair.split('=');
-        obj[parts[0]] = (null === parts[1]) ?
+        obj[decodeURIComponent(parts[0])] = (null === parts[1]) ?
             '' : decodeURIComponent(parts[1]);
         return obj;
     }, {});

test/ohauth.js

@@ -8,12 +8,18 @@ describe('ohauth', function() {
         it('turns an object into a querystring', function() {
             expect(ohauth.qsString({ foo: 1 })).to.eql('foo=1');
         });
+        it('escapes special characters', function() {
+            expect(ohauth.qsString({ "!'*()": "!'*()" })).to.eql('%21%27%2A%28%29=%21%27%2A%28%29');
+        });
     });
 
     describe('#stringQs', function() {
         it('turns a querystring into an object', function() {
             expect(ohauth.stringQs('foo=1')).to.eql({ foo: 1 });
         });
+        it('handles special characters', function() {
+            expect(ohauth.stringQs('%21%27%2A%28%29=%21%27%2A%28%29')).to.eql({ "!'*()": "!'*()" });
+        });
     });
 
     describe('#nonce', function() {