fix: backwards compatibility for shares from instances before upgrading

Signed-off-by: Enrique Pérez Arnaud <enrique@cazalla.net>

Author: enriquepablo

apps/cloud_federation_api/lib/Controller/RequestHandlerController.php

@@ -175,6 +175,7 @@ public function addShare($shareWith, $name, $description, $providerId, $owner, $
 		}
 
 		$cloudId = $this->cloudIdManager->resolveCloudId($shareWith);
+		$shareWithCloudId = $shareWith; // preserve full cloud ID for factory capability discovery
 		$shareWith = $cloudId->getUser();
 
 		if ($shareType === 'user') {
@@ -219,7 +220,10 @@ public function addShare($shareWith, $name, $description, $providerId, $owner, $
 
 		try {
 			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider($resourceType);
-			$share = $this->factory->getCloudFederationShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, '', $shareType, $resourceType);
+			// Pass the original cloud ID so the factory can discover capabilities without warning.
+			// Then reset shareWith to the local username that shareReceived() needs for user lookup.
+			$share = $this->factory->getCloudFederationShare($shareWithCloudId, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, '', $shareType, $resourceType);
+			$share->setShareWith($shareWith);
 			$share->setProtocol($protocol);
 			$provider->shareReceived($share);
 		} catch (ProviderDoesNotExistsException|ProviderCouldNotAddShareException $e) {

apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php

@@ -182,7 +182,7 @@ public function shareReceived(ICloudFederationShare $share): string {
 			$externalShare->setRemote($remote);
 			$externalShare->setRemoteId($remoteId);
 			$externalShare->setShareToken($token);  // refresh token (sharedSecret)
-			$externalShare->setPassword($accessToken);  // access token (empty if no token exchange)
+			$externalShare->setAccessToken($accessToken ?: null);
 			$externalShare->setName($name);
 			$externalShare->setOwner($owner);
 			$externalShare->setShareType($shareType);

apps/files_sharing/lib/External/MountProvider.php

@@ -59,7 +59,7 @@ private function getMount(IUser $user, array $data, IStorageFactory $storageFact
 
 	public function getMountsForUser(IUser $user, IStorageFactory $loader): array {
 		$qb = $this->connection->getQueryBuilder();
-		$qb->select('id', 'remote', 'share_token', 'password', 'mountpoint', 'owner')
+		$qb->select('id', 'remote', 'share_token', 'password', 'access_token', 'access_token_expires', 'mountpoint', 'owner')
 			->from('share_external')
 			->where($qb->expr()->eq('user', $qb->createNamedParameter($user->getUID())))
 			->andWhere($qb->expr()->eq('accepted', $qb->createNamedParameter(IShare::STATUS_ACCEPTED, IQueryBuilder::PARAM_INT)));
@@ -99,7 +99,7 @@ public function getMountsForPath(
 		}
 
 		$qb = $this->connection->getQueryBuilder();
-		$qb->select('id', 'remote', 'share_token', 'password', 'mountpoint', 'owner')
+		$qb->select('id', 'remote', 'share_token', 'password', 'access_token', 'access_token_expires', 'mountpoint', 'owner')
 			->from('share_external')
 			->where($qb->expr()->eq('user', $qb->createNamedParameter($user->getUID())))
 			->andWhere($qb->expr()->eq('accepted', $qb->createNamedParameter(IShare::STATUS_ACCEPTED, IQueryBuilder::PARAM_INT)));

apps/files_sharing/lib/External/Storage.php

@@ -83,19 +83,16 @@ public function __construct($options) {
 			$webDavEndpoint = $ocmProvider->extractProtocolEntry('file', 'webdav');
 			$remote = $ocmProvider->getEndPoint();
 			$authType = \Sabre\DAV\Client::AUTH_BASIC;
-			$capabilities = $ocmProvider->getCapabilities();
-			if (in_array('exchange-token', $capabilities)) {
-				$authType = \OC\Files\Storage\BearerAuthAwareSabreClient::AUTH_BEARER;
-			}
 		} catch (OCMProviderException|OCMArgumentException $e) {
 			$this->logger->notice('exception while retrieving webdav endpoint', ['exception' => $e]);
 			$webDavEndpoint = '/public.php/webdav';
 			$remote = $this->cloudId->getRemote();
 			$authType = \Sabre\DAV\Client::AUTH_BASIC;
 		}
 
-		// If we have a stored access token, use Bearer auth regardless of discovery.
-		// This handles the case where the share was created with must-exchange-token.
+		// Only use Bearer auth when an access token is already stored.
+		// Shares created before the exchange-token capability was introduced have no
+		// stored token and must keep using basic auth for backwards compatibility.
 		if (!empty($options['access_token'])) {
 			$authType = \OC\Files\Storage\BearerAuthAwareSabreClient::AUTH_BEARER;
 		}