Set path relative to source user folder

Signed-off-by: Christopher Ng <[email protected]>

lib/BackgroundJob/UserImportJob.php

@@ -32,6 +32,7 @@
 use OCA\UserMigration\Service\UserMigrationService;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\QueuedJob;
+use OCP\Files\IRootFolder;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\Notification\IManager as NotificationManager;
@@ -43,14 +44,16 @@ class UserImportJob extends QueuedJob {
 	private LoggerInterface $logger;
 	private NotificationManager $notificationManager;
 	private UserImportMapper $mapper;
+	private IRootFolder $root;
 
 	public function __construct(
 		ITimeFactory $timeFactory,
 		IUserManager $userManager,
 		UserMigrationService $migrationService,
 		LoggerInterface $logger,
 		NotificationManager $notificationManager,
-		UserImportMapper $mapper
+		UserImportMapper $mapper,
+		IRootFolder $root
 	) {
 		parent::__construct($timeFactory);
 
@@ -59,6 +62,7 @@ public function __construct(
 		$this->logger = $logger;
 		$this->notificationManager = $notificationManager;
 		$this->mapper = $mapper;
+		$this->root = $root;
 	}
 
 	public function run($argument): void {
@@ -68,6 +72,7 @@ public function run($argument): void {
 		$sourceUser = $import->getSourceUser();
 		$targetUser = $import->getTargetUser();
 		$path = $import->getPath();
+		$absolutePath = $this->root->getUserFolder($sourceUser)->get($path)->getPath();
 
 		$sourceUserObject = $this->userManager->get($sourceUser);
 		$targetUserObject = $this->userManager->get($targetUser);
@@ -87,7 +92,7 @@ public function run($argument): void {
 			$import->setStatus(UserImport::STATUS_STARTED);
 			$this->mapper->update($import);
 
-			$this->migrationService->import($path, $targetUserObject);
+			$this->migrationService->import($absolutePath, $targetUserObject);
 			$this->successNotification($import);
 		} catch (\Exception $e) {
 			$this->logger->error($e->getMessage(), ['exception' => $e]);

lib/Controller/ApiController.php

@@ -40,7 +40,6 @@
 use OCP\AppFramework\OCS\OCSException;
 use OCP\AppFramework\OCSController;
 use OCP\BackgroundJob\IJobList;
-use OCP\Files\IRootFolder;
 use OCP\IRequest;
 use OCP\IUserManager;
 use OCP\IUserSession;
@@ -57,8 +56,6 @@ class ApiController extends OCSController {
 
 	private UserImportMapper $importMapper;
 
-	private IRootFolder $root;
-
 	private IJobList $jobList;
 
 	public function __construct(
@@ -68,7 +65,6 @@ public function __construct(
 		UserMigrationService $migrationService,
 		UserExportMapper $exportMapper,
 		UserImportMapper $importMapper,
-		IRootFolder $root,
 		IJobList $jobList
 	) {
 		parent::__construct(Application::APP_ID, $request);
@@ -77,7 +73,6 @@ public function __construct(
 		$this->migrationService = $migrationService;
 		$this->exportMapper = $exportMapper;
 		$this->importMapper = $importMapper;
-		$this->root = $root;
 		$this->jobList = $jobList;
 	}
 
@@ -201,9 +196,8 @@ public function export(array $migrators): DataResponse {
 	 * @NoSubAdminRequired
 	 * @PasswordConfirmationRequired
 	 */
-	public function import(string $userPath, string $targetUserId): DataResponse {
+	public function import(string $path, string $targetUserId): DataResponse {
 		$sourceUser = $this->userSession->getUser();
-		$absolutePath = $this->root->getUserFolder($sourceUser->getUID())->get($userPath)->getPath();
 
 		if (empty($sourceUser)) {
 			throw new OCSException('No user currently logged in');
@@ -235,7 +229,8 @@ public function import(string $userPath, string $targetUserId): DataResponse {
 		$userImport = new UserImport();
 		$userImport->setSourceUser($sourceUser->getUID());
 		$userImport->setTargetUser($targetUser->getUID());
-		$userImport->setPath($absolutePath);
+		// Path is relative to the source user folder
+		$userImport->setPath($path);
 		// All available migrators are added as migrator selection for import is not allowed for now
 		$userImport->setMigratorsArray($availableMigrators);
 		$userImport->setStatus(UserImport::STATUS_WAITING);