diff options
author | Alexander Piskun <bigcat88@icloud.com> | 2023-09-06 16:53:53 +0300 |
---|---|---|
committer | Alexander Piskun <bigcat88@icloud.com> | 2023-09-06 16:53:53 +0300 |
commit | 01a11641f4b885a19d0cefdc2d9850854b3d47b0 (patch) | |
tree | 14460623c00411af3fb60fcda25523857ef3fbfa | |
parent | 8ac768c584cced998b66f9e8de6112b521455001 (diff) | |
download | nextcloud-server-01a11641f4b885a19d0cefdc2d9850854b3d47b0.tar.gz nextcloud-server-01a11641f4b885a19d0cefdc2d9850854b3d47b0.zip |
new name of AppEcosystem is AppAPI
Signed-off-by: Alexander Piskun <bigcat88@icloud.com>
-rw-r--r-- | build/stubs/app_api.php (renamed from build/stubs/app_ecosystem_v2.php) | 4 | ||||
-rw-r--r-- | lib/base.php | 12 | ||||
-rw-r--r-- | psalm.xml | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/build/stubs/app_ecosystem_v2.php b/build/stubs/app_api.php index d2b07c9c616..1ab63499b77 100644 --- a/build/stubs/app_ecosystem_v2.php +++ b/build/stubs/app_api.php @@ -1,10 +1,10 @@ <?php -namespace OCA\AppEcosystemV2\Service; +namespace OCA\AppAPI\Service; use OCP\IRequest; -class AppEcosystemV2Service { +class AppAPIService { /** * @param IRequest $request * @param bool $isDav diff --git a/lib/base.php b/lib/base.php index 7153e481eda..d96f91ddcd4 100644 --- a/lib/base.php +++ b/lib/base.php @@ -1138,7 +1138,7 @@ class OC { if (OC_User::handleApacheAuth()) { return true; } - if (self::tryAppEcosystemV2Login($request)) { + if (self::tryAppAPILogin($request)) { return true; } if ($userSession->tryTokenLogin($request)) { @@ -1179,17 +1179,17 @@ class OC { } } - protected static function tryAppEcosystemV2Login(OCP\IRequest $request): bool { + protected static function tryAppAPILogin(OCP\IRequest $request): bool { $appManager = Server::get(OCP\App\IAppManager::class); - if (!$request->getHeader('AE-SIGNATURE')) { + if (!$request->getHeader('AUTHORIZATION-APP-API')) { return false; } - if (!$appManager->isInstalled('app_ecosystem_v2')) { + if (!$appManager->isInstalled('app_api')) { return false; } try { - $appEcosystemV2Service = Server::get(OCA\AppEcosystemV2\Service\AppEcosystemV2Service::class); - return $appEcosystemV2Service->validateExAppRequestToNC($request); + $appAPIService = Server::get(OCA\AppAPI\Service\AppAPIService::class); + return $appAPIService->validateExAppRequestToNC($request); } catch (\Psr\Container\NotFoundExceptionInterface|\Psr\Container\ContainerExceptionInterface $e) { return false; } diff --git a/psalm.xml b/psalm.xml index cb7409489a8..f0198ee745e 100644 --- a/psalm.xml +++ b/psalm.xml @@ -81,7 +81,7 @@ <file name="build/stubs/zip.php"/> <file name="build/stubs/psr_container.php"/> <file name="3rdparty/sabre/uri/lib/functions.php" /> - <file name="build/stubs/app_ecosystem_v2.php" /> + <file name="build/stubs/app_api.php" /> </stubs> <issueHandlers> <LessSpecificReturnStatement errorLevel="error"/> |