fix: Revert change to the cloud integration

This might fixes the test.

Signed-off-by: Carl Schwan <[email protected]>

Author: CarlSchwan

apps/files_sharing/lib/External/Manager.php

@@ -14,7 +14,6 @@
 use OCA\FederatedFileSharing\Events\FederatedShareAddedEvent;
 use OCA\Files_Sharing\Helper;
 use OCA\Files_Sharing\ResponseDefinitions;
-use OCP\AppFramework\Http;
 use OCP\DB\Exception;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\EventDispatcher\IEventDispatcher;
@@ -34,7 +33,6 @@
 use OCP\IUser;
 use OCP\IUserSession;
 use OCP\Notification\IManager;
-use OCP\OCM\Exceptions\OCMProviderException;
 use OCP\OCS\IDiscoveryService;
 use OCP\Server;
 use OCP\Share;
@@ -56,8 +54,7 @@
  *      accepted: bool,
  *      share_type:int,
  *      password: string,
- *      mountpoint_hash:
- *      string
+ *      mountpoint_hash: string
  *  }
  */
 class Manager {
@@ -80,6 +77,7 @@ public function __construct(
 		private LoggerInterface $logger,
 		private IRootFolder $rootFolder,
 		private SetupManager $setupManager,
+		private ICertificateManager $certificateManager,
 	) {
 		$this->user = $userSession->getUser();
 	}
@@ -524,7 +522,6 @@ private function sendFeedbackToRemote(string $remote, string $token, string $rem
 	 * @return array|false
 	 */
 	protected function tryOCMEndPoint(string $remoteDomain, string $token, string $remoteId, string $feedback) {
-		$response = null;
 		switch ($feedback) {
 			case 'accept':
 				$notification = $this->cloudFederationFactory->getCloudFederationNotification();
@@ -538,11 +535,7 @@ protected function tryOCMEndPoint(string $remoteDomain, string $token, string $r
 					]
 
 				);
-				try {
-					$response = $this->cloudFederationProviderManager->sendCloudNotification($remoteDomain, $notification);
-				} catch (OCMProviderException) {
-				}
-				break;
+				return $this->cloudFederationProviderManager->sendNotification($remoteDomain, $notification);
 			case 'decline':
 				$notification = $this->cloudFederationFactory->getCloudFederationNotification();
 				$notification->setMessage(
@@ -553,26 +546,9 @@ protected function tryOCMEndPoint(string $remoteDomain, string $token, string $r
 						'sharedSecret' => $token,
 						'message' => 'Recipient declined the share'
 					]
-
 				);
-				try {
-					$response = $this->cloudFederationProviderManager->sendCloudNotification($remoteDomain, $notification);
-				} catch (OCMProviderException) {
-				}
-				break;
-			default:
-				throw new \RuntimeException('Unknown feedback');
+				return $this->cloudFederationProviderManager->sendNotification($remoteDomain, $notification);
 		}
-
-		if ($response !== null && $response->getStatusCode() === Http::STATUS_CREATED) {
-			$result = json_decode($response->getBody(), true);
-			if (is_array($result)) {
-				return $result;
-			} else {
-				return [];
-			}
-		}
-
 		return false;
 	}
 
@@ -589,7 +565,7 @@ public function getMount(array $data, ?IUser $user = null) {
 		$data['manager'] = $this;
 		$mountPoint = '/' . $user->getUID() . '/files' . $data['mountpoint'];
 		$data['mountpoint'] = $mountPoint;
-		$data['certificateManager'] = Server::get(ICertificateManager::class);
+		$data['certificateManager'] = $this->certificateManager;
 		return new Mount(self::STORAGE, $mountPoint, $data, $this, $this->storageLoader);
 	}
 

apps/files_sharing/tests/External/ManagerTest.php

@@ -26,6 +26,7 @@
 use OCP\Http\Client\IClient;
 use OCP\Http\Client\IClientService;
 use OCP\Http\Client\IResponse;
+use OCP\ICertificateManager;
 use OCP\ICacheFactory;
 use OCP\IDBConnection;
 use OCP\IGroup;
@@ -66,6 +67,7 @@ class ManagerTest extends TestCase {
 	protected IGroupManager&MockObject $groupManager;
 	protected IUserManager&MockObject $userManager;
 	protected SetupManager&MockObject $setupManager;
+	protected ICertificateManager&MockObject $certificateManager;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -97,6 +99,8 @@ protected function setUp(): void {
 			->method('search')
 			->willReturn([]);
 
+		$this->certificateManager = $this->createMock(ICertificateManager::class);
+
 		$this->logger = $this->createMock(LoggerInterface::class);
 		$this->logger->expects($this->never())->method('emergency');
 
@@ -158,6 +162,7 @@ private function createManagerForUser(IUser $user): Manager&MockObject {
 					$this->logger,
 					$this->rootFolder,
 					$this->setupManager,
+					$this->certificateManager,
 				]
 			)->onlyMethods(['tryOCMEndPoint'])->getMock();
 	}

build/psalm-baseline.xml

@@ -1520,6 +1520,8 @@
   <file src="apps/files_sharing/lib/External/Manager.php">
     <DeprecatedMethod>
       <code><![CDATA[insertIfNotExist]]></code>
+      <code><![CDATA[sendNotification]]></code>
+      <code><![CDATA[sendNotification]]></code>
     </DeprecatedMethod>
     <LessSpecificReturnStatement>
       <code><![CDATA[$mount]]></code>