client_id is now passed to getDefaultScope().

Author: F21

src/OAuth2/Controller/AuthorizeController.php

@@ -145,7 +145,7 @@ public function validateAuthorizeRequest(RequestInterface $request, ResponseInte
         $response_type = $request->query('response_type');
         $state = $request->query('state');
         if (!$scope = $this->scopeUtil->getScopeFromRequest($request)) {
-            $scope = $this->scopeUtil->getDefaultScope();
+            $scope = $this->scopeUtil->getDefaultScope($client_id);
         }
 
         // type and client_id are required

src/OAuth2/Controller/TokenController.php

@@ -125,7 +125,7 @@ public function grantAccessToken(RequestInterface $request, ResponseInterface $r
          */
         $availableScope = $grantType->getScope();
         if (!$requestedScope = $this->scopeUtil->getScopeFromRequest($request)) {
-            $requestedScope = $availableScope ? $availableScope : $this->scopeUtil->getDefaultScope();
+            $requestedScope = $availableScope ? $availableScope : $this->scopeUtil->getDefaultScope($clientId);
         }
 
         if (($requestedScope && !$this->scopeUtil->scopeExists($requestedScope, $clientId))

src/OAuth2/Scope.php

@@ -72,8 +72,8 @@ public function getScopeFromRequest(RequestInterface $request)
         return $request->request('scope', $request->query('scope'));
     }
 
-    public function getDefaultScope()
+    public function getDefaultScope($client_id = null)
     {
-        return $this->storage->getDefaultScope();
+        return $this->storage->getDefaultScope($client_id);
     }
 }

src/OAuth2/Storage/Memory.php

@@ -26,6 +26,7 @@ class Memory implements AuthorizationCodeInterface,
     private $jwt;
     private $supportedScopes;
     private $clientSupportedScopes;
+    private $clientDefaultScopes;
     private $defaultScope;
 
     public function __construct($params = array())
@@ -39,6 +40,7 @@ public function __construct($params = array())
             'jwt' => array(),
             'default_scope' => null,
             'client_supported_scopes' => array(),
+            'client_default_scopes' => array(),
             'supported_scopes' => array(),
         ), $params);
 
@@ -50,6 +52,7 @@ public function __construct($params = array())
         $this->jwt = $params['jwt'];
         $this->supportedScopes = $params['supported_scopes'];
         $this->clientSupportedScopes = $params['client_supported_scopes'];
+        $this->clientDefaultScopes = $params['client_default_scopes'];
         $this->defaultScope = $params['default_scope'];
     }
 
@@ -171,9 +174,13 @@ public function scopeExists($scope, $client_id = null)
         return (count(array_diff($scope, $allowedScopes)) == 0);
     }
 
-    public function getDefaultScope()
+    public function getDefaultScope($client_id = null)
     {
-        return $this->defaultScope;
+        if ($client_id && array_key_exists($client_id, $this->clientDefaultScopes)) {
+           return implode(' ', $this->clientDefaultScopes[$client_id]);
+        }else{
+           return $this->defaultScope;
+        }
     }
 
     /*JWTBearerInterface */

src/OAuth2/Storage/ScopeInterface.php

@@ -41,5 +41,5 @@ public function scopeExists($scope, $client_id = null);
      * ex:
      *     null
      */
-    public function getDefaultScope();
+    public function getDefaultScope($client_id = null);
 }

test/OAuth2/ScopeTest.php

@@ -3,6 +3,7 @@
 namespace OAuth2;
 
 use OAuth2\Storage\Memory;
+use OAuth2\Storage\Bootstrap;
 
 class ScopeTest extends \PHPUnit_Framework_TestCase
 {
@@ -38,5 +39,11 @@ public function testScopeStorage()
 
         $this->assertEquals($scopeUtil->getDefaultScope(), 'base');
         $this->assertTrue($scopeUtil->scopeExists('only-this-one', 'client_id'));
+
+        //Test getting default scopes with a client_id
+        $memoryStorage = Bootstrap::getInstance()->getMemoryStorage();
+        $scopeUtil = new Scope($memoryStorage);
+        $this->assertEquals($scopeUtil->getDefaultScope('Test Default Scope Client ID'), 'clientscope1 clientscope2');
+        $this->assertEquals($scopeUtil->getDefaultScope('Test Default Scope Client ID 2'), 'clientscope3');
     }
 }

test/config/storage.json

@@ -109,6 +109,10 @@
         "Test Client ID" : ["clientscope1", "clientscope2"],
         "Test Client ID 2" : ["clientscope3"]
     },
+    "client_default_scopes" : {
+        "Test Default Scope Client ID" : ["clientscope1", "clientscope2"],
+        "Test Default Scope Client ID 2" : ["clientscope3"]
+    },
     "supported_scopes" : [
         "scope1",
         "scope2",