nextcloud / server

apps/files/lib/Command/TransferOwnership.php

Indentation +116 added lines, -116 removed lines

@@ -26,130 +26,130 @@
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 class TransferOwnership extends Command {
-	public function __construct(
-		private IUserManager $userManager,
-		private OwnershipTransferService $transferService,
-		private IConfig $config,
-		private IMountManager $mountManager,
-	) {
-		parent::__construct();
-	}
+    public function __construct(
+        private IUserManager $userManager,
+        private OwnershipTransferService $transferService,
+        private IConfig $config,
+        private IMountManager $mountManager,
+    ) {
+        parent::__construct();
+    }
 
-	protected function configure(): void {
-		$this
-			->setName('files:transfer-ownership')
-			->setDescription('All files and folders are moved to another user - outgoing shares and incoming user file shares (optionally) are moved as well.')
-			->addArgument(
-				'source-user',
-				InputArgument::REQUIRED,
-				'owner of files which shall be moved'
-			)
-			->addArgument(
-				'destination-user',
-				InputArgument::REQUIRED,
-				'user who will be the new owner of the files'
-			)
-			->addOption(
-				'path',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'selectively provide the path to transfer. For example --path="folder_name"',
-				''
-			)->addOption(
-				'move',
-				null,
-				InputOption::VALUE_NONE,
-				'move data from source user to root directory of destination user, which must be empty'
-			)->addOption(
-				'transfer-incoming-shares',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'Incoming shares are always transferred now, so this option does not affect the ownership transfer anymore',
-				'2'
-			)->addOption(
-				'include-external-storage',
-				null,
-				InputOption::VALUE_NONE,
-				'include files on external storages, this will _not_ setup an external storage for the target user, but instead moves all the files from the external storages into the target users home directory',
-			)->addOption(
-				'force-include-external-storage',
-				null,
-				InputOption::VALUE_NONE,
-				'don\'t ask for confirmation for transferring external storages',
-			)
-			->addOption(
-				'use-user-id',
-				null,
-				InputOption::VALUE_NONE,
-				'use user ID instead of display name in the transferred folder name',
-			);
-	}
+    protected function configure(): void {
+        $this
+            ->setName('files:transfer-ownership')
+            ->setDescription('All files and folders are moved to another user - outgoing shares and incoming user file shares (optionally) are moved as well.')
+            ->addArgument(
+                'source-user',
+                InputArgument::REQUIRED,
+                'owner of files which shall be moved'
+            )
+            ->addArgument(
+                'destination-user',
+                InputArgument::REQUIRED,
+                'user who will be the new owner of the files'
+            )
+            ->addOption(
+                'path',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'selectively provide the path to transfer. For example --path="folder_name"',
+                ''
+            )->addOption(
+                'move',
+                null,
+                InputOption::VALUE_NONE,
+                'move data from source user to root directory of destination user, which must be empty'
+            )->addOption(
+                'transfer-incoming-shares',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Incoming shares are always transferred now, so this option does not affect the ownership transfer anymore',
+                '2'
+            )->addOption(
+                'include-external-storage',
+                null,
+                InputOption::VALUE_NONE,
+                'include files on external storages, this will _not_ setup an external storage for the target user, but instead moves all the files from the external storages into the target users home directory',
+            )->addOption(
+                'force-include-external-storage',
+                null,
+                InputOption::VALUE_NONE,
+                'don\'t ask for confirmation for transferring external storages',
+            )
+            ->addOption(
+                'use-user-id',
+                null,
+                InputOption::VALUE_NONE,
+                'use user ID instead of display name in the transferred folder name',
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
+    protected function execute(InputInterface $input, OutputInterface $output): int {
 
-		/**
-		 * Check if source and destination users are same. If they are same then just ignore the transfer.
-		 */
+        /**
+         * Check if source and destination users are same. If they are same then just ignore the transfer.
+         */
 
-		if ($input->getArgument(('source-user')) === $input->getArgument('destination-user')) {
-			$output->writeln("<error>Ownership can't be transferred when Source and Destination users are the same user. Please check your input.</error>");
-			return self::FAILURE;
-		}
+        if ($input->getArgument(('source-user')) === $input->getArgument('destination-user')) {
+            $output->writeln("<error>Ownership can't be transferred when Source and Destination users are the same user. Please check your input.</error>");
+            return self::FAILURE;
+        }
 
-		$sourceUserObject = $this->userManager->get($input->getArgument('source-user'));
-		$destinationUserObject = $this->userManager->get($input->getArgument('destination-user'));
+        $sourceUserObject = $this->userManager->get($input->getArgument('source-user'));
+        $destinationUserObject = $this->userManager->get($input->getArgument('destination-user'));
 
-		if (!$sourceUserObject instanceof IUser) {
-			$output->writeln('<error>Unknown source user ' . $input->getArgument('source-user') . '</error>');
-			return self::FAILURE;
-		}
+        if (!$sourceUserObject instanceof IUser) {
+            $output->writeln('<error>Unknown source user ' . $input->getArgument('source-user') . '</error>');
+            return self::FAILURE;
+        }
 
-		if (!$destinationUserObject instanceof IUser) {
-			$output->writeln('<error>Unknown destination user ' . $input->getArgument('destination-user') . '</error>');
-			return self::FAILURE;
-		}
+        if (!$destinationUserObject instanceof IUser) {
+            $output->writeln('<error>Unknown destination user ' . $input->getArgument('destination-user') . '</error>');
+            return self::FAILURE;
+        }
 
-		$path = ltrim($input->getOption('path'), '/');
-		$includeExternalStorage = $input->getOption('include-external-storage');
-		if ($includeExternalStorage) {
-			$mounts = $this->mountManager->findIn('/' . rtrim($sourceUserObject->getUID() . '/files/' . $path, '/'));
-			/** @var IMountPoint[] $mounts */
-			$mounts = array_filter($mounts, fn ($mount) => $mount->getMountProvider() === ConfigAdapter::class);
-			if (count($mounts) > 0) {
-				$output->writeln(count($mounts) . ' external storages will be transferred:');
-				foreach ($mounts as $mount) {
-					$output->writeln('  - <info>' . $mount->getMountPoint() . '</info>');
-				}
-				$output->writeln('');
-				$output->writeln('<comment>Any other users with access to these external storages will lose access to the files.</comment>');
-				$output->writeln('');
-				if (!$input->getOption('force-include-external-storage')) {
-					/** @var QuestionHelper $helper */
-					$helper = $this->getHelper('question');
-					$question = new ConfirmationQuestion('Are you sure you want to transfer external storages? (y/N) ', false);
-					if (!$helper->ask($input, $output, $question)) {
-						return self::FAILURE;
-					}
-				}
-			}
-		}
+        $path = ltrim($input->getOption('path'), '/');
+        $includeExternalStorage = $input->getOption('include-external-storage');
+        if ($includeExternalStorage) {
+            $mounts = $this->mountManager->findIn('/' . rtrim($sourceUserObject->getUID() . '/files/' . $path, '/'));
+            /** @var IMountPoint[] $mounts */
+            $mounts = array_filter($mounts, fn ($mount) => $mount->getMountProvider() === ConfigAdapter::class);
+            if (count($mounts) > 0) {
+                $output->writeln(count($mounts) . ' external storages will be transferred:');
+                foreach ($mounts as $mount) {
+                    $output->writeln('  - <info>' . $mount->getMountPoint() . '</info>');
+                }
+                $output->writeln('');
+                $output->writeln('<comment>Any other users with access to these external storages will lose access to the files.</comment>');
+                $output->writeln('');
+                if (!$input->getOption('force-include-external-storage')) {
+                    /** @var QuestionHelper $helper */
+                    $helper = $this->getHelper('question');
+                    $question = new ConfirmationQuestion('Are you sure you want to transfer external storages? (y/N) ', false);
+                    if (!$helper->ask($input, $output, $question)) {
+                        return self::FAILURE;
+                    }
+                }
+            }
+        }
 
-		try {
-			$this->transferService->transfer(
-				$sourceUserObject,
-				$destinationUserObject,
-				$path,
-				$output,
-				$input->getOption('move') === true,
-				false,
-				$includeExternalStorage,
-				$input->getOption('use-user-id') === true,
-			);
-		} catch (TransferOwnershipException $e) {
-			$output->writeln('<error>' . $e->getMessage() . '</error>');
-			return $e->getCode() !== 0 ? $e->getCode() : self::FAILURE;
-		}
+        try {
+            $this->transferService->transfer(
+                $sourceUserObject,
+                $destinationUserObject,
+                $path,
+                $output,
+                $input->getOption('move') === true,
+                false,
+                $includeExternalStorage,
+                $input->getOption('use-user-id') === true,
+            );
+        } catch (TransferOwnershipException $e) {
+            $output->writeln('<error>' . $e->getMessage() . '</error>');
+            return $e->getCode() !== 0 ? $e->getCode() : self::FAILURE;
+        }
 
-		return self::SUCCESS;
-	}
+        return self::SUCCESS;
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -100,25 +100,25 @@ 
 		$destinationUserObject = $this->userManager->get($input->getArgument('destination-user'));
 
 		if (!$sourceUserObject instanceof IUser) {
-			$output->writeln('<error>Unknown source user ' . $input->getArgument('source-user') . '</error>');
+			$output->writeln('<error>Unknown source user '.$input->getArgument('source-user').'</error>');
 			return self::FAILURE;
 		}
 
 		if (!$destinationUserObject instanceof IUser) {
-			$output->writeln('<error>Unknown destination user ' . $input->getArgument('destination-user') . '</error>');
+			$output->writeln('<error>Unknown destination user '.$input->getArgument('destination-user').'</error>');
 			return self::FAILURE;
 		}
 
 		$path = ltrim($input->getOption('path'), '/');
 		$includeExternalStorage = $input->getOption('include-external-storage');
 		if ($includeExternalStorage) {
-			$mounts = $this->mountManager->findIn('/' . rtrim($sourceUserObject->getUID() . '/files/' . $path, '/'));
+			$mounts = $this->mountManager->findIn('/'.rtrim($sourceUserObject->getUID().'/files/'.$path, '/'));
 			/** @var IMountPoint[] $mounts */
 			$mounts = array_filter($mounts, fn ($mount) => $mount->getMountProvider() === ConfigAdapter::class);
 			if (count($mounts) > 0) {
-				$output->writeln(count($mounts) . ' external storages will be transferred:');
+				$output->writeln(count($mounts).' external storages will be transferred:');
 				foreach ($mounts as $mount) {
-					$output->writeln('  - <info>' . $mount->getMountPoint() . '</info>');
+					$output->writeln('  - <info>'.$mount->getMountPoint().'</info>');
 				}
 				$output->writeln('');
 				$output->writeln('<comment>Any other users with access to these external storages will lose access to the files.</comment>');
@@ -146,7 +146,7 @@ 
 				$input->getOption('use-user-id') === true,
 			);
 		} catch (TransferOwnershipException $e) {
-			$output->writeln('<error>' . $e->getMessage() . '</error>');
+			$output->writeln('<error>'.$e->getMessage().'</error>');
 			return $e->getCode() !== 0 ? $e->getCode() : self::FAILURE;
 		}
 

apps/files/lib/Service/OwnershipTransferService.php

Indentation +586 added lines, -586 removed lines

@@ -44,590 +44,590 @@
 
 class OwnershipTransferService {
 
-	public function __construct(
-		private IEncryptionManager $encryptionManager,
-		private IShareManager $shareManager,
-		private IMountManager $mountManager,
-		private IUserMountCache $userMountCache,
-		private IUserManager $userManager,
-		private IFactory $l10nFactory,
-		private IRootFolder $rootFolder,
-	) {
-	}
-
-	/**
-	 * @param IUser $sourceUser
-	 * @param IUser $destinationUser
-	 * @param string $path
-	 *
-	 * @param OutputInterface|null $output
-	 * @param bool $move
-	 * @throws TransferOwnershipException
-	 * @throws NoUserException
-	 */
-	public function transfer(
-		IUser $sourceUser,
-		IUser $destinationUser,
-		string $path,
-		?OutputInterface $output = null,
-		bool $move = false,
-		bool $firstLogin = false,
-		bool $includeExternalStorage = false,
-		bool $useUserId = false,
-	): void {
-		$output = $output ?? new NullOutput();
-		$sourceUid = $sourceUser->getUID();
-		$destinationUid = $destinationUser->getUID();
-		$sourcePath = rtrim($sourceUid . '/files/' . $path, '/');
-
-		// If encryption is on we have to ensure the user has logged in before and that all encryption modules are ready
-		if (($this->encryptionManager->isEnabled() && $destinationUser->getLastLogin() === 0)
-			|| !$this->encryptionManager->isReadyForUser($destinationUid)) {
-			throw new TransferOwnershipException('The target user is not ready to accept files. The user has at least to have logged in once.', 2);
-		}
-
-		// setup filesystem
-		// Requesting the user folder will set it up if the user hasn't logged in before
-		// We need a setupFS for the full filesystem setup before as otherwise we will just return
-		// a lazy root folder which does not create the destination users folder
-		\OC_Util::setupFS($sourceUser->getUID());
-		\OC_Util::setupFS($destinationUser->getUID());
-		$this->rootFolder->getUserFolder($sourceUser->getUID());
-		$this->rootFolder->getUserFolder($destinationUser->getUID());
-		Filesystem::initMountPoints($sourceUid);
-		Filesystem::initMountPoints($destinationUid);
-
-		$view = new View();
-
-		if ($move) {
-			$finalTarget = "$destinationUid/files/";
-		} else {
-			$l = $this->l10nFactory->get('files', $this->l10nFactory->getUserLanguage($destinationUser));
-			$date = date('Y-m-d H-i-s');
-
-			if ($useUserId) {
-				$cleanUserName = $sourceUid;
-			} else {
-				$cleanUserName = $this->sanitizeFolderName($sourceUser->getDisplayName());
-				if ($cleanUserName === '') {
-					$cleanUserName = $sourceUid;
-				}
-			}
-
-			$finalTarget = "$destinationUid/files/" . $this->sanitizeFolderName($l->t('Transferred from %1$s on %2$s', [$cleanUserName, $date]));
-			try {
-				$view->verifyPath(dirname($finalTarget), basename($finalTarget));
-			} catch (InvalidPathException $e) {
-				$finalTarget = "$destinationUid/files/" . $this->sanitizeFolderName($l->t('Transferred from %1$s on %2$s', [$sourceUid, $date]));
-			}
-		}
-
-		if (!($view->is_dir($sourcePath) || $view->is_file($sourcePath))) {
-			throw new TransferOwnershipException("Unknown path provided: $path", 1);
-		}
-
-		if ($move && !$view->is_dir($finalTarget)) {
-			// Initialize storage
-			\OC_Util::setupFS($destinationUser->getUID());
-		}
-
-		if ($move && !$firstLogin && count($view->getDirectoryContent($finalTarget)) > 0) {
-			throw new TransferOwnershipException('Destination path does not exists or is not empty', 1);
-		}
-
-
-		// analyse source folder
-		$this->analyse(
-			$sourceUid,
-			$destinationUid,
-			$sourcePath,
-			$view,
-			$output
-		);
-
-		// collect all the shares
-		$shares = $this->collectUsersShares(
-			$sourceUid,
-			$output,
-			$view,
-			$sourcePath
-		);
-
-		$sourceSize = $view->getFileInfo($sourcePath)->getSize();
-
-		// transfer the files
-		$this->transferFiles(
-			$sourceUid,
-			$sourcePath,
-			$finalTarget,
-			$view,
-			$output,
-			$includeExternalStorage,
-		);
-		$sizeDifference = $sourceSize - $view->getFileInfo($finalTarget)->getSize();
-
-		// transfer the incoming shares
-		$sourceShares = $this->collectIncomingShares(
-			$sourceUid,
-			$output,
-			$sourcePath,
-		);
-		$destinationShares = $this->collectIncomingShares(
-			$destinationUid,
-			$output,
-			null,
-		);
-		$this->transferIncomingShares(
-			$sourceUid,
-			$destinationUid,
-			$sourceShares,
-			$destinationShares,
-			$output,
-			$path,
-			$finalTarget,
-			$move
-		);
-
-		$destinationPath = $finalTarget . '/' . $path;
-		// restore the shares
-		$this->restoreShares(
-			$sourceUid,
-			$destinationUid,
-			$destinationPath,
-			$shares,
-			$output
-		);
-		if ($sizeDifference !== 0) {
-			$output->writeln("Transferred folder have a size difference of: $sizeDifference Bytes which means the transfer may be incomplete. Please check the logs if there was any issue during the transfer operation.");
-		}
-	}
-
-	private function sanitizeFolderName(string $name): string {
-		// Remove some characters which are prone to cause errors
-		$name = str_replace(['\\', '/', ':', '.', '?', '#', '\'', '"'], '-', $name);
-		// Replace multiple dashes with one dash
-		return preg_replace('/-{2,}/s', '-', $name);
-	}
-
-	private function walkFiles(View $view, $path, Closure $callBack) {
-		foreach ($view->getDirectoryContent($path) as $fileInfo) {
-			if (!$callBack($fileInfo)) {
-				return;
-			}
-			if ($fileInfo->getType() === FileInfo::TYPE_FOLDER) {
-				$this->walkFiles($view, $fileInfo->getPath(), $callBack);
-			}
-		}
-	}
-
-	/**
-	 * @param OutputInterface $output
-	 *
-	 * @throws TransferOwnershipException
-	 */
-	protected function analyse(
-		string $sourceUid,
-		string $destinationUid,
-		string $sourcePath,
-		View $view,
-		OutputInterface $output,
-		bool $includeExternalStorage = false,
-	): void {
-		$output->writeln('Validating quota');
-		$sourceFileInfo = $view->getFileInfo($sourcePath, false);
-		if ($sourceFileInfo === false) {
-			throw new TransferOwnershipException("Unknown path provided: $sourcePath", 1);
-		}
-		$size = $sourceFileInfo->getSize(false);
-		$freeSpace = $view->free_space($destinationUid . '/files/');
-		if ($size > $freeSpace && $freeSpace !== FileInfo::SPACE_UNKNOWN) {
-			throw new TransferOwnershipException('Target user does not have enough free space available.', 1);
-		}
-
-		$output->writeln("Analysing files of $sourceUid ...");
-		$progress = new ProgressBar($output);
-		$progress->start();
-
-		if ($this->encryptionManager->isEnabled()) {
-			$masterKeyEnabled = Server::get(Util::class)->isMasterKeyEnabled();
-		} else {
-			$masterKeyEnabled = false;
-		}
-		$encryptedFiles = [];
-		if ($sourceFileInfo->getType() === FileInfo::TYPE_FOLDER) {
-			if ($sourceFileInfo->isEncrypted()) {
-				/* Encrypted folder means e2ee encrypted */
-				$encryptedFiles[] = $sourceFileInfo;
-			} else {
-				$this->walkFiles($view, $sourcePath,
-					function (FileInfo $fileInfo) use ($progress, $masterKeyEnabled, &$encryptedFiles, $includeExternalStorage) {
-						if ($fileInfo->getType() === FileInfo::TYPE_FOLDER) {
-							$mount = $fileInfo->getMountPoint();
-							// only analyze into folders from main storage,
-							if (
-								$mount->getMountProvider() instanceof IHomeMountProvider
-								|| ($includeExternalStorage && $mount->getMountProvider() instanceof ConfigAdapter)
-							) {
-								if ($fileInfo->isEncrypted()) {
-									/* Encrypted folder means e2ee encrypted, we cannot transfer it */
-									$encryptedFiles[] = $fileInfo;
-								}
-								return true;
-							} else {
-								return false;
-							}
-						}
-						$progress->advance();
-						if ($fileInfo->isEncrypted() && !$masterKeyEnabled) {
-							/* Encrypted file means SSE, we can only transfer it if master key is enabled */
-							$encryptedFiles[] = $fileInfo;
-						}
-						return true;
-					});
-			}
-		} elseif ($sourceFileInfo->isEncrypted() && !$masterKeyEnabled) {
-			/* Encrypted file means SSE, we can only transfer it if master key is enabled */
-			$encryptedFiles[] = $sourceFileInfo;
-		}
-		$progress->finish();
-		$output->writeln('');
-
-		// no file is allowed to be encrypted
-		if (!empty($encryptedFiles)) {
-			$output->writeln('<error>Some files are encrypted - please decrypt them first.</error>');
-			foreach ($encryptedFiles as $encryptedFile) {
-				/** @var FileInfo $encryptedFile */
-				$output->writeln('  ' . $encryptedFile->getPath());
-			}
-			throw new TransferOwnershipException('Some files are encrypted - please decrypt them first.', 1);
-		}
-	}
-
-	/**
-	 * @return array<array{share: IShare, suffix: string}>
-	 */
-	private function collectUsersShares(
-		string $sourceUid,
-		OutputInterface $output,
-		View $view,
-		string $path,
-	): array {
-		$output->writeln("Collecting all share information for files and folders of $sourceUid ...");
-
-		$shares = [];
-		$progress = new ProgressBar($output);
-
-		$normalizedPath = Filesystem::normalizePath($path);
-
-		$supportedShareTypes = [
-			IShare::TYPE_GROUP,
-			IShare::TYPE_USER,
-			IShare::TYPE_LINK,
-			IShare::TYPE_REMOTE,
-			IShare::TYPE_ROOM,
-			IShare::TYPE_EMAIL,
-			IShare::TYPE_CIRCLE,
-			IShare::TYPE_DECK,
-			IShare::TYPE_SCIENCEMESH,
-		];
-
-		foreach ($supportedShareTypes as $shareType) {
-			$offset = 0;
-			while (true) {
-				$sharePage = $this->shareManager->getSharesBy($sourceUid, $shareType, null, true, 50, $offset, onlyValid: false);
-				$progress->advance(count($sharePage));
-				if (empty($sharePage)) {
-					break;
-				}
-				if ($path !== "$sourceUid/files") {
-					$sharePage = array_filter($sharePage, function (IShare $share) use ($view, $normalizedPath) {
-						try {
-							$sourceNode = $share->getNode();
-							$relativePath = $view->getRelativePath($sourceNode->getPath());
-
-							return str_starts_with($relativePath . '/', $normalizedPath . '/');
-						} catch (Exception $e) {
-							return false;
-						}
-					});
-				}
-				$shares = array_merge($shares, $sharePage);
-				$offset += 50;
-			}
-		}
-
-		$progress->finish();
-		$output->writeln('');
-
-		return array_values(array_filter(array_map(function (IShare $share) use ($view, $normalizedPath, $output, $sourceUid) {
-			try {
-				$nodePath = $view->getRelativePath($share->getNode()->getPath());
-			} catch (NotFoundException $e) {
-				$output->writeln("<error>Failed to find path for shared file {$share->getNodeId()} for user $sourceUid, skipping</error>");
-				return null;
-			}
-
-			return [
-				'share' => $share,
-				'suffix' => substr(Filesystem::normalizePath($nodePath), strlen($normalizedPath)),
-			];
-		}, $shares)));
-	}
-
-	private function collectIncomingShares(
-		string $sourceUid,
-		OutputInterface $output,
-		?string $path,
-	): array {
-		$output->writeln("Collecting all incoming share information for files and folders of $sourceUid ...");
-
-		$shares = [];
-		$progress = new ProgressBar($output);
-		$normalizedPath = Filesystem::normalizePath($path);
-
-		$offset = 0;
-		while (true) {
-			$sharePage = $this->shareManager->getSharedWith($sourceUid, IShare::TYPE_USER, null, 50, $offset);
-			$progress->advance(count($sharePage));
-			if (empty($sharePage)) {
-				break;
-			}
-
-			if ($path !== null && $path !== "$sourceUid/files") {
-				$sharePage = array_filter($sharePage, static function (IShare $share) use ($sourceUid, $normalizedPath) {
-					try {
-						return str_starts_with(Filesystem::normalizePath($sourceUid . '/files' . $share->getTarget() . '/', false), $normalizedPath . '/');
-					} catch (Exception) {
-						return false;
-					}
-				});
-			}
-
-			foreach ($sharePage as $share) {
-				$shares[$share->getNodeId()] = $share;
-			}
-
-			$offset += 50;
-		}
-
-
-		$progress->finish();
-		$output->writeln('');
-		return $shares;
-	}
-
-	/**
-	 * @throws TransferOwnershipException
-	 */
-	protected function transferFiles(
-		string $sourceUid,
-		string $sourcePath,
-		string $finalTarget,
-		View $view,
-		OutputInterface $output,
-		bool $includeExternalStorage,
-	): void {
-		$output->writeln("Transferring files to $finalTarget ...");
-
-		// This change will help user to transfer the folder specified using --path option.
-		// Else only the content inside folder is transferred which is not correct.
-		if ($sourcePath !== "$sourceUid/files") {
-			$view->mkdir($finalTarget);
-			$finalTarget = $finalTarget . '/' . basename($sourcePath);
-		}
-		$sourceInfo = $view->getFileInfo($sourcePath);
-
-		/// handle the external storages mounted at the root, or the admin specifying an external storage with --path
-		if ($sourceInfo->getInternalPath() === '' && $includeExternalStorage) {
-			$this->moveMountContents($view, $sourcePath, $finalTarget);
-		} else {
-			if ($view->rename($sourcePath, $finalTarget, ['checkSubMounts' => false]) === false) {
-				throw new TransferOwnershipException('Could not transfer files.', 1);
-			}
-		}
-
-		if ($includeExternalStorage) {
-			$nestedMounts = $this->mountManager->findIn($sourcePath);
-			foreach ($nestedMounts as $mount) {
-				if ($mount->getMountProvider() === ConfigAdapter::class) {
-					$relativePath = substr(trim($mount->getMountPoint(), '/'), strlen($sourcePath));
-					$this->moveMountContents($view, $mount->getMountPoint(), $finalTarget . $relativePath);
-				}
-			}
-		}
-
-		if (!is_dir("$sourceUid/files")) {
-			// because the files folder is moved away we need to recreate it
-			$view->mkdir("$sourceUid/files");
-		}
-	}
-
-	private function moveMountContents(View $rootView, string $source, string $target) {
-		if ($rootView->copy($source, $target)) {
-			// just doing `rmdir` on the mountpoint would cause it to try and unmount the storage
-			// we need to empty the contents instead
-			$content = $rootView->getDirectoryContent($source);
-			foreach ($content as $item) {
-				if ($item->getType() === FileInfo::TYPE_FOLDER) {
-					$rootView->rmdir($item->getPath());
-				} else {
-					$rootView->unlink($item->getPath());
-				}
-			}
-		} else {
-			throw new TransferOwnershipException("Could not transfer $source to $target");
-		}
-	}
-
-	/**
-	 * @param string $targetLocation New location of the transfered node
-	 * @param array<array{share: IShare, suffix: string}> $shares previously collected share information
-	 */
-	private function restoreShares(
-		string $sourceUid,
-		string $destinationUid,
-		string $targetLocation,
-		array $shares,
-		OutputInterface $output,
-	):void {
-		$output->writeln('Restoring shares ...');
-		$progress = new ProgressBar($output, count($shares));
-
-		foreach ($shares as ['share' => $share, 'suffix' => $suffix]) {
-			try {
-				$output->writeln('Transfering share ' . $share->getId() . ' of type ' . $share->getShareType(), OutputInterface::VERBOSITY_VERBOSE);
-				if ($share->getShareType() === IShare::TYPE_USER
-					&& $share->getSharedWith() === $destinationUid) {
-					// Unmount the shares before deleting, so we don't try to get the storage later on.
-					$shareMountPoint = $this->mountManager->find('/' . $destinationUid . '/files' . $share->getTarget());
-					if ($shareMountPoint) {
-						$this->mountManager->removeMount($shareMountPoint->getMountPoint());
-					}
-					$this->shareManager->deleteShare($share);
-				} else {
-					if ($share->getShareOwner() === $sourceUid) {
-						$share->setShareOwner($destinationUid);
-					}
-					if ($share->getSharedBy() === $sourceUid) {
-						$share->setSharedBy($destinationUid);
-					}
-
-					if ($share->getShareType() === IShare::TYPE_USER
-						&& !$this->userManager->userExists($share->getSharedWith())) {
-						// stray share with deleted user
-						$output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted user "' . $share->getSharedWith() . '", deleting</error>');
-						$this->shareManager->deleteShare($share);
-						continue;
-					} else {
-						// trigger refetching of the node so that the new owner and mountpoint are taken into account
-						// otherwise the checks on the share update will fail due to the original node not being available in the new user scope
-						$this->userMountCache->clear();
-
-						try {
-							// Try to get the "old" id.
-							// Normally the ID is preserved,
-							// but for transferes between different storages the ID might change
-							$newNodeId = $share->getNode()->getId();
-						} catch (NotFoundException) {
-							// ID has changed due to transfer between different storages
-							// Try to get the new ID from the target path and suffix of the share
-							$node = $this->rootFolder->get(Filesystem::normalizePath($targetLocation . '/' . $suffix));
-							$newNodeId = $node->getId();
-							$output->writeln('Had to change node id to ' . $newNodeId, OutputInterface::VERBOSITY_VERY_VERBOSE);
-						}
-						$share->setNodeId($newNodeId);
-
-						$this->shareManager->updateShare($share, onlyValid: false);
-					}
-				}
-			} catch (NotFoundException $e) {
-				$output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted file, skipping</error>');
-			} catch (\Throwable $e) {
-				$output->writeln('<error>Could not restore share with id ' . $share->getId() . ':' . $e->getMessage() . ' : ' . $e->getTraceAsString() . '</error>');
-			}
-			$progress->advance();
-		}
-		$progress->finish();
-		$output->writeln('');
-	}
-
-	private function transferIncomingShares(string $sourceUid,
-		string $destinationUid,
-		array $sourceShares,
-		array $destinationShares,
-		OutputInterface $output,
-		string $path,
-		string $finalTarget,
-		bool $move): void {
-		$output->writeln('Restoring incoming shares ...');
-		$progress = new ProgressBar($output, count($sourceShares));
-		$prefix = "$destinationUid/files";
-		$finalShareTarget = '';
-		if (str_starts_with($finalTarget, $prefix)) {
-			$finalShareTarget = substr($finalTarget, strlen($prefix));
-		}
-		foreach ($sourceShares as $share) {
-			try {
-				// Only restore if share is in given path.
-				$pathToCheck = '/';
-				if (trim($path, '/') !== '') {
-					$pathToCheck = '/' . trim($path) . '/';
-				}
-				if (!str_starts_with($share->getTarget(), $pathToCheck)) {
-					continue;
-				}
-				$shareTarget = $share->getTarget();
-				$shareTarget = $finalShareTarget . $shareTarget;
-				if ($share->getShareType() === IShare::TYPE_USER
-					&& $share->getSharedBy() === $destinationUid) {
-					$this->shareManager->deleteShare($share);
-				} elseif (isset($destinationShares[$share->getNodeId()])) {
-					$destinationShare = $destinationShares[$share->getNodeId()];
-					// Keep the share which has the most permissions and discard the other one.
-					if ($destinationShare->getPermissions() < $share->getPermissions()) {
-						$this->shareManager->deleteShare($destinationShare);
-						$share->setSharedWith($destinationUid);
-						// trigger refetching of the node so that the new owner and mountpoint are taken into account
-						// otherwise the checks on the share update will fail due to the original node not being available in the new user scope
-						$this->userMountCache->clear();
-						$share->setNodeId($share->getNode()->getId());
-						$this->shareManager->updateShare($share);
-						// The share is already transferred.
-						$progress->advance();
-						if ($move) {
-							continue;
-						}
-						$share->setTarget($shareTarget);
-						$this->shareManager->moveShare($share, $destinationUid);
-						continue;
-					}
-					$this->shareManager->deleteShare($share);
-				} elseif ($share->getShareOwner() === $destinationUid) {
-					$this->shareManager->deleteShare($share);
-				} else {
-					$share->setSharedWith($destinationUid);
-					$share->setNodeId($share->getNode()->getId());
-					$this->shareManager->updateShare($share);
-					// trigger refetching of the node so that the new owner and mountpoint are taken into account
-					// otherwise the checks on the share update will fail due to the original node not being available in the new user scope
-					$this->userMountCache->clear();
-					// The share is already transferred.
-					$progress->advance();
-					if ($move) {
-						continue;
-					}
-					$share->setTarget($shareTarget);
-					$this->shareManager->moveShare($share, $destinationUid);
-					continue;
-				}
-			} catch (NotFoundException $e) {
-				$output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted file, skipping</error>');
-			} catch (\Throwable $e) {
-				$output->writeln('<error>Could not restore share with id ' . $share->getId() . ':' . $e->getTraceAsString() . '</error>');
-			}
-			$progress->advance();
-		}
-		$progress->finish();
-		$output->writeln('');
-	}
+    public function __construct(
+        private IEncryptionManager $encryptionManager,
+        private IShareManager $shareManager,
+        private IMountManager $mountManager,
+        private IUserMountCache $userMountCache,
+        private IUserManager $userManager,
+        private IFactory $l10nFactory,
+        private IRootFolder $rootFolder,
+    ) {
+    }
+
+    /**
+     * @param IUser $sourceUser
+     * @param IUser $destinationUser
+     * @param string $path
+     *
+     * @param OutputInterface|null $output
+     * @param bool $move
+     * @throws TransferOwnershipException
+     * @throws NoUserException
+     */
+    public function transfer(
+        IUser $sourceUser,
+        IUser $destinationUser,
+        string $path,
+        ?OutputInterface $output = null,
+        bool $move = false,
+        bool $firstLogin = false,
+        bool $includeExternalStorage = false,
+        bool $useUserId = false,
+    ): void {
+        $output = $output ?? new NullOutput();
+        $sourceUid = $sourceUser->getUID();
+        $destinationUid = $destinationUser->getUID();
+        $sourcePath = rtrim($sourceUid . '/files/' . $path, '/');
+
+        // If encryption is on we have to ensure the user has logged in before and that all encryption modules are ready
+        if (($this->encryptionManager->isEnabled() && $destinationUser->getLastLogin() === 0)
+            || !$this->encryptionManager->isReadyForUser($destinationUid)) {
+            throw new TransferOwnershipException('The target user is not ready to accept files. The user has at least to have logged in once.', 2);
+        }
+
+        // setup filesystem
+        // Requesting the user folder will set it up if the user hasn't logged in before
+        // We need a setupFS for the full filesystem setup before as otherwise we will just return
+        // a lazy root folder which does not create the destination users folder
+        \OC_Util::setupFS($sourceUser->getUID());
+        \OC_Util::setupFS($destinationUser->getUID());
+        $this->rootFolder->getUserFolder($sourceUser->getUID());
+        $this->rootFolder->getUserFolder($destinationUser->getUID());
+        Filesystem::initMountPoints($sourceUid);
+        Filesystem::initMountPoints($destinationUid);
+
+        $view = new View();
+
+        if ($move) {
+            $finalTarget = "$destinationUid/files/";
+        } else {
+            $l = $this->l10nFactory->get('files', $this->l10nFactory->getUserLanguage($destinationUser));
+            $date = date('Y-m-d H-i-s');
+
+            if ($useUserId) {
+                $cleanUserName = $sourceUid;
+            } else {
+                $cleanUserName = $this->sanitizeFolderName($sourceUser->getDisplayName());
+                if ($cleanUserName === '') {
+                    $cleanUserName = $sourceUid;
+                }
+            }
+
+            $finalTarget = "$destinationUid/files/" . $this->sanitizeFolderName($l->t('Transferred from %1$s on %2$s', [$cleanUserName, $date]));
+            try {
+                $view->verifyPath(dirname($finalTarget), basename($finalTarget));
+            } catch (InvalidPathException $e) {
+                $finalTarget = "$destinationUid/files/" . $this->sanitizeFolderName($l->t('Transferred from %1$s on %2$s', [$sourceUid, $date]));
+            }
+        }
+
+        if (!($view->is_dir($sourcePath) || $view->is_file($sourcePath))) {
+            throw new TransferOwnershipException("Unknown path provided: $path", 1);
+        }
+
+        if ($move && !$view->is_dir($finalTarget)) {
+            // Initialize storage
+            \OC_Util::setupFS($destinationUser->getUID());
+        }
+
+        if ($move && !$firstLogin && count($view->getDirectoryContent($finalTarget)) > 0) {
+            throw new TransferOwnershipException('Destination path does not exists or is not empty', 1);
+        }
+
+
+        // analyse source folder
+        $this->analyse(
+            $sourceUid,
+            $destinationUid,
+            $sourcePath,
+            $view,
+            $output
+        );
+
+        // collect all the shares
+        $shares = $this->collectUsersShares(
+            $sourceUid,
+            $output,
+            $view,
+            $sourcePath
+        );
+
+        $sourceSize = $view->getFileInfo($sourcePath)->getSize();
+
+        // transfer the files
+        $this->transferFiles(
+            $sourceUid,
+            $sourcePath,
+            $finalTarget,
+            $view,
+            $output,
+            $includeExternalStorage,
+        );
+        $sizeDifference = $sourceSize - $view->getFileInfo($finalTarget)->getSize();
+
+        // transfer the incoming shares
+        $sourceShares = $this->collectIncomingShares(
+            $sourceUid,
+            $output,
+            $sourcePath,
+        );
+        $destinationShares = $this->collectIncomingShares(
+            $destinationUid,
+            $output,
+            null,
+        );
+        $this->transferIncomingShares(
+            $sourceUid,
+            $destinationUid,
+            $sourceShares,
+            $destinationShares,
+            $output,
+            $path,
+            $finalTarget,
+            $move
+        );
+
+        $destinationPath = $finalTarget . '/' . $path;
+        // restore the shares
+        $this->restoreShares(
+            $sourceUid,
+            $destinationUid,
+            $destinationPath,
+            $shares,
+            $output
+        );
+        if ($sizeDifference !== 0) {
+            $output->writeln("Transferred folder have a size difference of: $sizeDifference Bytes which means the transfer may be incomplete. Please check the logs if there was any issue during the transfer operation.");
+        }
+    }
+
+    private function sanitizeFolderName(string $name): string {
+        // Remove some characters which are prone to cause errors
+        $name = str_replace(['\\', '/', ':', '.', '?', '#', '\'', '"'], '-', $name);
+        // Replace multiple dashes with one dash
+        return preg_replace('/-{2,}/s', '-', $name);
+    }
+
+    private function walkFiles(View $view, $path, Closure $callBack) {
+        foreach ($view->getDirectoryContent($path) as $fileInfo) {
+            if (!$callBack($fileInfo)) {
+                return;
+            }
+            if ($fileInfo->getType() === FileInfo::TYPE_FOLDER) {
+                $this->walkFiles($view, $fileInfo->getPath(), $callBack);
+            }
+        }
+    }
+
+    /**
+     * @param OutputInterface $output
+     *
+     * @throws TransferOwnershipException
+     */
+    protected function analyse(
+        string $sourceUid,
+        string $destinationUid,
+        string $sourcePath,
+        View $view,
+        OutputInterface $output,
+        bool $includeExternalStorage = false,
+    ): void {
+        $output->writeln('Validating quota');
+        $sourceFileInfo = $view->getFileInfo($sourcePath, false);
+        if ($sourceFileInfo === false) {
+            throw new TransferOwnershipException("Unknown path provided: $sourcePath", 1);
+        }
+        $size = $sourceFileInfo->getSize(false);
+        $freeSpace = $view->free_space($destinationUid . '/files/');
+        if ($size > $freeSpace && $freeSpace !== FileInfo::SPACE_UNKNOWN) {
+            throw new TransferOwnershipException('Target user does not have enough free space available.', 1);
+        }
+
+        $output->writeln("Analysing files of $sourceUid ...");
+        $progress = new ProgressBar($output);
+        $progress->start();
+
+        if ($this->encryptionManager->isEnabled()) {
+            $masterKeyEnabled = Server::get(Util::class)->isMasterKeyEnabled();
+        } else {
+            $masterKeyEnabled = false;
+        }
+        $encryptedFiles = [];
+        if ($sourceFileInfo->getType() === FileInfo::TYPE_FOLDER) {
+            if ($sourceFileInfo->isEncrypted()) {
+                /* Encrypted folder means e2ee encrypted */
+                $encryptedFiles[] = $sourceFileInfo;
+            } else {
+                $this->walkFiles($view, $sourcePath,
+                    function (FileInfo $fileInfo) use ($progress, $masterKeyEnabled, &$encryptedFiles, $includeExternalStorage) {
+                        if ($fileInfo->getType() === FileInfo::TYPE_FOLDER) {
+                            $mount = $fileInfo->getMountPoint();
+                            // only analyze into folders from main storage,
+                            if (
+                                $mount->getMountProvider() instanceof IHomeMountProvider
+                                || ($includeExternalStorage && $mount->getMountProvider() instanceof ConfigAdapter)
+                            ) {
+                                if ($fileInfo->isEncrypted()) {
+                                    /* Encrypted folder means e2ee encrypted, we cannot transfer it */
+                                    $encryptedFiles[] = $fileInfo;
+                                }
+                                return true;
+                            } else {
+                                return false;
+                            }
+                        }
+                        $progress->advance();
+                        if ($fileInfo->isEncrypted() && !$masterKeyEnabled) {
+                            /* Encrypted file means SSE, we can only transfer it if master key is enabled */
+                            $encryptedFiles[] = $fileInfo;
+                        }
+                        return true;
+                    });
+            }
+        } elseif ($sourceFileInfo->isEncrypted() && !$masterKeyEnabled) {
+            /* Encrypted file means SSE, we can only transfer it if master key is enabled */
+            $encryptedFiles[] = $sourceFileInfo;
+        }
+        $progress->finish();
+        $output->writeln('');
+
+        // no file is allowed to be encrypted
+        if (!empty($encryptedFiles)) {
+            $output->writeln('<error>Some files are encrypted - please decrypt them first.</error>');
+            foreach ($encryptedFiles as $encryptedFile) {
+                /** @var FileInfo $encryptedFile */
+                $output->writeln('  ' . $encryptedFile->getPath());
+            }
+            throw new TransferOwnershipException('Some files are encrypted - please decrypt them first.', 1);
+        }
+    }
+
+    /**
+     * @return array<array{share: IShare, suffix: string}>
+     */
+    private function collectUsersShares(
+        string $sourceUid,
+        OutputInterface $output,
+        View $view,
+        string $path,
+    ): array {
+        $output->writeln("Collecting all share information for files and folders of $sourceUid ...");
+
+        $shares = [];
+        $progress = new ProgressBar($output);
+
+        $normalizedPath = Filesystem::normalizePath($path);
+
+        $supportedShareTypes = [
+            IShare::TYPE_GROUP,
+            IShare::TYPE_USER,
+            IShare::TYPE_LINK,
+            IShare::TYPE_REMOTE,
+            IShare::TYPE_ROOM,
+            IShare::TYPE_EMAIL,
+            IShare::TYPE_CIRCLE,
+            IShare::TYPE_DECK,
+            IShare::TYPE_SCIENCEMESH,
+        ];
+
+        foreach ($supportedShareTypes as $shareType) {
+            $offset = 0;
+            while (true) {
+                $sharePage = $this->shareManager->getSharesBy($sourceUid, $shareType, null, true, 50, $offset, onlyValid: false);
+                $progress->advance(count($sharePage));
+                if (empty($sharePage)) {
+                    break;
+                }
+                if ($path !== "$sourceUid/files") {
+                    $sharePage = array_filter($sharePage, function (IShare $share) use ($view, $normalizedPath) {
+                        try {
+                            $sourceNode = $share->getNode();
+                            $relativePath = $view->getRelativePath($sourceNode->getPath());
+
+                            return str_starts_with($relativePath . '/', $normalizedPath . '/');
+                        } catch (Exception $e) {
+                            return false;
+                        }
+                    });
+                }
+                $shares = array_merge($shares, $sharePage);
+                $offset += 50;
+            }
+        }
+
+        $progress->finish();
+        $output->writeln('');
+
+        return array_values(array_filter(array_map(function (IShare $share) use ($view, $normalizedPath, $output, $sourceUid) {
+            try {
+                $nodePath = $view->getRelativePath($share->getNode()->getPath());
+            } catch (NotFoundException $e) {
+                $output->writeln("<error>Failed to find path for shared file {$share->getNodeId()} for user $sourceUid, skipping</error>");
+                return null;
+            }
+
+            return [
+                'share' => $share,
+                'suffix' => substr(Filesystem::normalizePath($nodePath), strlen($normalizedPath)),
+            ];
+        }, $shares)));
+    }
+
+    private function collectIncomingShares(
+        string $sourceUid,
+        OutputInterface $output,
+        ?string $path,
+    ): array {
+        $output->writeln("Collecting all incoming share information for files and folders of $sourceUid ...");
+
+        $shares = [];
+        $progress = new ProgressBar($output);
+        $normalizedPath = Filesystem::normalizePath($path);
+
+        $offset = 0;
+        while (true) {
+            $sharePage = $this->shareManager->getSharedWith($sourceUid, IShare::TYPE_USER, null, 50, $offset);
+            $progress->advance(count($sharePage));
+            if (empty($sharePage)) {
+                break;
+            }
+
+            if ($path !== null && $path !== "$sourceUid/files") {
+                $sharePage = array_filter($sharePage, static function (IShare $share) use ($sourceUid, $normalizedPath) {
+                    try {
+                        return str_starts_with(Filesystem::normalizePath($sourceUid . '/files' . $share->getTarget() . '/', false), $normalizedPath . '/');
+                    } catch (Exception) {
+                        return false;
+                    }
+                });
+            }
+
+            foreach ($sharePage as $share) {
+                $shares[$share->getNodeId()] = $share;
+            }
+
+            $offset += 50;
+        }
+
+
+        $progress->finish();
+        $output->writeln('');
+        return $shares;
+    }
+
+    /**
+     * @throws TransferOwnershipException
+     */
+    protected function transferFiles(
+        string $sourceUid,
+        string $sourcePath,
+        string $finalTarget,
+        View $view,
+        OutputInterface $output,
+        bool $includeExternalStorage,
+    ): void {
+        $output->writeln("Transferring files to $finalTarget ...");
+
+        // This change will help user to transfer the folder specified using --path option.
+        // Else only the content inside folder is transferred which is not correct.
+        if ($sourcePath !== "$sourceUid/files") {
+            $view->mkdir($finalTarget);
+            $finalTarget = $finalTarget . '/' . basename($sourcePath);
+        }
+        $sourceInfo = $view->getFileInfo($sourcePath);
+
+        /// handle the external storages mounted at the root, or the admin specifying an external storage with --path
+        if ($sourceInfo->getInternalPath() === '' && $includeExternalStorage) {
+            $this->moveMountContents($view, $sourcePath, $finalTarget);
+        } else {
+            if ($view->rename($sourcePath, $finalTarget, ['checkSubMounts' => false]) === false) {
+                throw new TransferOwnershipException('Could not transfer files.', 1);
+            }
+        }
+
+        if ($includeExternalStorage) {
+            $nestedMounts = $this->mountManager->findIn($sourcePath);
+            foreach ($nestedMounts as $mount) {
+                if ($mount->getMountProvider() === ConfigAdapter::class) {
+                    $relativePath = substr(trim($mount->getMountPoint(), '/'), strlen($sourcePath));
+                    $this->moveMountContents($view, $mount->getMountPoint(), $finalTarget . $relativePath);
+                }
+            }
+        }
+
+        if (!is_dir("$sourceUid/files")) {
+            // because the files folder is moved away we need to recreate it
+            $view->mkdir("$sourceUid/files");
+        }
+    }
+
+    private function moveMountContents(View $rootView, string $source, string $target) {
+        if ($rootView->copy($source, $target)) {
+            // just doing `rmdir` on the mountpoint would cause it to try and unmount the storage
+            // we need to empty the contents instead
+            $content = $rootView->getDirectoryContent($source);
+            foreach ($content as $item) {
+                if ($item->getType() === FileInfo::TYPE_FOLDER) {
+                    $rootView->rmdir($item->getPath());
+                } else {
+                    $rootView->unlink($item->getPath());
+                }
+            }
+        } else {
+            throw new TransferOwnershipException("Could not transfer $source to $target");
+        }
+    }
+
+    /**
+     * @param string $targetLocation New location of the transfered node
+     * @param array<array{share: IShare, suffix: string}> $shares previously collected share information
+     */
+    private function restoreShares(
+        string $sourceUid,
+        string $destinationUid,
+        string $targetLocation,
+        array $shares,
+        OutputInterface $output,
+    ):void {
+        $output->writeln('Restoring shares ...');
+        $progress = new ProgressBar($output, count($shares));
+
+        foreach ($shares as ['share' => $share, 'suffix' => $suffix]) {
+            try {
+                $output->writeln('Transfering share ' . $share->getId() . ' of type ' . $share->getShareType(), OutputInterface::VERBOSITY_VERBOSE);
+                if ($share->getShareType() === IShare::TYPE_USER
+                    && $share->getSharedWith() === $destinationUid) {
+                    // Unmount the shares before deleting, so we don't try to get the storage later on.
+                    $shareMountPoint = $this->mountManager->find('/' . $destinationUid . '/files' . $share->getTarget());
+                    if ($shareMountPoint) {
+                        $this->mountManager->removeMount($shareMountPoint->getMountPoint());
+                    }
+                    $this->shareManager->deleteShare($share);
+                } else {
+                    if ($share->getShareOwner() === $sourceUid) {
+                        $share->setShareOwner($destinationUid);
+                    }
+                    if ($share->getSharedBy() === $sourceUid) {
+                        $share->setSharedBy($destinationUid);
+                    }
+
+                    if ($share->getShareType() === IShare::TYPE_USER
+                        && !$this->userManager->userExists($share->getSharedWith())) {
+                        // stray share with deleted user
+                        $output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted user "' . $share->getSharedWith() . '", deleting</error>');
+                        $this->shareManager->deleteShare($share);
+                        continue;
+                    } else {
+                        // trigger refetching of the node so that the new owner and mountpoint are taken into account
+                        // otherwise the checks on the share update will fail due to the original node not being available in the new user scope
+                        $this->userMountCache->clear();
+
+                        try {
+                            // Try to get the "old" id.
+                            // Normally the ID is preserved,
+                            // but for transferes between different storages the ID might change
+                            $newNodeId = $share->getNode()->getId();
+                        } catch (NotFoundException) {
+                            // ID has changed due to transfer between different storages
+                            // Try to get the new ID from the target path and suffix of the share
+                            $node = $this->rootFolder->get(Filesystem::normalizePath($targetLocation . '/' . $suffix));
+                            $newNodeId = $node->getId();
+                            $output->writeln('Had to change node id to ' . $newNodeId, OutputInterface::VERBOSITY_VERY_VERBOSE);
+                        }
+                        $share->setNodeId($newNodeId);
+
+                        $this->shareManager->updateShare($share, onlyValid: false);
+                    }
+                }
+            } catch (NotFoundException $e) {
+                $output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted file, skipping</error>');
+            } catch (\Throwable $e) {
+                $output->writeln('<error>Could not restore share with id ' . $share->getId() . ':' . $e->getMessage() . ' : ' . $e->getTraceAsString() . '</error>');
+            }
+            $progress->advance();
+        }
+        $progress->finish();
+        $output->writeln('');
+    }
+
+    private function transferIncomingShares(string $sourceUid,
+        string $destinationUid,
+        array $sourceShares,
+        array $destinationShares,
+        OutputInterface $output,
+        string $path,
+        string $finalTarget,
+        bool $move): void {
+        $output->writeln('Restoring incoming shares ...');
+        $progress = new ProgressBar($output, count($sourceShares));
+        $prefix = "$destinationUid/files";
+        $finalShareTarget = '';
+        if (str_starts_with($finalTarget, $prefix)) {
+            $finalShareTarget = substr($finalTarget, strlen($prefix));
+        }
+        foreach ($sourceShares as $share) {
+            try {
+                // Only restore if share is in given path.
+                $pathToCheck = '/';
+                if (trim($path, '/') !== '') {
+                    $pathToCheck = '/' . trim($path) . '/';
+                }
+                if (!str_starts_with($share->getTarget(), $pathToCheck)) {
+                    continue;
+                }
+                $shareTarget = $share->getTarget();
+                $shareTarget = $finalShareTarget . $shareTarget;
+                if ($share->getShareType() === IShare::TYPE_USER
+                    && $share->getSharedBy() === $destinationUid) {
+                    $this->shareManager->deleteShare($share);
+                } elseif (isset($destinationShares[$share->getNodeId()])) {
+                    $destinationShare = $destinationShares[$share->getNodeId()];
+                    // Keep the share which has the most permissions and discard the other one.
+                    if ($destinationShare->getPermissions() < $share->getPermissions()) {
+                        $this->shareManager->deleteShare($destinationShare);
+                        $share->setSharedWith($destinationUid);
+                        // trigger refetching of the node so that the new owner and mountpoint are taken into account
+                        // otherwise the checks on the share update will fail due to the original node not being available in the new user scope
+                        $this->userMountCache->clear();
+                        $share->setNodeId($share->getNode()->getId());
+                        $this->shareManager->updateShare($share);
+                        // The share is already transferred.
+                        $progress->advance();
+                        if ($move) {
+                            continue;
+                        }
+                        $share->setTarget($shareTarget);
+                        $this->shareManager->moveShare($share, $destinationUid);
+                        continue;
+                    }
+                    $this->shareManager->deleteShare($share);
+                } elseif ($share->getShareOwner() === $destinationUid) {
+                    $this->shareManager->deleteShare($share);
+                } else {
+                    $share->setSharedWith($destinationUid);
+                    $share->setNodeId($share->getNode()->getId());
+                    $this->shareManager->updateShare($share);
+                    // trigger refetching of the node so that the new owner and mountpoint are taken into account
+                    // otherwise the checks on the share update will fail due to the original node not being available in the new user scope
+                    $this->userMountCache->clear();
+                    // The share is already transferred.
+                    $progress->advance();
+                    if ($move) {
+                        continue;
+                    }
+                    $share->setTarget($shareTarget);
+                    $this->shareManager->moveShare($share, $destinationUid);
+                    continue;
+                }
+            } catch (NotFoundException $e) {
+                $output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted file, skipping</error>');
+            } catch (\Throwable $e) {
+                $output->writeln('<error>Could not restore share with id ' . $share->getId() . ':' . $e->getTraceAsString() . '</error>');
+            }
+            $progress->advance();
+        }
+        $progress->finish();
+        $output->writeln('');
+    }
 }

Spacing +25 added lines, -25 removed lines

@@ -78,7 +78,7 @@ 
 		$output = $output ?? new NullOutput();
 		$sourceUid = $sourceUser->getUID();
 		$destinationUid = $destinationUser->getUID();
-		$sourcePath = rtrim($sourceUid . '/files/' . $path, '/');
+		$sourcePath = rtrim($sourceUid.'/files/'.$path, '/');
 
 		// If encryption is on we have to ensure the user has logged in before and that all encryption modules are ready
 		if (($this->encryptionManager->isEnabled() && $destinationUser->getLastLogin() === 0)
@@ -114,11 +114,11 @@ 
 				}
 			}
 
-			$finalTarget = "$destinationUid/files/" . $this->sanitizeFolderName($l->t('Transferred from %1$s on %2$s', [$cleanUserName, $date]));
+			$finalTarget = "$destinationUid/files/".$this->sanitizeFolderName($l->t('Transferred from %1$s on %2$s', [$cleanUserName, $date]));
 			try {
 				$view->verifyPath(dirname($finalTarget), basename($finalTarget));
 			} catch (InvalidPathException $e) {
-				$finalTarget = "$destinationUid/files/" . $this->sanitizeFolderName($l->t('Transferred from %1$s on %2$s', [$sourceUid, $date]));
+				$finalTarget = "$destinationUid/files/".$this->sanitizeFolderName($l->t('Transferred from %1$s on %2$s', [$sourceUid, $date]));
 			}
 		}
 
@@ -188,7 +188,7 @@ 
 			$move
 		);
 
