fixup! feat: support user migration

Signed-off-by: Christoph Wurst <[email protected]>

Author: ChristophWurst

lib/Controller/AccountsController.php

@@ -53,7 +53,8 @@ class AccountsController extends Controller {
 	private IRemoteHostValidator $hostValidator;
 	private MailboxSync $mailboxSync;
 
-	public function __construct(string $appName,
+	public function __construct(
+		string $appName,
 		IRequest $request,
 		AccountService $accountService,
 		$UserId,

lib/Db/MailAccount.php

@@ -302,7 +302,7 @@ public function toJson() {
 			'name' => $this->getName(),
 			'order' => $this->getOrder(),
 			'emailAddress' => $this->getEmail(),
-			'authMethod' => $this->authMethod,
+			'authMethod' => $this->getAuthMethod() ?? 'password',
 			'imapHost' => $this->getInboundHost(),
 			'imapPort' => $this->getInboundPort(),
 			'imapUser' => $this->getInboundUser(),

lib/Service/AccountService.php

@@ -11,7 +11,6 @@
 namespace OCA\Mail\Service;
 
 use OCA\Mail\Account;
-use OCA\Mail\AppInfo\Application;
 use OCA\Mail\BackgroundJob\PreviewEnhancementProcessingJob;
 use OCA\Mail\BackgroundJob\QuotaJob;
 use OCA\Mail\BackgroundJob\RepairSyncJob;

lib/UserMigration/MailAccountMigrator.php

@@ -63,7 +63,7 @@ public function export(IUser $user,
 						$output->writeln("Can not decrypt outbound password of account {$account->getId()}: " . $e->getMessage());
 					}
 				}
-			} else if ($account->getMailAccount()->getAuthMethod() === 'xoauth2') {
+			} elseif ($account->getMailAccount()->getAuthMethod() === 'xoauth2') {
 				$encryptedRefreshToken = $account->getMailAccount()->getOauthRefreshToken();
 				$encryptedAccessToken = $account->getMailAccount()->getOauthAccessToken();
 				if ($encryptedRefreshToken !== null) {
@@ -117,7 +117,7 @@ public function export(IUser $user,
 		$exportDestination->addFileContents('mail/accounts/index.json', json_encode($index));
 	}
 
-	public function import(IUser $user, IImportSource $importSource, OutputInterface $output,): void {
+	public function import(IUser $user, IImportSource $importSource, OutputInterface $output): void {
 		$index = json_decode($importSource->getFileContents('mail/accounts/index.json'), true);
 		foreach ($index as $accountFilePath) {
 			$accountData = json_decode($importSource->getFileContents($accountFilePath), true);
@@ -189,7 +189,7 @@ public function getVersion(): int {
 		return 01_00_00;
 	}
 
-	public function canImport(IImportSource $importSource,): bool {
+	public function canImport(IImportSource $importSource): bool {
 		try {
 			return $importSource->getMigratorVersion($this->getId()) <= $this->getVersion();
 		} catch (UserMigrationException) {

tests/Integration/Db/MailAccountTest.php

@@ -72,6 +72,7 @@ public function testToAPI() {
 			'outOfOfficeFollowsSystem' => true,
 			'debug' => false,
 			'classificationEnabled' => true,
+			'authMethod' => 'password',
 		], $a->toJson());
 	}
 
@@ -111,6 +112,7 @@ public function testMailAccountConstruct() {
 			'outOfOfficeFollowsSystem' => false,
 			'debug' => false,
 			'classificationEnabled' => true,
+			'authMethod' => 'password',
 		];
 		$a = new MailAccount($expected);
 		// TODO: fix inconsistency

tests/Unit/UserMigration/MailAccountMigratorTest.php

@@ -136,7 +136,7 @@ public function testExportBasicAccountInfo(): void {
 			]);
 		$exportDestination = $this->createMock(IExportDestination::class);
 		$exportDestination->method('addFileContents')
-			->willReturnCallback(function(string $path, string $content) {
+			->willReturnCallback(function (string $path, string $content) {
 				if ($path === 'mail/accounts/index.json') {
 					self::assertSame(
 						[
@@ -145,11 +145,11 @@ public function testExportBasicAccountInfo(): void {
 						],
 						json_decode($content, true)
 					);
-				} else if ($path === 'mail/accounts/101.json') {
+				} elseif ($path === 'mail/accounts/101.json') {
 					$accountData = json_decode($content, true);
 					self::assertArrayHasKey('id', $accountData);
 					self::assertSame(101, $accountData['id']);
-				} else if ($path === 'mail/accounts/102.json') {
+				} elseif ($path === 'mail/accounts/102.json') {
 					$accountData = json_decode($content, true);
 					self::assertArrayHasKey('id', $accountData);
 					self::assertSame(102, $accountData['id']);