Fix: Send local webdav url instead of the remote

We are currently mixing up the local and remote webdav urls when sending
a share that uses token exchange, so that needs to be fixed.

Signed-off-by: Micke Nordin <kano@sunet.se>
Co-authored-by: Mahdi Baghbani <mahdi-baghbani@azadehafzar.io>

Author: mickenordin

lib/private/Federation/CloudFederationFactory.php

@@ -11,6 +11,7 @@
 use OCP\Federation\ICloudFederationNotification;
 use OCP\Federation\ICloudFederationShare;
 use OCP\Federation\ICloudIdManager;
+use OCP\IURLGenerator;
 use OCP\OCM\Exceptions\OCMProviderException;
 use OCP\OCM\IOCMDiscoveryService;
 use Psr\Log\LoggerInterface;
@@ -19,6 +20,7 @@ class CloudFederationFactory implements ICloudFederationFactory {
 	public function __construct(
 		private IOCMDiscoveryService $ocmDiscoveryService,
 		private ICloudIdManager $cloudIdManager,
+		private IURLGenerator $urlGenerator,
 		private LoggerInterface $logger,
 	) {
 	}
@@ -72,6 +74,13 @@ public function getCloudFederationShare($shareWith, $name, $description, $provid
 			]);
 		}
 
+		$webDavUri = '';
+		if ($useExchangeToken) {
+			$webDavUri = $this->urlGenerator->getAbsoluteURL(
+				$this->ocmDiscoveryService->getLocalOCMProvider(false)->extractProtocolEntry('file', 'webdav'),
+			);
+		}
+
 		return new CloudFederationShare(
 			$shareWith,
 			$name,
@@ -85,7 +94,7 @@ public function getCloudFederationShare($shareWith, $name, $description, $provid
 			$resourceType,
 			$sharedSecret,
 			$useExchangeToken,
-			$remoteDomain
+			$webDavUri
 		);
 	}
 

lib/private/Federation/CloudFederationShare.php

@@ -42,7 +42,7 @@ class CloudFederationShare implements ICloudFederationShare {
 	 * @param string $resourceType ('file', 'calendar',...)
 	 * @param string $sharedSecret
 	 * @param bool $useExchangeToken whether to use exchange-token protocol (new way) or sharedSecret (old way)
-	 * @param string|null $remoteDomain remote domain for constructing webdav URI
+	 * @param string $webdavUri
 	 */
 	public function __construct($shareWith = '',
 		$name = '',
@@ -56,7 +56,7 @@ public function __construct($shareWith = '',
 		$resourceType = '',
 		$sharedSecret = '',
 		$useExchangeToken = false,
-		$remoteDomain = null,
+		$webdavUri = '',
 	) {
 		$this->setShareWith($shareWith);
 		$this->setResourceName($name);
@@ -68,7 +68,6 @@ public function __construct($shareWith = '',
 		$this->setSharedByDisplayName($sharedByDisplayName);
 
 		if ($useExchangeToken) {
-			$webdavUri = $remoteDomain ? 'https://' . $remoteDomain . '/public.php/webdav/' : '';
 			$this->setProtocol([
 				'name' => 'webdav',
 				'webdav' => [