fix(ocm): Move out of server invite-accepted capability and implementation.

Signed-off-by: antoonp <[email protected]>

Author: redblom

apps/cloud_federation_api/appinfo/routes.php

@@ -20,12 +20,6 @@
 			'verb' => 'POST',
 			'root' => '/ocm',
 		],
-		[
-			'name' => 'RequestHandler#inviteAccepted',
-			'url' => '/invite-accepted',
-			'verb' => 'POST',
-			'root' => '/ocm',
-		],
 
 		// needs to be kept at the bottom of the list
 		[

apps/cloud_federation_api/composer/composer/autoload_classmap.php

@@ -12,9 +12,7 @@
     'OCA\\CloudFederationAPI\\Config' => $baseDir . '/../lib/Config.php',
     'OCA\\CloudFederationAPI\\Controller\\OCMRequestController' => $baseDir . '/../lib/Controller/OCMRequestController.php',
     'OCA\\CloudFederationAPI\\Controller\\RequestHandlerController' => $baseDir . '/../lib/Controller/RequestHandlerController.php',
-    'OCA\\CloudFederationAPI\\Db\\FederatedInvite' => $baseDir . '/../lib/Db/FederatedInvite.php',
-    'OCA\\CloudFederationAPI\\Db\\FederatedInviteMapper' => $baseDir . '/../lib/Db/FederatedInviteMapper.php',
-    'OCA\\CloudFederationAPI\\Events\\FederatedInviteAcceptedEvent' => $baseDir . '/../lib/Events/FederatedInviteAcceptedEvent.php',
     'OCA\\CloudFederationAPI\\Migration\\Version1016Date202502262004' => $baseDir . '/../lib/Migration/Version1016Date202502262004.php',
+    'OCA\\CloudFederationAPI\\Migration\\Version1018Date20260202110547' => $baseDir . '/../lib/Migration/Version1018Date20260202110547.php',
     'OCA\\CloudFederationAPI\\ResponseDefinitions' => $baseDir . '/../lib/ResponseDefinitions.php',
 );

apps/cloud_federation_api/composer/composer/autoload_static.php

