1 files changed, 45 insertions, 35 deletions

diff --git a/ocs/v1.php b/ocs/v1.php
index 91f52a66943..e12cd6ddc11 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -1,75 +1,85 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
+
 require_once __DIR__ . '/../lib/versioncheck.php';
 require_once __DIR__ . '/../lib/base.php';
 
-if (\OCP\Util::needUpgrade()
-	|| \OC::$server->getConfig()->getSystemValueBool('maintenance')) {
+use OC\OCS\ApiHelper;
+use OC\Route\Router;
+use OC\SystemConfig;
+use OC\User\LoginException;
+use OCP\App\IAppManager;
+use OCP\AppFramework\Http;
+use OCP\AppFramework\OCSController;
+use OCP\IConfig;
+use OCP\IRequest;
+use OCP\IUserSession;
+use OCP\Security\Bruteforce\MaxDelayReached;
+use OCP\Server;
+use OCP\Util;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+
+if (Util::needUpgrade()
+	|| Server::get(IConfig::class)->getSystemValueBool('maintenance')) {
 	// since the behavior of apps or remotes are unpredictable during
 	// an upgrade, return a 503 directly
-	http_response_code(503);
-	header('X-Nextcloud-Maintenance-Mode: 1');
-	$response = new \OC\OCS\Result(null, 503, 'Service unavailable');
-	OC_API::respond($response, OC_API::requestedFormat());
+	ApiHelper::respond(503, 'Service unavailable', ['X-Nextcloud-Maintenance-Mode' => '1'], 503);
 	exit;
 }
 
-use OCP\Security\Bruteforce\MaxDelayReached;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\Routing\Exception\MethodNotAllowedException;
-use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 
 /*
  * Try the appframework routes
  */
 try {
-	OC_App::loadApps(['session']);
-	OC_App::loadApps(['authentication']);
-	OC_App::loadApps(['extended_authentication']);
+	$appManager = Server::get(IAppManager::class);
+	$appManager->loadApps(['session']);
+	$appManager->loadApps(['authentication']);
+	$appManager->loadApps(['extended_authentication']);
 
 	// 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();
+	$appManager->loadApps();
+
+	$request = Server::get(IRequest::class);
+	$request->throwDecodingExceptionIfAny();
 
-	if (!\OC::$server->getUserSession()->isLoggedIn()) {
-		OC::handleLogin(\OC::$server->getRequest());
+	if (!Server::get(IUserSession::class)->isLoggedIn()) {
+		OC::handleLogin($request);
 	}
 
-	OC::$server->get(\OC\Route\Router::class)->match('/ocsapp'.\OC::$server->getRequest()->getRawPathInfo());
+	Server::get(Router::class)->match('/ocsapp' . $request->getRawPathInfo());
 } catch (MaxDelayReached $ex) {
-	$format = \OC::$server->getRequest()->getParam('format', 'xml');
-	OC_API::respond(new \OC\OCS\Result(null, OCP\AppFramework\Http::STATUS_TOO_MANY_REQUESTS, $ex->getMessage()), $format);
+	ApiHelper::respond(Http::STATUS_TOO_MANY_REQUESTS, $ex->getMessage());
 } catch (ResourceNotFoundException $e) {
-	OC_API::setContentType();
-
-	$format = \OC::$server->getRequest()->getParam('format', 'xml');
 	$txt = 'Invalid query, please check the syntax. API specifications are here:'
-		.' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services.'."\n";
-	OC_API::respond(new \OC\OCS\Result(null, \OCP\AppFramework\OCSController::RESPOND_NOT_FOUND, $txt), $format);
+		. ' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services.' . "\n";
+	ApiHelper::respond(OCSController::RESPOND_NOT_FOUND, $txt);
 } catch (MethodNotAllowedException $e) {
-	OC_API::setContentType();
+	ApiHelper::setContentType();
 	http_response_code(405);
-} catch (\OC\OCS\Exception $ex) {
-	OC_API::respond($ex->getResult(), OC_API::requestedFormat());
-} catch (\OC\User\LoginException $e) {
-	OC_API::respond(new \OC\OCS\Result(null, \OCP\AppFramework\OCSController::RESPOND_UNAUTHORISED, 'Unauthorised'));
+} catch (LoginException $e) {
+	ApiHelper::respond(OCSController::RESPOND_UNAUTHORISED, 'Unauthorised');
 } catch (\Exception $e) {
-	\OCP\Server::get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
-	OC_API::setContentType();
+	Server::get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
 
-	$format = \OC::$server->getRequest()->getParam('format', 'xml');
-	$txt = 'Internal Server Error'."\n";
+	$txt = 'Internal Server Error' . "\n";
 	try {
-		if (\OC::$server->getSystemConfig()->getValue('debug', false)) {
+		if (Server::get(SystemConfig::class)->getValue('debug', false)) {
 			$txt .= $e->getMessage();
 		}
 	} catch (\Throwable $e) {
 		// Just to be save
 	}
-	OC_API::respond(new \OC\OCS\Result(null, \OCP\AppFramework\OCSController::RESPOND_SERVER_ERROR, $txt), $format);
+	ApiHelper::respond(OCSController::RESPOND_SERVER_ERROR, $txt);
 }