Changed filters to accept any amount of parameters

Author: lucadegasperi

src/LucaDegasperi/OAuth2Server/Filters/CheckAuthorizationParamsFilter.php

@@ -14,10 +14,9 @@ class CheckAuthorizationParamsFilter
      *
      * @param Route $route the route being called
      * @param Request $request the request object
-     * @param string $scope additional filter arguments
      * @return Response|null a bad response in case the params are invalid
      */
-    public function filter($route, $request, $scope = null)
+    public function filter($route, $request)
     {
         try {
 

src/LucaDegasperi/OAuth2Server/Filters/OAuthFilter.php

@@ -15,7 +15,7 @@ class OAuthFilter
      * @param string $scope additional filter arguments
      * @return Response|null a bad response in case the request is invalid
      */
-    public function filter($route, $request, $scope = null)
+    public function filter()
     {
         try {
             ResourceServer::isValid(Config::get('lucadegasperi/oauth2-server-laravel::oauth2.http_headers_only'));
@@ -26,9 +26,10 @@ public function filter($route, $request, $scope = null)
                 'error_message' => $e->getMessage(),
             ), 403);
         }
-
-        if (! is_null($scope)) {
-            $scopes = explode(',', $scope);
+        
+        if (func_num_args() > 2) {
+            $args = func_get_args();
+            $scopes = array_slice($args, 2);
 
             foreach ($scopes as $s) {
                 if (! ResourceServer::hasScope($s)) {

src/LucaDegasperi/OAuth2Server/Filters/OAuthOwnerFilter.php

@@ -13,14 +13,17 @@ class OAuthOwnerFilter
      * @param string $scope the allowed owners (comma separated)
      * @return Response|null a bad response in case the owner is not authorized
      */
-    public function filter($route, $request, $scope = null)
-    {
-        if (! is_null($scope) and ResourceServer::getOwnerType() !== $scope) {
-            return Response::json(array(
-                'status' => 403,
-                'error' => 'forbidden',
-                'error_message' => 'Only access tokens representing '.$scope.' can use this endpoint',
-            ), 403);
+    public function filter()
+    {   
+        if (func_num_args() > 2) {
+            $owner_types = array_slice(func_get_args(), 2);
+            if(!in_array(ResourceServer::getOwnerType(), $owner_types)) {
+                return Response::json(array(
+                    'status' => 403,
+                    'error' => 'forbidden',
+                    'error_message' => 'Only access tokens representing ' . implode(',', $owner_types) . ' can use this endpoint',
+                ), 403);
+            }
         }
     }
 }