Drop account export and import

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

Author: Pytal

lib/Service/UserMigrationService.php

@@ -27,10 +27,10 @@
 
 namespace OCA\UserMigration\Service;
 
+use OC\Accounts\AccountMigrator;
 use OCA\UserMigration\Exception\UserMigrationException;
 use OCA\UserMigration\ExportDestination;
 use OCA\UserMigration\ImportSource;
-use OCP\Accounts\IAccountManager;
 use OCP\Files\IRootFolder;
 use OCP\IConfig;
 use OCP\ITempManager;
@@ -53,8 +53,6 @@ class UserMigrationService {
 
 	protected IConfig $config;
 
-	protected IAccountManager $accountManager;
-
 	protected ITempManager $tempManager;
 
 	protected IUserManager $userManager;
@@ -67,15 +65,13 @@ class UserMigrationService {
 	public function __construct(
 		IRootFolder $rootFolder,
 		IConfig $config,
-		IAccountManager $accountManager,
 		ITempManager $tempManager,
 		IUserManager $userManager,
 		ContainerInterface $container,
 		Coordinator $coordinator
 	) {
 		$this->root = $rootFolder;
 		$this->config = $config;
-		$this->accountManager = $accountManager;
 		$this->tempManager = $tempManager;
 		$this->userManager = $userManager;
 		$this->container = $container;
@@ -106,12 +102,6 @@ public function export(IUser $user, ?OutputInterface $output = null): string {
 			$output
 		);
 
-		$this->exportAccountInformation(
-			$user,
-			$exportDestination,
-			$output
-		);
-
 		$this->exportAppsSettings(
 			$uid,
 			$exportDestination,
@@ -124,16 +114,18 @@ public function export(IUser $user, ?OutputInterface $output = null): string {
 			$output
 		);
 
-		// Run exports of registered migrators
 		$migratorVersions = [
 			static::class => $this->getVersion(),
 		];
+
+		// Run exports of registered migrators
 		foreach ($context->getUserMigrators() as $migratorRegistration) {
 			/** @var IMigrator $migrator */
 			$migrator = $this->container->get($migratorRegistration->getService());
 			$migrator->export($user, $exportDestination, $output);
 			$migratorVersions[get_class($migrator)] = $migrator->getVersion();
 		}
+
 		if ($exportDestination->setMigratorVersions($migratorVersions) === false) {
 			throw new UserMigrationException("Could not export user information.");
 		}
@@ -171,7 +163,6 @@ public function import(string $path, ?OutputInterface $output = null): void {
 			}
 
 			$user = $this->importUser($importSource, $output);
-			$this->importAccountInformation($user, $importSource, $output);
 			$this->importAppsSettings($user, $importSource, $output);
 
 			// Run imports of registered migrators
@@ -230,30 +221,6 @@ protected function importUser(IImportSource $importSource,
 		return $user;
 	}
 
-	/**
-	 * @throws UserMigrationException
-	 */
-	protected function exportAccountInformation(IUser $user,
-									 IExportDestination $exportDestination,
-									 OutputInterface $output): void {
-		$output->writeln("Exporting account information in account.json…");
-
-		if ($exportDestination->addFileContents("account.json", json_encode($this->accountManager->getAccount($user))) === false) {
-			throw new UserMigrationException("Could not export account information.");
-		}
-	}
-
-	/**
-	 * @throws UserMigrationException
-	 */
-	protected function importAccountInformation(IUser $user,
-									 IImportSource $importSource,
-									 OutputInterface $output): void {
-		$output->writeln("Importing account information from account.json…?");
-
-		// TODO Import account information
-	}
-
 	/**
 	 * @throws UserMigrationException
 	 */