Merge pull request #30491 from nextcloud/fix/30374/email-verification

Fix email verification

Author: blizzz

lib/private/Accounts/AccountManager.php

@@ -388,7 +388,10 @@ protected function checkEmailVerification(IAccount $updatedAccount, array $oldDa
 		} catch (PropertyDoesNotExistException $e) {
 			return;
 		}
-		$oldMail = isset($oldData[self::PROPERTY_EMAIL]) ? $oldData[self::PROPERTY_EMAIL]['value']['value'] : '';
+
+		$oldMailIndex = array_search(self::PROPERTY_EMAIL, array_column($oldData, 'name'), true);
+		$oldMail = $oldMailIndex !== false ? $oldData[$oldMailIndex]['value'] : '';
+
 		if ($oldMail !== $property->getValue()) {
 			$this->jobList->add(
 				VerifyUserData::class,

tests/lib/Accounts/AccountManagerTest.php

@@ -24,6 +24,7 @@
 
 use OC\Accounts\Account;
 use OC\Accounts\AccountManager;
+use OCA\Settings\BackgroundJobs\VerifyUserData;
 use OCP\Accounts\IAccountManager;
 use OCP\BackgroundJob\IJobList;
 use OCP\Defaults;
@@ -770,4 +771,42 @@ public function searchDataProvider(): array {
 			],
 		];
 	}
+
+	public function dataCheckEmailVerification(): array {
+		return [
+			[$this->makeUser('steve', 'Steve Smith', '[email protected]'), null],
+			[$this->makeUser('emma', 'Emma Morales', '[email protected]'), '[email protected]'],
+			[$this->makeUser('[email protected]', 'Sarah Foster', '[email protected]'), null],
+			[$this->makeUser('[email protected]', 'Cole Harrison', '[email protected]'), '[email protected]'],
+			[$this->makeUser('8d29e358-cf69-4849-bbf9-28076c0b908b', 'Alice McPherson', '[email protected]'), '[email protected]'],
+			[$this->makeUser('11da2744-3f4d-4c17-8c13-4c057a379237', 'James Loranger', '[email protected]'), ''],
+		];
+	}
+
+	/**
+	 * @dataProvider dataCheckEmailVerification
+	 */
+	public function testCheckEmailVerification(IUser $user, ?string $newEmail): void {
+		$account = $this->accountManager->getAccount($user);
+		$emailUpdated = false;
+
+		if (!empty($newEmail)) {
+			$account->getProperty(IAccountManager::PROPERTY_EMAIL)->setValue($newEmail);
+			$emailUpdated = true;
+		}
+
+		if ($emailUpdated) {
+			$this->jobList->expects($this->once())
+				->method('add')
+				->with(VerifyUserData::class);
+		} else {
+			$this->jobList->expects($this->never())
+				->method('add')
+				->with(VerifyUserData::class);
+		}
+
+		/** @var array $oldData */
+		$oldData = $this->invokePrivate($this->accountManager, 'getUser', [$user, false]);
+		$this->invokePrivate($this->accountManager, 'checkEmailVerification', [$account, $oldData]);
+	}
 }