From 3831d8f57f04955cf781eb91a938c92be996a165 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Sat, 31 Oct 2020 12:12:03 +0100
Subject: [PATCH] Remove the matching on ancient /ocs routes

The appframework has been the default for quite some time now. So time
to take proper advantage of it.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
 ocs/v1.php | 37 +++++--------------------------------
 1 file changed, 5 insertions(+), 32 deletions(-)

diff --git a/ocs/v1.php b/ocs/v1.php
index b6dfb91d68a..f4ddc80804a 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -46,45 +46,18 @@ use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 
 /*
- * Try old routes first
- * We first try the old routes since the appframework triggers more login stuff.
+ * Try the appframework routes
  */
 try {
 	OC_App::loadApps(['session']);
 	OC_App::loadApps(['authentication']);
-	// load all apps to get all api routes properly setup
-	OC_App::loadApps();
-
-	OC::$server->getRouter()->match('/ocs'.\OC::$server->getRequest()->getRawPathInfo());
-
-	sleep(1);
-	OC::$server->getLogger()->info('This uses an old OCP\API::register construct. This will be removed in a future version of Nextcloud. Please migrate to the OCSController');
-
-	return;
-} catch (ResourceNotFoundException $e) {
-	// Fall through the not found
-} catch (MethodNotAllowedException $e) {
-	OC_API::setContentType();
-	http_response_code(405);
-	exit();
-} catch (\OC\OCS\Exception $ex) {
-	OC_API::respond($ex->getResult(), OC_API::requestedFormat());
-	exit();
-} catch (Throwable $ex) {
-	OC::$server->getLogger()->logException($ex);
-
-	OC_API::setContentType();
-	http_response_code(500);
-	exit();
-}
-
-/*
- * Try the appframework routes
- */
-try {
 	if (!\OC::$server->getUserSession()->isLoggedIn()) {
 		OC::handleLogin(\OC::$server->getRequest());
 	}
+
+	// load all apps to get all api routes properly setup
+	OC_App::loadApps();
+
 	OC::$server->getRouter()->match('/ocsapp'.\OC::$server->getRequest()->getRawPathInfo());
 } catch (ResourceNotFoundException $e) {
 	OC_API::setContentType();