Skip to content

Drop account export and import #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
come-nc merged 1 commit into from
Mar 7, 2022
Merged

Drop account export and import #46

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions lib/Service/UserMigrationService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
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;
Expand All @@ -53,8 +52,6 @@ class UserMigrationService {

protected IConfig $config;

protected IAccountManager $accountManager;

protected ITempManager $tempManager;

protected IUserManager $userManager;
Expand All @@ -67,15 +64,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;
Expand Down Expand Up @@ -106,12 +101,6 @@ public function export(IUser $user, ?OutputInterface $output = null): string {
$output
);

$this->exportAccountInformation(
$user,
$exportDestination,
$output
);

$this->exportAppsSettings(
$uid,
$exportDestination,
Expand Down Expand Up @@ -171,7 +160,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
Expand Down Expand Up @@ -230,30 +218,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
*/
Expand Down