-		$destinationPath = $finalTarget . '/' . $path;
+		$destinationPath = $finalTarget.'/'.$path;
 		// restore the shares
 		$this->restoreShares(
 			$sourceUid,
@@ -239,7 +239,7 @@ 
 			throw new TransferOwnershipException("Unknown path provided: $sourcePath", 1);
 		}
 		$size = $sourceFileInfo->getSize(false);
-		$freeSpace = $view->free_space($destinationUid . '/files/');
+		$freeSpace = $view->free_space($destinationUid.'/files/');
 		if ($size > $freeSpace && $freeSpace !== FileInfo::SPACE_UNKNOWN) {
 			throw new TransferOwnershipException('Target user does not have enough free space available.', 1);
 		}
@@ -260,7 +260,7 @@ 
 				$encryptedFiles[] = $sourceFileInfo;
 			} else {
 				$this->walkFiles($view, $sourcePath,
-					function (FileInfo $fileInfo) use ($progress, $masterKeyEnabled, &$encryptedFiles, $includeExternalStorage) {
+					function(FileInfo $fileInfo) use ($progress, $masterKeyEnabled, &$encryptedFiles, $includeExternalStorage) {
 						if ($fileInfo->getType() === FileInfo::TYPE_FOLDER) {
 							$mount = $fileInfo->getMountPoint();
 							// only analyze into folders from main storage,
@@ -297,7 +297,7 @@ 
 			$output->writeln('<error>Some files are encrypted - please decrypt them first.</error>');
 			foreach ($encryptedFiles as $encryptedFile) {
 				/** @var FileInfo $encryptedFile */
-				$output->writeln('  ' . $encryptedFile->getPath());
+				$output->writeln('  '.$encryptedFile->getPath());
 			}
 			throw new TransferOwnershipException('Some files are encrypted - please decrypt them first.', 1);
 		}
@@ -340,12 +340,12 @@ 
 					break;
 				}
 				if ($path !== "$sourceUid/files") {
-					$sharePage = array_filter($sharePage, function (IShare $share) use ($view, $normalizedPath) {
+					$sharePage = array_filter($sharePage, function(IShare $share) use ($view, $normalizedPath) {
 						try {
 							$sourceNode = $share->getNode();
 							$relativePath = $view->getRelativePath($sourceNode->getPath());
 
-							return str_starts_with($relativePath . '/', $normalizedPath . '/');
+							return str_starts_with($relativePath.'/', $normalizedPath.'/');
 						} catch (Exception $e) {
 							return false;
 						}
@@ -359,7 +359,7 @@ 
 		$progress->finish();
 		$output->writeln('');
 
-		return array_values(array_filter(array_map(function (IShare $share) use ($view, $normalizedPath, $output, $sourceUid) {
+		return array_values(array_filter(array_map(function(IShare $share) use ($view, $normalizedPath, $output, $sourceUid) {
 			try {
 				$nodePath = $view->getRelativePath($share->getNode()->getPath());
 			} catch (NotFoundException $e) {
@@ -394,9 +394,9 @@ 
 			}
 
 			if ($path !== null && $path !== "$sourceUid/files") {
-				$sharePage = array_filter($sharePage, static function (IShare $share) use ($sourceUid, $normalizedPath) {
+				$sharePage = array_filter($sharePage, static function(IShare $share) use ($sourceUid, $normalizedPath) {
 					try {
-						return str_starts_with(Filesystem::normalizePath($sourceUid . '/files' . $share->getTarget() . '/', false), $normalizedPath . '/');
+						return str_starts_with(Filesystem::normalizePath($sourceUid.'/files'.$share->getTarget().'/', false), $normalizedPath.'/');
 					} catch (Exception) {
 						return false;
 					}
@@ -433,7 +433,7 @@ 
 		// Else only the content inside folder is transferred which is not correct.
 		if ($sourcePath !== "$sourceUid/files") {
 			$view->mkdir($finalTarget);
-			$finalTarget = $finalTarget . '/' . basename($sourcePath);
+			$finalTarget = $finalTarget.'/'.basename($sourcePath);
 		}
 		$sourceInfo = $view->getFileInfo($sourcePath);
 
@@ -451,7 +451,7 @@ 
 			foreach ($nestedMounts as $mount) {
 				if ($mount->getMountProvider() === ConfigAdapter::class) {
 					$relativePath = substr(trim($mount->getMountPoint(), '/'), strlen($sourcePath));
-					$this->moveMountContents($view, $mount->getMountPoint(), $finalTarget . $relativePath);
+					$this->moveMountContents($view, $mount->getMountPoint(), $finalTarget.$relativePath);
 				}
 			}
 		}
@@ -495,11 +495,11 @@ 
 
 		foreach ($shares as ['share' => $share, 'suffix' => $suffix]) {
 			try {
-				$output->writeln('Transfering share ' . $share->getId() . ' of type ' . $share->getShareType(), OutputInterface::VERBOSITY_VERBOSE);
+				$output->writeln('Transfering share '.$share->getId().' of type '.$share->getShareType(), OutputInterface::VERBOSITY_VERBOSE);
 				if ($share->getShareType() === IShare::TYPE_USER
 					&& $share->getSharedWith() === $destinationUid) {
 					// Unmount the shares before deleting, so we don't try to get the storage later on.
-					$shareMountPoint = $this->mountManager->find('/' . $destinationUid . '/files' . $share->getTarget());
+					$shareMountPoint = $this->mountManager->find('/'.$destinationUid.'/files'.$share->getTarget());
 					if ($shareMountPoint) {
 						$this->mountManager->removeMount($shareMountPoint->getMountPoint());
 					}
@@ -515,7 +515,7 @@ 
 					if ($share->getShareType() === IShare::TYPE_USER
 						&& !$this->userManager->userExists($share->getSharedWith())) {
 						// stray share with deleted user
-						$output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted user "' . $share->getSharedWith() . '", deleting</error>');
+						$output->writeln('<error>Share with id '.$share->getId().' points at deleted user "'.$share->getSharedWith().'", deleting</error>');
 						$this->shareManager->deleteShare($share);
 						continue;
 					} else {
@@ -531,9 +531,9 @@ 
 						} catch (NotFoundException) {
 							// ID has changed due to transfer between different storages
 							// Try to get the new ID from the target path and suffix of the share
-							$node = $this->rootFolder->get(Filesystem::normalizePath($targetLocation . '/' . $suffix));
+							$node = $this->rootFolder->get(Filesystem::normalizePath($targetLocation.'/'.$suffix));
 							$newNodeId = $node->getId();
-							$output->writeln('Had to change node id to ' . $newNodeId, OutputInterface::VERBOSITY_VERY_VERBOSE);
+							$output->writeln('Had to change node id to '.$newNodeId, OutputInterface::VERBOSITY_VERY_VERBOSE);
 						}
 						$share->setNodeId($newNodeId);
 
@@ -541,9 +541,9 @@ 
 					}
 				}
 			} catch (NotFoundException $e) {
-				$output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted file, skipping</error>');
+				$output->writeln('<error>Share with id '.$share->getId().' points at deleted file, skipping</error>');
 			} catch (\Throwable $e) {
-				$output->writeln('<error>Could not restore share with id ' . $share->getId() . ':' . $e->getMessage() . ' : ' . $e->getTraceAsString() . '</error>');
+				$output->writeln('<error>Could not restore share with id '.$share->getId().':'.$e->getMessage().' : '.$e->getTraceAsString().'</error>');
 			}
 			$progress->advance();
 		}
@@ -571,13 +571,13 @@ 
 				// Only restore if share is in given path.
 				$pathToCheck = '/';
 				if (trim($path, '/') !== '') {
-					$pathToCheck = '/' . trim($path) . '/';
+					$pathToCheck = '/'.trim($path).'/';
 				}
 				if (!str_starts_with($share->getTarget(), $pathToCheck)) {
 					continue;
 				}
 				$shareTarget = $share->getTarget();
-				$shareTarget = $finalShareTarget . $shareTarget;
+				$shareTarget = $finalShareTarget.$shareTarget;
 				if ($share->getShareType() === IShare::TYPE_USER
 					&& $share->getSharedBy() === $destinationUid) {
 					$this->shareManager->deleteShare($share);
@@ -621,9 +621,9 @@ 
 					continue;
 				}
 			} catch (NotFoundException $e) {
-				$output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted file, skipping</error>');
+				$output->writeln('<error>Share with id '.$share->getId().' points at deleted file, skipping</error>');
 			} catch (\Throwable $e) {
-				$output->writeln('<error>Could not restore share with id ' . $share->getId() . ':' . $e->getTraceAsString() . '</error>');
+				$output->writeln('<error>Could not restore share with id '.$share->getId().':'.$e->getTraceAsString().'</error>');
 			}
 			$progress->advance();
 		}