@@ -7,14 +7,14 @@
 class ComposerStaticInitCloudFederationAPI
 {
     public static $prefixLengthsPsr4 = array (
-        'O' =>
+        'O' => 
         array (
             'OCA\\CloudFederationAPI\\' => 23,
         ),
     );
 
     public static $prefixDirsPsr4 = array (
-        'OCA\\CloudFederationAPI\\' =>
+        'OCA\\CloudFederationAPI\\' => 
         array (
             0 => __DIR__ . '/..' . '/../lib',
         ),
@@ -27,10 +27,8 @@ class ComposerStaticInitCloudFederationAPI
         'OCA\\CloudFederationAPI\\Config' => __DIR__ . '/..' . '/../lib/Config.php',
         'OCA\\CloudFederationAPI\\Controller\\OCMRequestController' => __DIR__ . '/..' . '/../lib/Controller/OCMRequestController.php',
         'OCA\\CloudFederationAPI\\Controller\\RequestHandlerController' => __DIR__ . '/..' . '/../lib/Controller/RequestHandlerController.php',
-        'OCA\\CloudFederationAPI\\Db\\FederatedInvite' => __DIR__ . '/..' . '/../lib/Db/FederatedInvite.php',
-        'OCA\\CloudFederationAPI\\Db\\FederatedInviteMapper' => __DIR__ . '/..' . '/../lib/Db/FederatedInviteMapper.php',
-        'OCA\\CloudFederationAPI\\Events\\FederatedInviteAcceptedEvent' => __DIR__ . '/..' . '/../lib/Events/FederatedInviteAcceptedEvent.php',
         'OCA\\CloudFederationAPI\\Migration\\Version1016Date202502262004' => __DIR__ . '/..' . '/../lib/Migration/Version1016Date202502262004.php',
+        'OCA\\CloudFederationAPI\\Migration\\Version1018Date20260202110547' => __DIR__ . '/..' . '/../lib/Migration/Version1018Date20260202110547.php',
         'OCA\\CloudFederationAPI\\ResponseDefinitions' => __DIR__ . '/..' . '/../lib/ResponseDefinitions.php',
     );
 

apps/cloud_federation_api/lib/AppInfo/Application.php

@@ -8,7 +8,6 @@
  */
 namespace OCA\CloudFederationAPI\AppInfo;
 
-use OCA\CloudFederationAPI\Capabilities;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
@@ -22,7 +21,6 @@ public function __construct() {
 	}
 
 	public function register(IRegistrationContext $context): void {
-		$context->registerCapability(Capabilities::class);
 	}
 
 	public function boot(IBootContext $context): void {

apps/cloud_federation_api/lib/Controller/RequestHandlerController.php

@@ -9,20 +9,16 @@
 
 use OC\OCM\OCMSignatoryManager;
 use OCA\CloudFederationAPI\Config;
-use OCA\CloudFederationAPI\Db\FederatedInviteMapper;
-use OCA\CloudFederationAPI\Events\FederatedInviteAcceptedEvent;
 use OCA\CloudFederationAPI\ResponseDefinitions;
 use OCA\FederatedFileSharing\AddressHandler;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\BruteForceProtection;
 use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\Attribute\OpenAPI;
 use OCP\AppFramework\Http\Attribute\PublicPage;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Federation\Exceptions\ActionNotSupportedException;
 use OCP\Federation\Exceptions\AuthenticationFailedException;
 use OCP\Federation\Exceptions\BadRequestException;
@@ -67,8 +63,6 @@ public function __construct(
 		private IURLGenerator $urlGenerator,
 		private ICloudFederationProviderManager $cloudFederationProviderManager,
 		private Config $config,
-		private IEventDispatcher $dispatcher,
-		private FederatedInviteMapper $federatedInviteMapper,
 		private readonly AddressHandler $addressHandler,
 		private readonly IAppConfig $appConfig,
 		private ICloudFederationFactory $factory,
@@ -225,101 +219,6 @@ public function addShare($shareWith, $name, $description, $providerId, $owner, $
 		return new JSONResponse($responseData, Http::STATUS_CREATED);
 	}
 
-	/**
-	 * Inform the sender that an invitation was accepted to start sharing
-	 *
-	 * Inform about an accepted invitation so the user on the sender provider's side
-	 * can initiate the OCM share creation. To protect the identity of the parties,
-	 * for shares created following an OCM invitation, the user id MAY be hashed,
-	 * and recipients implementing the OCM invitation workflow MAY refuse to process
-	 * shares coming from unknown parties.
-	 * @link https://cs3org.github.io/OCM-API/docs.html?branch=v1.1.0&repo=OCM-API&user=cs3org#/paths/~1invite-accepted/post
-	 *
-	 * @param string $recipientProvider The address of the recipent's provider
-	 * @param string $token The token used for the invitation
-	 * @param string $userID The userID of the recipient at the recipient's provider
-	 * @param string $email The email address of the recipient
-	 * @param string $name The display name of the recipient
-	 *
-	 * @return JSONResponse<Http::STATUS_OK, array{userID: string, email: string, name: string}, array{}>|JSONResponse<Http::STATUS_FORBIDDEN|Http::STATUS_BAD_REQUEST|Http::STATUS_CONFLICT, array{message: string, error: true}, array{}>
-	 *
-	 * Note: Not implementing 404 Invitation token does not exist, instead using 400
-	 * 200: Invitation accepted
-	 * 400: Invalid token
-	 * 403: Invitation token does not exist
-	 * 409: User is already known by the OCM provider
-	 */
-	#[PublicPage]
-	#[NoCSRFRequired]
-	#[BruteForceProtection(action: 'inviteAccepted')]
-	public function inviteAccepted(string $recipientProvider, string $token, string $userID, string $email, string $name): JSONResponse {
-		$this->logger->debug('Processing share invitation for ' . $userID . ' with token ' . $token . ' and email ' . $email . ' and name ' . $name);
-
-		$updated = $this->timeFactory->getTime();
-
-		if ($token === '') {
-			$response = new JSONResponse(['message' => 'Invalid or non existing token', 'error' => true], Http::STATUS_BAD_REQUEST);
-			$response->throttle();
-			return $response;
-		}
-
-		try {
-			$invitation = $this->federatedInviteMapper->findByToken($token);
-		} catch (DoesNotExistException) {
-			$response = ['message' => 'Invalid or non existing token', 'error' => true];
-			$status = Http::STATUS_BAD_REQUEST;
-			$response = new JSONResponse($response, $status);
-			$response->throttle();
-			return $response;
-		}
-
-		if ($invitation->isAccepted() === true) {
-			$response = ['message' => 'Invite already accepted', 'error' => true];
-			$status = Http::STATUS_CONFLICT;
-			return new JSONResponse($response, $status);
-		}
-
-		if ($invitation->getExpiredAt() !== null && $updated > $invitation->getExpiredAt()) {
-			$response = ['message' => 'Invitation expired', 'error' => true];
-			$status = Http::STATUS_BAD_REQUEST;
-			return new JSONResponse($response, $status);
-		}
-		$localUser = $this->userManager->get($invitation->getUserId());
-		if ($localUser === null) {
-			$response = ['message' => 'Invalid or non existing token', 'error' => true];
-			$status = Http::STATUS_BAD_REQUEST;
-			$response = new JSONResponse($response, $status);
-			$response->throttle();
-			return $response;
-		}
-
-		$sharedFromEmail = $localUser->getEMailAddress();
-		if ($sharedFromEmail === null) {
-			$response = ['message' => 'Invalid or non existing token', 'error' => true];
-			$status = Http::STATUS_BAD_REQUEST;
-			$response = new JSONResponse($response, $status);
-			$response->throttle();
-			return $response;
-		}
-		$sharedFromDisplayName = $localUser->getDisplayName();
-
-		$response = ['userID' => $localUser->getUID(), 'email' => $sharedFromEmail, 'name' => $sharedFromDisplayName];
-		$status = Http::STATUS_OK;
-
-		$invitation->setAccepted(true);
-		$invitation->setRecipientEmail($email);
-		$invitation->setRecipientName($name);
-		$invitation->setRecipientProvider($recipientProvider);
-		$invitation->setRecipientUserId($userID);
-		$invitation->setAcceptedAt($updated);
-		$invitation = $this->federatedInviteMapper->update($invitation);
-
-		$event = new FederatedInviteAcceptedEvent($invitation);
-		$this->dispatcher->dispatchTyped($event);
-
-		return new JSONResponse($response, $status);
-	}
-
 	/**
 	 * Send a notification about an existing share
 	 *

apps/cloud_federation_api/lib/Db/FederatedInvite.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\CloudFederationAPI\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\Attributes\DropTable;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+use Override;
+
+#[DropTable(table: 'federated_invites', columns: ['id', 'user_id', 'recipient_provider', 'recipient_user_id', 'recipient_name', 'recipient_email', 'token', 'accepted', 'created_at', 'expired_at', 'accepted_at'], description: 'Table is moved out of this app.')]
+class Version1018Date20260202110547 extends SimpleMigrationStep {
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 */
+	#[Override]
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+		$table_name = 'federated_invites';
+
+		if ($schema->hasTable($table_name)) {
+			$schema->dropTable($table_name);
+			return $schema;
+		}
+		return null;
+	}
+}