From 89cca0cd7ce6a9b668e1c901e5704c140c9ee803 Mon Sep 17 00:00:00 2001
From: Alexander Piskun <bigcat88@icloud.com>
Date: Wed, 6 Sep 2023 16:53:53 +0300
Subject: [PATCH] new name of AppEcosystem is AppAPI

Signed-off-by: Alexander Piskun <bigcat88@icloud.com>
---
 build/stubs/{app_ecosystem_v2.php => app_api.php} |  4 ++--
 lib/base.php                                      | 12 ++++++------
 psalm.xml                                         |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename build/stubs/{app_ecosystem_v2.php => app_api.php} (74%)

diff --git a/build/stubs/app_ecosystem_v2.php b/build/stubs/app_api.php
similarity index 74%
rename from build/stubs/app_ecosystem_v2.php
rename to build/stubs/app_api.php
index d2b07c9c61628..1ab63499b773c 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 e201ca29dcf91..d94671327f281 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -1138,7 +1138,7 @@ public static function handleLogin(OCP\IRequest $request): bool {
 		if (OC_User::handleApacheAuth()) {
 			return true;
 		}
-		if (self::tryAppEcosystemV2Login($request)) {
+		if (self::tryAppAPILogin($request)) {
 			return true;
 		}
 		if ($userSession->tryTokenLogin($request)) {
@@ -1179,17 +1179,17 @@ protected static function handleAuthHeaders(): void {
 		}
 	}
 
-	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 52eb9841aec43..573879adaa80a 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>
 		<UndefinedClass>