From 5f405e1454174074ac41bd279a44b3c4751880e0 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Thu, 10 Dec 2020 08:20:20 +0100 Subject: [PATCH] Fix loading order for OCS endpoints The loading order can have side effects in the way how apps register plugins, listeners, etc. Recently the order had been changed as part of cleaning up old code, but caused apps to break. This brings back the old app loading order to guarantee that apps won't break, even though it might not semantically make sense. Signed-off-by: Vincent Petry --- ocs/v1.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ocs/v1.php b/ocs/v1.php index e5138576584..3f165009f4b 100644 --- a/ocs/v1.php +++ b/ocs/v1.php @@ -51,13 +51,16 @@ use Symfony\Component\Routing\Exception\MethodNotAllowedException; try { OC_App::loadApps(['session']); OC_App::loadApps(['authentication']); - if (!\OC::$server->getUserSession()->isLoggedIn()) { - OC::handleLogin(\OC::$server->getRequest()); - } // load all apps to get all api routes properly setup + // FIXME: this should ideally appear after handleLogin but will cause + // side effects in existing apps OC_App::loadApps(); + if (!\OC::$server->getUserSession()->isLoggedIn()) { + OC::handleLogin(\OC::$server->getRequest()); + } + OC::$server->get(\OC\Route\Router::class)->match('/ocsapp'.\OC::$server->getRequest()->getRawPathInfo()); } catch (ResourceNotFoundException $e) { OC_API::setContentType();