From: Alexander Piskun <bigcat88@icloud.com>
Date: Wed, 6 Sep 2023 13:53:53 +0000 (+0300)
Subject: new name of AppEcosystem is AppAPI
X-Git-Tag: v27.1.0rc2~6^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=89cca0cd7ce6a9b668e1c901e5704c140c9ee803;p=nextcloud-server.git

new name of AppEcosystem is AppAPI

Signed-off-by: Alexander Piskun <bigcat88@icloud.com>
---

diff --git a/build/stubs/app_api.php b/build/stubs/app_api.php
new file mode 100644
index 00000000000..1ab63499b77
--- /dev/null
+++ b/build/stubs/app_api.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace OCA\AppAPI\Service;
+
+use OCP\IRequest;
+
+class AppAPIService {
+	/**
+	 * @param IRequest $request
+	 * @param bool $isDav
+	 *
+	 * @return bool
+	 */
+	public function validateExAppRequestToNC(IRequest $request, bool $isDav = false): bool {}
+}
diff --git a/build/stubs/app_ecosystem_v2.php b/build/stubs/app_ecosystem_v2.php
deleted file mode 100644
index d2b07c9c616..00000000000
--- a/build/stubs/app_ecosystem_v2.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace OCA\AppEcosystemV2\Service;
-
-use OCP\IRequest;
-
-class AppEcosystemV2Service {
-	/**
-	 * @param IRequest $request
-	 * @param bool $isDav
-	 *
-	 * @return bool
-	 */
-	public function validateExAppRequestToNC(IRequest $request, bool $isDav = false): bool {}
-}
diff --git a/lib/base.php b/lib/base.php
index e201ca29dcf..d94671327f2 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 52eb9841aec..573879adaa8 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>