Move OCS Middleware before security middleware

This is required to be able to catch the NotLoggedIn exceptions etc in
the OCSMiddleware and convert them to proper OCS Responses.

diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index 66ca59d26e2daef7ceb1699dc7e2551652536002..b60ce6432499c8c71145178d0e927dc26f7a3531 100644 (file)
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -396,6 +396,7 @@ class DIContainer extends SimpleContainer implements IAppContainer {
                $this->registerService('MiddlewareDispatcher', function($c) use (&$middleWares) {
                        $dispatcher = new MiddlewareDispatcher();
                        $dispatcher->registerMiddleware($c['CORSMiddleware']);
+                       $dispatcher->registerMiddleware($c['OCSMiddleware']);
                        $dispatcher->registerMiddleware($c['SecurityMiddleware']);
                        $dispatcher->registerMiddleWare($c['TwoFactorMiddleware']);
 
@@ -404,7 +405,6 @@ class DIContainer extends SimpleContainer implements IAppContainer {
                        }
 
                        $dispatcher->registerMiddleware($c['SessionMiddleware']);
-                       $dispatcher->registerMiddleware($c['OCSMiddleware']);
                        return $dispatcher;
                });