upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-19 21:49:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 50

Merge pull request #17859 from nextcloud/bugfix/app-init

Browse source 
Fix app class setup warnings
This commit is contained in:
Roeland Jago Douma 2019-11-11 12:35:55 +01:00 committed by GitHub
commit 323c76cd48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
apps/federation/appinfo/routes.php
View file

@ -22,53 +22,48 @@
*
*/
$application = new \OCA\Federation\AppInfo\Application();
$application->registerRoutes(
$this,
[
'routes' => [
[
'name' => 'Settings#addServer',
'url' => '/trusted-servers',
'verb' => 'POST'
],
[
'name' => 'Settings#removeServer',
'url' => '/trusted-servers/{id}',
'verb' => 'DELETE'
],
[
'name' => 'Settings#autoAddServers',
'url' => '/auto-add-servers',
'verb' => 'POST'
],
return [
'routes' => [
[
'name' => 'Settings#addServer',
'url' => '/trusted-servers',
'verb' => 'POST'
],
'ocs' => [
// old endpoints, only used by Nextcloud and ownCloud
[
'name' => 'OCSAuthAPI#getSharedSecretLegacy',
'url' => '/api/v1/shared-secret',
'verb' => 'GET',
],
[
'name' => 'OCSAuthAPI#requestSharedSecretLegacy',
'url' => '/api/v1/request-shared-secret',
'verb' => 'POST',
],
// new endpoints, published as public api
[
'name' => 'OCSAuthAPI#getSharedSecret',
'root' => '/cloud',
'url' => '/shared-secret',
'verb' => 'GET',
],
[
'name' => 'OCSAuthAPI#requestSharedSecret',
'root' => '/cloud',
'url' => '/shared-secret',
'verb' => 'POST',
],
[
'name' => 'Settings#removeServer',
'url' => '/trusted-servers/{id}',
'verb' => 'DELETE'
],
]
);
[
'name' => 'Settings#autoAddServers',
'url' => '/auto-add-servers',
'verb' => 'POST'
],
],
'ocs' => [
// old endpoints, only used by Nextcloud and ownCloud
[
'name' => 'OCSAuthAPI#getSharedSecretLegacy',
'url' => '/api/v1/shared-secret',
'verb' => 'GET',
],
[
'name' => 'OCSAuthAPI#requestSharedSecretLegacy',
'url' => '/api/v1/request-shared-secret',
'verb' => 'POST',
],
// new endpoints, published as public api
[
'name' => 'OCSAuthAPI#getSharedSecret',
'root' => '/cloud',
'url' => '/shared-secret',
'verb' => 'GET',
],
[
'name' => 'OCSAuthAPI#requestSharedSecret',
'root' => '/cloud',
'url' => '/shared-secret',
'verb' => 'POST',
],
],
];

2
lib/public/AppFramework/App.php
View file

@ -95,7 +95,7 @@ class App {
}
}
if (!$setUpViaQuery) {
if (!$setUpViaQuery && $applicationClassName !== \OCP\AppFramework\App::class) {
\OC::$server->getLogger()->logException($e, [
'app' => $appName,
]);