Merge pull request #11357 from touhidurabir/i11356_main

#11356 Apply default API controller middleware to routes from plugin

Author: touhidurabir

classes/handler/APIHandler.php

@@ -17,8 +17,8 @@
 use Illuminate\Http\Response;
 use Illuminate\Routing\Pipeline;
 use PKP\core\PKPBaseController;
-use PKP\core\PKPContainer;
 use PKP\core\PKPRoutingProvider;
+use PKP\middleware\HasRoles;
 use PKP\plugins\Hook;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Throwable;
@@ -190,14 +190,31 @@ protected function registerRoute(): void
         $router = app('router'); /** @var \Illuminate\Routing\Router $router */
 
         foreach ($this->routesFromHook as $routeParams) {
-            $router
-                ->addRoute(
-                    $routeParams['method'],
-                    $this->getEndpointPattern() . '/' . $routeParams['uri'],
-                    $routeParams['callback']
-                )
+            $route = $router->addRoute(
+                $routeParams['method'],
+                $this->getEndpointPattern() . '/' . $routeParams['uri'],
+                $routeParams['callback']
+            );
+
+            $route
                 ->name($routeParams['name'])
                 ->middleware($this->apiController->roleAuthorizer($routeParams['roles']));
+            
+                foreach ($this->apiController->getRouteGroupMiddleware() as $middleware) {
+                
+                    // As roles are already supplied for routes directly injecting in the router
+                    // we do not want to add any other roles middleware form controller if defined
+                    if (strstr($middleware, 'has.roles') !== false || strstr($middleware, HasRoles::class) !== false) {
+                        continue;
+                    }
+    
+                    // We don't want to set any middleware to the route which is already set
+                    if (in_array($middleware, $route->middleware())) {
+                        continue;
+                    }
+    
+                    $route->middleware($middleware);
+                }
         }
     }
 }