Merge pull request #2786 from nextcloud/feat/federated-sharing

feat(federation): Federated table sharing

Author: blizzz

appinfo/routes.php

@@ -161,8 +161,6 @@
 		['name' => 'Context#transfer', 'url' => '/api/2/contexts/{contextId}/transfer', 'verb' => 'PUT'],
 		['name' => 'Context#updateContentOrder', 'url' => '/api/2/contexts/{contextId}/pages/{pageId}', 'verb' => 'PUT'],
 
-		['name' => 'RowOCS#createRow',	'url' => '/api/2/{nodeCollection}/{nodeId}/rows', 'verb' => 'POST', 'requirements' => ['nodeCollection' => '(tables|views)', 'nodeId' => '(\d+)']],
-
 		['name' => 'Config#getTableConfig', 'url' => '/api/2/config/table/{id}', 'verb' => 'GET'],
 		['name' => 'Config#getViewConfig', 'url' => '/api/2/config/view/{id}', 'verb' => 'GET'],
 		['name' => 'Config#setValue', 'url' => '/api/2/config/{key}', 'verb' => 'POST'],

cypress.config.mjs

@@ -7,7 +7,7 @@ import vitePreprocessor from 'cypress-vite'
 import { nodePolyfills } from 'vite-plugin-node-polyfills'
 import vue from '@vitejs/plugin-vue'
 
