Support OAuth2 refresh_token exchange

Author: MrSwitch

index.js

@@ -88,13 +88,24 @@ module.exports = new (function(){
 			}
 
 			// Make the OAuth2 request
-			var post = self.utils.param({
-				code : p.code,
-				client_id : p.client_id || p.id,
-				client_secret : response,
-				grant_type : 'authorization_code',
-				redirect_uri : encodeURIComponent(p.redirect_uri)
-			}, function(r){return r;});
+			var post = null;
+			if(p.code){
+				post = {
+					code : p.code,
+					client_id : p.client_id || p.id,
+					client_secret : response,
+					grant_type : 'authorization_code',
+					redirect_uri : encodeURIComponent(p.redirect_uri)
+				};
+			}
+			else if(p.refresh_token){
+				post = {
+					refresh_token : p.refresh_token,
+					client_id : p.client_id || p.id,
+					client_secret : response,
+					grant_type : 'refresh_token',
+				};
+			}
 
 			// Get the grant_url
 			var grant_url = p.grant_url || p.grant || (p.oauth ? p.oauth.grant : false  );
@@ -109,6 +120,10 @@ module.exports = new (function(){
 
 			self.utils.log("OAUTH2-GRANT-REQUEST", grant_url, post);
 
+			// Convert the post object literal to a string
+			post = self.utils.param(post, function(r){return r;});
+
+			// Create the request
 			var r = url.parse( grant_url );
 			r.method = 'POST';
 			r.headers = {
@@ -157,6 +172,11 @@ module.exports = new (function(){
 					data.state = p.state || '';
 				}
 
+				// If the refresh token was on the original request lets return it.
+				if( p.refresh_token && !data.refresh_token ){
+					data.refresh_token = p.refresh_token;
+				}
+
 				callback(data);
 			});
 		});
@@ -259,7 +279,7 @@ module.exports = new (function(){
 		//
 		// OAUTH2
 		//
-		if( p.code && p.redirect_uri ){
+		if( ( p.code || p.refresh_token ) && p.redirect_uri ){
 
 			self.login( p, function(response){
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oauth-shim",
-  "version": "0.0.9",
+  "version": "0.1.0",
   "description": "OAuth2 shim for OAuth1 services, works with the clientside library HelloJS",
   "main": "index.js",
   "scripts": {

test/tests.js

@@ -179,6 +179,49 @@ describe('OAuth2 exchanging code for token,', function(){
 });
 
 
+// /////////////////////////////
+// OAuth2 Excahange refresh_token for access_token
+// /////////////////////////////
+
+describe('OAuth2 exchange refresh_token for access token', function(){
+
+	var query = {};
+
+	beforeEach(function(){
+		query = {
+			'grant_url' : 'http://localhost:'+test_port+'/oauth/grant',
+			'refresh_token' : '123456',
+			'client_id' : 'client_id',
+			'redirect_uri' : 'http://localhost:'+test_port+'/response',
+			'state' : "state"
+		};
+	});
+
+	function redirect_uri(o){
+		var hash = [];
+		for(var x in o){
+			hash.push(x + '=' + o[x]);
+		}
+		return new RegExp( query.redirect_uri.replace(/\//g,'\\/') + '#' + hash.join('&') );
+	}
+
+	it("should redirect back to redirect_uri with an access_token and refresh_token", function(done){
+
+		request(app)
+			.get('/proxy?'+querystring.stringify(query))
+			.expect('Location', query.redirect_uri + '#' + oauth2codeExchange+"&refresh_token=123456" )
+			.expect(302)
+			.end(function(err, res){
+				if (err) throw err;
+				done();
+			});
+	});
+	
+});
+
+
+
+
 ////////////////////////////////
 // REMOTE SERVER AUTHENTICATION
 ////////////////////////////////