fix(ocm): normalize protocol to support multi with webdav option

- Added functionality to handle both plain webdav and multi protocols
  containing a webdav entry with a sharedSecret.
- Fix a bug where owner could empty because it was set ownerDisplayName

Signed-off-by: Micke Nordin <kano@sunet.se>

Author: mickenordin

apps/cloud_federation_api/lib/Controller/RequestHandlerController.php

@@ -106,6 +106,18 @@ public function __construct(
 	#[NoCSRFRequired]
 	#[BruteForceProtection(action: 'receiveFederatedShare')]
 	public function addShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, $protocol, $shareType, $resourceType) {
+		if ($protocol['name'] === 'multi') {
+			if (isset($protocol['webdav'])) {
+				$webdav = $protocol['webdav'];
+				$protocol = [
+					'name' => 'webdav',
+					'options' => [
+						'sharedSecret' => $webdav['sharedSecret'],
+						'permissions' => '{http://open-cloud-mesh.org/ns}share-permissions',
+					],
+				];
+			}
+		}
 		try {
 			// if request is signed and well signed, no exception are thrown
 			// if request is not signed and host is known for not supporting signed request, no exception are thrown

apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php

@@ -108,7 +108,7 @@ public function shareReceived(ICloudFederationShare $share) {
 
 		$token = $share->getShareSecret();
 		$name = $share->getResourceName();
-		$owner = $share->getOwnerDisplayName();
+		$owner = $share->getOwner();
 		$sharedBy = $share->getSharedByDisplayName();
 		$shareWith = $share->getShareWith();
 		$remoteId = $share->getProviderId();