feat(OAuth): Client scope can be left empty

Closes #291

Author: Jens Schulze

src/Client/OAuth/Manager.php

@@ -106,7 +106,10 @@ public function refreshToken()
     {
         $scope = $this->getConfig()->getScope();
         $grantType = $this->getConfig()->getGrantType();
-        $data = [Config::SCOPE => $scope, Config::GRANT_TYPE => $grantType];
+        $data = [Config::GRANT_TYPE => $grantType];
+        if (!empty($scope)) {
+            $data[Config::SCOPE] = $scope;
+        }
 
         switch ($grantType) {
             case Config::GRANT_TYPE_PASSWORD:

src/Config.php

@@ -268,6 +268,9 @@ public function getScope()
      */
     public function setScope($scope)
     {
+        if (empty($scope)) {
+            $scope = [];
+        }
         if (!is_array($scope)) {
             $scope = explode(' ', $scope);
         }

tests/integration/ManagerTest.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * @author @jayS-de <jens.schulze@commercetools.de>
+ */
+
+
+namespace Commercetools\Core;
+
+
+use Commercetools\Core\Client\OAuth\Manager;
+
+class ManagerTest extends ApiTestCase
+{
+    public function testEmptyScope()
+    {
+        $config = $this->getClientConfig('manage_project');
+        $config->setScope('');
+        $manager = new Manager($config);
+
+        $token = $manager->refreshToken();
+        $this->assertEmpty($config->getScope());
+        $this->assertNotEmpty($token->getScope());
+        $this->assertNotEmpty($token->getToken());
+        $this->assertContains('manage_project', $token->getScope());
+    }
+}

tests/unit/Client/OAuth/ManagerTest.php

@@ -103,7 +103,7 @@ public function testScope()
             Config::CLIENT_SECRET => 'secret',
             Config::SCOPE => 'test_scope',
             Config::OAUTH_URL => 'oauthUrl',
-            Config::PROJECT => 'project',
+            Config::PROJECT => 'testScope',
             Config::API_URL => 'apiUrl'
         ]);
         $manager = $this->getManager(
@@ -112,13 +112,42 @@ public function testScope()
                 "access_token" => "myToken",
                 "token_type" => "Bearer",
                 "expires_in" => 1000,
-                "scope" => "test_scope:project"
+                "scope" => "test_scope:testScope"
             ],
             200,
             true
         );
-        $this->assertInstanceOf('\Commercetools\Core\Client\OAuth\Token', $manager->getToken());
-        $this->assertSame($manager->getConfig()->getScope(), $manager->getToken()->getScope());
+        $token = $manager->getToken();
+        $this->assertInstanceOf('\Commercetools\Core\Client\OAuth\Token', $token);
+        $this->assertSame($manager->getConfig()->getScope(), $token->getScope());
+    }
+
+    public function testEmptyScope()
+    {
+        $config = Config::fromArray([
+            Config::CLIENT_ID => 'id',
+            Config::CLIENT_SECRET => 'secret',
+            Config::SCOPE => '',
+            Config::OAUTH_URL => 'oauthUrl',
+            Config::PROJECT => 'testEmptyScope',
+            Config::API_URL => 'apiUrl'
+        ]);
+        $manager = $this->getManager(
+            $config,
+            [
+                "access_token" => "myToken",
+                "token_type" => "Bearer",
+                "expires_in" => 1000,
+                "scope" => "test_scope:testEmptyScope"
+            ],
+            200,
+            true
+        );
+        $token = $manager->getToken();
+        $this->assertEmpty($config->getScope());
+        $this->assertInstanceOf('\Commercetools\Core\Client\OAuth\Token', $token);
+        $this->assertSame("test_scope:testEmptyScope", $token->getScope());
+        $this->assertNotSame($manager->getConfig()->getScope(), $token->getScope());
     }
 
     public function testScopes()
@@ -128,7 +157,7 @@ public function testScopes()
             Config::CLIENT_SECRET => 'secret',
             Config::SCOPE => ['scope1', 'scope2'],
             Config::OAUTH_URL => 'oauthUrl',
-            Config::PROJECT => 'project',
+            Config::PROJECT => 'testScopes',
             Config::API_URL => 'apiUrl'
         ]);
         $manager = $this->getManager(
@@ -137,7 +166,7 @@ public function testScopes()
                 "access_token" => "myToken",
                 "token_type" => "Bearer",
                 "expires_in" => 1000,
-                "scope" => "scope1:project scope2:project"
+                "scope" => "scope1:testScopes scope2:testScopes"
             ],
             200,
             true
@@ -154,7 +183,7 @@ public function testCache()
                 "access_token" => "myToken",
                 "token_type" => "Bearer",
                 "expires_in" => 1000,
-                "scope" => "manage_project:project"
+                "scope" => "manage_project:testCache"
             ]
         );
         $manager->getToken(); // first call ensures caching of token

tests/unit/ConfigTest.php

@@ -123,6 +123,29 @@ public function testDefaultScope()
         $this->assertSame('manage_project:project', $config->getScope());
     }
 
+    public function testEmptyStringScope()
+    {
+        $config = Config::fromArray($this->getConfig());
+        $config->setScope('');
+        $this->assertSame('', $config->getScope());
+    }
+
+    public function testEmptyStringScopeFromArray()
+    {
+        $config = $this->getConfig();
+        $config[Config::SCOPE] = '';
+        $config = Config::fromArray($config);
+        $this->assertSame('', $config->getScope());
+    }
+
+    public function testEmptyArrayScope()
+    {
+        $config = Config::fromArray($this->getConfig());
+        $config->setScope([]);
+        $this->assertSame('', $config->getScope());
+    }
+
+
     /**
      * @dataProvider getScopes
      */