Skip to content

Commit 67dc5ef

Browse files
mickenordinArtificialOwl
authored andcommitted
feat(cloud-federation-api): Make duplicate entries
Solve the problem by adding the provider for both files and folders Signed-off-by: Micke Nordin <kano@sunet.se>
1 parent d8b2056 commit 67dc5ef

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

apps/cloud_federation_api/lib/Controller/RequestHandlerController.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,6 @@ public function __construct(
106106
#[NoCSRFRequired]
107107
#[BruteForceProtection(action: 'receiveFederatedShare')]
108108
public function addShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, $protocol, $shareType, $resourceType) {
109-
if ($resourceType === 'folder') {
110-
$resourceType = 'file';
111-
}
112109
try {
113110
// if request is signed and well signed, no exception are thrown
114111
// if request is not signed and host is known for not supporting signed request, no exception are thrown

apps/federatedfilesharing/lib/AppInfo/Application.php

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
/**
4-
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
4+
* SPDX-FileCopyrightText: 2016-2025 Nextcloud GmbH and Nextcloud contributors
55
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
66
* SPDX-License-Identifier: AGPL-3.0-only
77
*/
@@ -35,10 +35,13 @@ public function boot(IBootContext $context): void {
3535

3636
private function registerCloudFederationProvider(ICloudFederationProviderManager $manager,
3737
IAppContainer $appContainer): void {
38-
$manager->addCloudFederationProvider('file',
39-
'Federated Files Sharing',
40-
function () use ($appContainer): CloudFederationProviderFiles {
41-
return $appContainer->get(CloudFederationProviderFiles::class);
42-
});
38+
$fileResourceTypes = ['file', 'folder'];
39+
foreach ($fileResourceTypes as $type) {
40+
$manager->addCloudFederationProvider($type,
41+
'Federated Files Sharing',
42+
function () use ($appContainer): CloudFederationProviderFiles {
43+
return $appContainer->get(CloudFederationProviderFiles::class);
44+
});
45+
}
4346
}
4447
}

0 commit comments

Comments
 (0)