-const baseUrl = process.env.CYPRESS_baseUrl ?? 'http://127.0.0.1:8089/index.php/'
+const baseUrl = process.env.CYPRESS_baseUrl ?? 'https://nextcloud.local/index.php/'
 
 export default defineConfig({
 	allowCypressEnv: false,

cypress/component/ContentReferenceWidget.cy.js

@@ -81,10 +81,12 @@ describe('ContentReferenceWidget', () => {
 		// Load a fixture which is used to reply to the edit row request
 		cy.fixture('widgets/editRow.json')
 			.then((rowData) => {
-				cy.reply('**/index.php/apps/tables/row/*', rowData)
+				cy.reply('**/ocs/v2.php/apps/tables/api/2/**/rows/*', rowData)
 
 				const updatedRows = richObject.rows.map(row => row.id === rowData.id ? rowData : row)
-				cy.reply('**/apps/tables/row/table/*', updatedRows)
+				cy.intercept('GET', '**/apps/tables/row/table/*', (req) => {
+					req.reply({ delay: 1000, body: updatedRows })
+				})
 			})
 
 		// Open the row action menu on the first row, then click Edit

cypress/e2e/view-filtering-selection-row-removal.cy.js

@@ -21,7 +21,7 @@ describe('Filtering view with row removal', () => {
 	})
 
 	it('Removes rows from the filtered view once they no longer match', () => {
-		cy.intercept({ method: 'PUT', url: '**/apps/tables/row/*' }).as('updateCheckedRow')
+		cy.intercept({ method: 'PUT', url: '**/ocs/v2.php/apps/tables/api/2/**' }).as('updateCheckedRow')
 		cy.contains('[data-cy="ncTable"] [data-cy="customTableRow"]', 'first row').closest('[data-cy="customTableRow"]').find('[data-cy="rowActionMenu"] button').click()
 		cy.get('[data-cy="editRowBtn"]').click()
 		cy.get('[data-cy="editRowModal"] .checkbox-radio-switch').click()
@@ -31,7 +31,7 @@ describe('Filtering view with row removal', () => {
 		cy.contains('[data-cy="ncTable"] [data-cy="customTableRow"]', 'first row', { timeout: 8000 }).should('not.exist')
 		cy.get('[data-cy="editRowModal"]').should('not.exist')
 
-		cy.intercept({ method: 'PUT', url: '**/apps/tables/row/*' }).as('inlineUpdateRow')
+		cy.intercept({ method: 'PUT', url: '**/ocs/v2.php/apps/tables/api/2/**' }).as('inlineUpdateRow')
 		cy.contains('[data-cy="ncTable"] [data-cy="customTableRow"]', 'second row').closest('[data-cy="customTableRow"]').find('.inline-editing-container input').click({ force: true })
 		cy.wait('@inlineUpdateRow')
 		// Wait for the row to be removed from the filtered view (async removal)

cypress/fixtures/widgets/editRow.json

@@ -1,46 +1,55 @@
 {
-    "id": 226,
-    "tableId": 49,
-    "createdBy": null,
-    "createdAt": null,
-    "lastEditBy": null,
-    "lastEditAt": null,
-    "data": [
-        {
-            "columnId": 159,
-            "value": "Giraffe"
-        },
-        {
-            "columnId": 160,
-            "value": "Mr. Smith"
-        },
-        {
-            "columnId": 161,
-            "value": "Dog food every week"
-        },
-        {
-            "columnId": 162,
-            "value": "2023-01-01"
-        },
-        {
-            "columnId": 163,
-            "value": "2023-12-31"
-        },
-        {
-            "columnId": 164,
-            "value": "The dog is our best friend."
-        },
-        {
-            "columnId": 165,
-            "value": "Standard, SLA Level 2"
-        },
-        {
-            "columnId": 166,
-            "value": 80
-        },
-        {
-            "columnId": 167,
-            "value": "Likes treats"
+    "ocs": {
+        "meta": {
+            "status": "ok",
+            "statuscode": 200,
+            "message": "OK"
+        },
+        "data": {
+            "id": 226,
+            "tableId": 49,
+            "createdBy": null,
+            "createdAt": null,
+            "lastEditBy": null,
+            "lastEditAt": null,
+            "data": [
+                {
+                    "columnId": 159,
+                    "value": "Giraffe"
+                },
+                {
+                    "columnId": 160,
+                    "value": "Mr. Smith"
+                },
+                {
+                    "columnId": 161,
+                    "value": "Dog food every week"
+                },
+                {
+                    "columnId": 162,
+                    "value": "2023-01-01"
+                },
+                {
+                    "columnId": 163,
+                    "value": "2023-12-31"
+                },
+                {
+                    "columnId": 164,
+                    "value": "The dog is our best friend."
+                },
+                {
+                    "columnId": 165,
+                    "value": "Standard, SLA Level 2"
+                },
+                {
+                    "columnId": 166,
+                    "value": 80
+                },
+                {
+                    "columnId": 167,
+                    "value": "Likes treats"
+                }
+            ]
         }
-    ]
+    }
 }

lib/AppInfo/Application.php

@@ -8,18 +8,22 @@
 namespace OCA\Tables\AppInfo;
 
 use Exception;
+use OC\OCM\OCMSignatoryManager;
 use OCA\Analytics\Datasource\DatasourceEvent;
 use OCA\Circles\Events\CircleDestroyedEvent;
 use OCA\Tables\Capabilities;
+use OCA\Tables\Config\ConfigLexicon;
 use OCA\Tables\Event\RowDeletedEvent;
 use OCA\Tables\Event\TableDeletedEvent;
 use OCA\Tables\Event\TableOwnershipTransferredEvent;
 use OCA\Tables\Event\ViewDeletedEvent;
+use OCA\Tables\Federation\FederationProvider;
 use OCA\Tables\Listener\AddMissingIndicesListener;
 use OCA\Tables\Listener\AnalyticsDatasourceListener;
 use OCA\Tables\Listener\LoadAdditionalEntriesListener;
 use OCA\Tables\Listener\LoadAdditionalListener;
 use OCA\Tables\Listener\ReceiverCleanupListener;
+use OCA\Tables\Listener\ResourceTypeRegisterListener;
 use OCA\Tables\Listener\TablesReferenceListener;
 use OCA\Tables\Listener\UserDeletedListener;
 use OCA\Tables\Listener\WhenRowDeletedAuditLogListener;
@@ -43,8 +47,13 @@
 use OCP\Collaboration\Reference\RenderReferenceEvent;
 use OCP\Collaboration\Resources\LoadAdditionalScriptsEvent;
 use OCP\DB\Events\AddMissingIndicesEvent;
+use OCP\Federation\ICloudFederationProvider;
+use OCP\Federation\ICloudFederationProviderManager;
 use OCP\Group\Events\GroupDeletedEvent;
 use OCP\Navigation\Events\LoadAdditionalEntriesEvent;
+use OCP\OCM\Events\LocalOCMDiscoveryEvent;
+use OCP\Security\Signature\ISignatoryManager;
+use OCP\Server;
 use OCP\Share\ShareReview\RegisterShareReviewSourceEvent;
 use OCP\User\Events\BeforeUserDeletedEvent;
 use OCP\User\Events\UserDeletedEvent;
@@ -83,6 +92,7 @@ public function register(IRegistrationContext $context): void {
 		}
 
 		$context->registerService(AuditLogServiceInterface::class, fn (ContainerInterface $c) => $c->get(DefaultAuditLogService::class));
+		$context->registerService(ISignatoryManager::class, fn (ContainerInterface $c) => $c->get(OCMSignatoryManager::class));
 
 		$context->registerEventListener(BeforeUserDeletedEvent::class, UserDeletedListener::class);
 		$context->registerEventListener(DatasourceEvent::class, AnalyticsDatasourceListener::class);
@@ -98,6 +108,7 @@ public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(UserDeletedEvent::class, ReceiverCleanupListener::class);
 		$context->registerEventListener(GroupDeletedEvent::class, ReceiverCleanupListener::class);
 		$context->registerEventListener(CircleDestroyedEvent::class, ReceiverCleanupListener::class);
+		$context->registerEventListener(LocalOCMDiscoveryEvent::class, ResourceTypeRegisterListener::class);
 
 		$context->registerSearchProvider(SearchTablesProvider::class);
 
@@ -112,8 +123,19 @@ public function register(IRegistrationContext $context): void {
 		$context->registerMiddleware(ShareControlMiddleware::class);
 
 		$context->registerUserMigrator(TablesMigrator::class);
+
+		$context->registerConfigLexicon(ConfigLexicon::class);
 	}
 
 	public function boot(IBootContext $context): void {
+		$context->injectFn([$this, 'registerCloudFederationProviderManager']);
+	}
+
+	public function registerCloudFederationProviderManager(ICloudFederationProviderManager $manager): void {
+		$manager->addCloudFederationProvider(
+			FederationProvider::PROVIDER_ID,
+			'Tables Federation',
+			static fn (): ICloudFederationProvider => Server::get(FederationProvider::class),
+		);
 	}
 }

lib/Config/ConfigLexicon.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Tables\Config;
+
+use OCP\Config\Lexicon\Entry;
+use OCP\Config\Lexicon\ILexicon;
+use OCP\Config\Lexicon\Strictness;
+use OCP\Config\ValueType;
+
+/**
+ * Config Lexicon for tables.
+ *
+ * Please Add & Manage your Config Keys in that file and keep the Lexicon up to date!
+ *
+ * {@see ILexicon}
+ */
+class ConfigLexicon implements ILexicon {
+	public const FEDERATION_ENABLED = 'federationEnabled';
+
+	#[\Override]
+	public function getStrictness(): Strictness {
+		return Strictness::IGNORE;
+	}
+
+	#[\Override]
+	public function getAppConfigs(): array {
+		return [
+			new Entry(self::FEDERATION_ENABLED, ValueType::BOOL, true, 'Enable or disable federated table sharing'),
+		];
+	}
+
+	#[\Override]
+	public function getUserConfigs(): array {
+		return [];
+	}
+}

lib/Constants/ShareReceiverType.php

@@ -15,4 +15,5 @@ class ShareReceiverType {
 	public const GROUP = 'group';
 	public const CIRCLE = 'circle';
 	public const LINK = 'link';
+	public const REMOTE = 'remote';
 }

lib/Controller/Api1Controller.php

@@ -24,6 +24,7 @@
 use OCA\Tables\Model\ViewUpdateInput;
 use OCA\Tables\ResponseDefinitions;
 use OCA\Tables\Service\ColumnService;
+use OCA\Tables\Service\FederationService;
 use OCA\Tables\Service\ImportService;
 use OCA\Tables\Service\RelationService;
 use OCA\Tables\Service\RowService;
@@ -88,6 +89,7 @@ public function __construct(
 		LoggerInterface $logger,
 		IL10N $l10N,
 		?string $userId,
+		private FederationService $federationService,
 	) {
 		parent::__construct(Application::APP_ID, $request);
 		$this->tableService = $service;
@@ -781,6 +783,11 @@ public function updateShareDisplayMode(int $shareId, int $displayMode, string $t
 	#[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
 	public function indexTableColumns(int $tableId, ?int $viewId): DataResponse {
 		try {
+			if ($this->federationService->isNodeFederated($tableId, 'table')) {
+				$table = $this->tableService->find($tableId, true);
+				return new DataResponse($this->federationService->getColumns($table));
+			}
+
 			if ($viewId) {
 				$view = $this->viewService->find($viewId, false, $this->userId);
 				if ($tableId !== $view->getTableId()) {
@@ -824,6 +831,11 @@ public function indexTableColumns(int $tableId, ?int $viewId): DataResponse {
 	#[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
 	public function indexViewColumns(int $viewId): DataResponse {
 		try {
+			if ($this->federationService->isNodeFederated($viewId, 'view')) {
+				$view = $this->viewService->find($viewId, true);
+				return new DataResponse($this->federationService->getColumns($view));
+			}
+
 			return new DataResponse($this->columnService->formatColumns($this->columnService->findAllByView($viewId)));
 		} catch (PermissionError $e) {
 			$this->logger->warning('A permission error occurred: ' . $e->getMessage(), ['exception' => $e]);

lib/Controller/RowController.php

@@ -9,7 +9,10 @@
 
 use OCA\Tables\AppInfo\Application;
 use OCA\Tables\Middleware\Attribute\RequirePermission;
+use OCA\Tables\Service\FederationService;
 use OCA\Tables\Service\RowService;
+use OCA\Tables\Service\TableService;
+use OCA\Tables\Service\ViewService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\DataResponse;
@@ -24,6 +27,9 @@ public function __construct(
 		protected LoggerInterface $logger,
 		private RowService $service,
 		private ?string $userId,
+		private TableService $tableService,
+		private ViewService $viewService,
+		private FederationService $federationService,
 	) {
 		parent::__construct(Application::APP_ID, $request);
 	}
@@ -32,6 +38,10 @@ public function __construct(
 	#[RequirePermission(permission: Application::PERMISSION_READ, type: Application::NODE_TYPE_TABLE, idParam: 'tableId')]
 	public function index(int $tableId): DataResponse {
 		return $this->handleError(function () use ($tableId) {
+			if ($this->federationService->isNodeFederated($tableId, 'table')) {
+				$table = $this->tableService->find($tableId, true);
+				return $this->federationService->getRows($table);
+			}
 			return $this->service->findAllByTable($tableId, $this->userId);
 		});
 	}
@@ -40,6 +50,10 @@ public function index(int $tableId): DataResponse {
 	#[RequirePermission(permission: Application::PERMISSION_READ, type: Application::NODE_TYPE_VIEW, idParam: 'viewId')]
 	public function indexView(int $viewId): DataResponse {
 		return $this->handleError(function () use ($viewId) {
+			if ($this->federationService->isNodeFederated($viewId, 'view')) {
+				$view = $this->viewService->find($viewId, false, $this->userId);
+				return $this->federationService->getRows($view);
+			}
 			return $this->service->findAllByView($viewId, $this->userId);
 		});
 	}
@@ -99,6 +113,9 @@ public function destroyByView(int $id, int $viewId): DataResponse {
 	#[NoAdminRequired]
 	public function presentInView(int $id, int $viewId): DataResponse {
 		return $this->handleError(function () use ($id, $viewId) {
+			if ($this->federationService->isNodeFederated($viewId, 'view')) {
+				return ['present' => true];
+			}
 			$present = $this->service->isRowInViewPresent($id, $viewId, $this->userId);
 			return ['present' => $present];
 		});