fix: store legacy id mapping when creating a legacy share from unified share

Signed-off-by: Robin Appelman <robin@icewind.nl>

Author: icewind1991

apps/files_sharing/lib/Sharing/LegacyBackend.php

@@ -162,6 +162,9 @@ public function updateShare(Share $share): void {
 
 				if ($create) {
 					$legacyShare = $this->legacyManager->createShare($legacyShare);
+
+					$this->addLegacyFullId($share->id, $legacyShare->getProviderId(), $legacyShare->getId());
+
 					// No need to insert the legacy full id, because the listener in the SharingManager will already trigger this process.
 					$legacyShares[$legacyShare->getFullId()] = $legacyShare;
 				} elseif ($update) {
@@ -463,11 +466,11 @@ public function getShareByLegacyProviderAndId(string $legacyProvider, string $le
 
 	#[\Override]
 	public function getUnmappedShares(IUser $user): array {
-		// TODO: Make it work with all providers
+		// TODO: Make it work with all providers (deck, talk)
 		// TODO: Filter by user
 		$qb = $this->connection->getQueryBuilder();
 		$result = $qb
-			->select('s.id')
+			->select('s.id', 's.share_type')
 			->from('share', 's')
 			->leftJoin('s', 'share_legacy_mapping', 'l', $qb->expr()->eq('s.id', 'l.legacy_id'))
 			->where($qb->expr()->isNull('l.legacy_id'))
@@ -482,16 +485,16 @@ public function getUnmappedShares(IUser $user): array {
 			], IQueryBuilder::PARAM_INT_ARRAY)))
 			->executeQuery();
 
-		/** @var list<int> $legacyIds */
-		$legacyIds = $result->fetchFirstColumn();
-		if ($legacyIds === []) {
+		/** @var list<array{id: string|int, share_type: IShare::TYPE_*}> $rows */
+		$rows = $result->fetchAll();
+		if ($rows === []) {
 			return [];
 		}
 
 		$ids = [];
-		foreach ($legacyIds as $legacyId) {
+		foreach ($rows as $row) {
 			$id = $this->snowflakeGenerator->nextId();
-			$this->addLegacyFullId($id, 'ocinternal', (string)$legacyId);
+			$this->addLegacyFullId($id, $this->legacyShareTypeToLegacyProvider($row['share_type']), (string)$row['id']);
 			$ids[] = $id;
 		}
 
@@ -581,6 +584,22 @@ private function addLegacyFullId(string $id, string $legacyProvider, string $leg
 			->executeStatement();
 	}
 
+	/**
+	 * @param IShare::TYPE_* $legacyShareType
+	 * @return non-empty-string
+	 */
+	private function legacyShareTypeToLegacyProvider(int $legacyShareType): string {
+		return match ($legacyShareType) {
+			IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_LINK => 'ocinternal',
+			IShare::TYPE_REMOTE, IShare::TYPE_REMOTE_GROUP => 'ocFederatedSharing',
+			IShare::TYPE_EMAIL => 'ocMailShare',
+			IShare::TYPE_CIRCLE => 'ocCircleShare',
+			IShare::TYPE_ROOM => 'ocRoomShare',
+			IShare::TYPE_DECK => 'deck',
+			default => throw new RuntimeException('Unsupported legacy share type: ' . $legacyShareType),
+		};
+	}
+
 	/**
 	 * @param IShare::TYPE_* $legacyShareType
 	 * @return class-string<IShareRecipientType>
@@ -592,6 +611,7 @@ private function legacyShareTypeToRecipientTypeClass(int $legacyShareType): stri
 			IShare::TYPE_LINK => TokenShareRecipientType::class,
 			IShare::TYPE_EMAIL => EmailShareRecipientType::class,
 			IShare::TYPE_CIRCLE => TeamShareRecipientType::class,
+			// TODO talk, deck
 			default => throw new RuntimeException('Unsupported legacy share type: ' . $legacyShareType),
 		};
 	}
@@ -607,6 +627,7 @@ private function recipientTypeClassToLegacyShareType(string $recipientTypeClass,
 			TokenShareRecipientType::class => IShare::TYPE_LINK,
 			EmailShareRecipientType::class => IShare::TYPE_EMAIL,
 			TeamShareRecipientType::class => IShare::TYPE_CIRCLE,
+			// TODO talk, deck
 			default => throw new RuntimeException('Unsupported recipient type: ' . $recipientTypeClass),
 		};
 	}

apps/files_sharing/tests/Sharing/LegacyBackendTest.php

@@ -434,7 +434,7 @@ public function testUpdateShare(): void {
 					'password' => null,
 					'password_expiration_time' => null,
 					'send_password_by_talk' => false,
-					'token' => 'secret',
+					'token' => 'token secret',
 					'parent' => null,
 					'original_target' => null,
 					'target' => '/foo',
@@ -463,7 +463,7 @@ public function testUpdateShare(): void {
 					'password' => null,
 					'password_expiration_time' => null,
 					'send_password_by_talk' => false,
-					'token' => 'secret',
+					'token' => 'token secret',
 					'parent' => null,
 					'original_target' => null,
 					'target' => '/foo.txt',
@@ -492,7 +492,7 @@ public function testUpdateShare(): void {
 					'password' => null,
 					'password_expiration_time' => null,
 					'send_password_by_talk' => false,
-					'token' => 'secret',
+					'token' => 'email secret',
 					'parent' => null,
 					'original_target' => null,
 					'target' => null,
@@ -521,7 +521,7 @@ public function testUpdateShare(): void {
 					'password' => null,
 					'password_expiration_time' => null,
 					'send_password_by_talk' => false,
-					'token' => 'secret',
+					'token' => 'email secret',
 					'parent' => null,
 					'original_target' => null,
 					'target' => null,
@@ -660,12 +660,12 @@ private function formatLegacyShare(IShare $legacyShare): array {
 	private function getLegacyIds(string $id): array {
 		$qb = $this->dbConnection->getQueryBuilder();
 		$result = $qb
-			->select('legacy_id')
+			->select('legacy_provider', 'legacy_id')
 			->from('share_legacy_mapping')
 			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
 			->executeQuery();
-		/** @var list<string> $ids */
-		$ids = $result->fetchFirstColumn();
-		return $ids;
+		/** @var list<array{legacy_provider: string, legacy_id: string}> $rows */
+		$rows = $result->fetchAll();
+		return array_map(fn (array $row): string => $row['legacy_provider'] . ':' . $row['legacy_id'], $rows);
 	}
 }