From 5543f6297b3d9433d26507d57569690ac9d5306c Mon Sep 17 00:00:00 2001
From: lex alexander <l.alexander10@gmail.com>
Date: Tue, 30 May 2017 01:35:35 -0700
Subject: [PATCH] Allowed scope to be passed as a string or an array in case a
 user only passes one scope to get_authorization_url.

---
 lib/instagram.js     |  6 ++++--
 test/scripts/auth.js | 27 +++++++++++++++++++++++----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/lib/instagram.js b/lib/instagram.js
index 77cdba1..9c485eb 100644
--- a/lib/instagram.js
+++ b/lib/instagram.js
@@ -1435,8 +1435,10 @@ var instagram = function(spec, my) {
 
     var auth_url = url.format(url_obj);
 
-    if(Array.isArray(options.scope)) {
-      auth_url += '&scope=' + options.scope.join('+');
+    if(Array.isArray(options.scope) || typeof options.scope == 'string') {
+      auth_url += '&scope=' + (
+        Array.isArray(options.scope) ? options.scope.join('+') : options.scope
+      )
     }
 
     return auth_url;
diff --git a/test/scripts/auth.js b/test/scripts/auth.js
index 9541ec3..f8c31bf 100644
--- a/test/scripts/auth.js
+++ b/test/scripts/auth.js
@@ -28,7 +28,7 @@ var auth = (function(spec, my) {
           ok: true,
           description: 'Get authorization url'
         };
-        
+
         var redirect_uri = 'https://www.foo.com/handleauth';
         var expected_url = 'https://api.instagram.com/oauth/authorize?' +
           'client_id=1234&redirect_uri=https%3A%2F%2Fwww.foo.' +
@@ -39,10 +39,10 @@ var auth = (function(spec, my) {
         }
         return cb_(null, res);
       },
-      'with scope': function(cb_) {
+      'with scope as an array of options': function(cb_) {
         var res = {
           ok: true,
-          description: 'Get authorization url with valid scope'
+          description: 'Get authorization url with valid scope as an array'
         };
 
         var redirect_uri = 'https://www.foo.com/handleauth';
@@ -51,7 +51,26 @@ var auth = (function(spec, my) {
           'com%2Fhandleauth&response_type=code' +
           '&scope=likes+comments';
         var options = { scope: [ 'likes', 'comments' ] };
-        
+
+        if(exp_permissions_url !== instagram.get_authorization_url(redirect_uri, options)) {
+          res.ok = false;
+        }
+        return cb_(null, res);
+      },
+
+      'with scope as a string': function(cb_) {
+        var res = {
+          ok: true,
+          description: 'Get authorization url with valid scope as a string'
+        };
+
+        var redirect_uri = 'https://www.foo.com/handleauth';
+        var exp_permissions_url = 'https://api.instagram.com/oauth/authorize?' +
+          'client_id=1234&redirect_uri=https%3A%2F%2Fwww.foo.' +
+          'com%2Fhandleauth&response_type=code' +
+          '&scope=likes';
+        var options = { scope: 'likes'  };
+
         if(exp_permissions_url !== instagram.get_authorization_url(redirect_uri, options)) {
           res.ok = false;
         }