mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Roeland Jago Douma 2020-10-31 12:12:03 +01:00
parent 5396e98d2d
commit 3831d8f57f
No known key found for this signature in database
GPG Key ID: F941078878347C0C
1 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ocs/v1.php
View File

@ -46,45 +46,18 @@ use Symfony\Component\Routing\Exception\ResourceNotFoundException;
use Symfony\Component\Routing\Exception\MethodNotAllowedException; use Symfony\Component\Routing\Exception\MethodNotAllowedException;
/* /*
* Try old routes first * Try the appframework routes
* We first try the old routes since the appframework triggers more login stuff.
*/ */
try { try {
OC_App::loadApps(['session']); OC_App::loadApps(['session']);
OC_App::loadApps(['authentication']); 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()) { if (!\OC::$server->getUserSession()->isLoggedIn()) {
OC::handleLogin(\OC::$server->getRequest()); 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()); OC::$server->getRouter()->match('/ocsapp'.\OC::$server->getRequest()->getRawPathInfo());
} catch (ResourceNotFoundException $e) { } catch (ResourceNotFoundException $e) {
OC_API::setContentType(); OC_API::setContentType();