Merge pull request #35804 from nextcloud/backport/34629/stable24

[stable24] Fix case sensitivity of email when saving settings
nextcloud · Dec 19, 2022 · 8dc6516 · 8dc6516
2 parents 05d96e0 + 28aaa5a
commit 8dc6516
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/apps/settings/lib/Controller/UsersController.php b/apps/settings/lib/Controller/UsersController.php
@@ -484,7 +484,7 @@ protected function saveUserSettings(IAccount $userAccount): void {
 
 		$oldEmailAddress = $userAccount->getUser()->getSystemEMailAddress();
 		$oldEmailAddress = strtolower((string)$oldEmailAddress);
-		if ($oldEmailAddress !== $userAccount->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue()) {
+		if ($oldEmailAddress !== strtolower($userAccount->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue())) {
 			// this is the only permission a backend provides and is also used
 			// for the permission of setting a email address
 			if (!$userAccount->getUser()->canChangeDisplayName()) {

diff --git a/apps/settings/tests/Controller/UsersControllerTest.php b/apps/settings/tests/Controller/UsersControllerTest.php
@@ -624,7 +624,7 @@ public function testSaveUserSettings($data,
 		$user->method('getSystemEMailAddress')->willReturn($oldEmailAddress);
 		$user->method('canChangeDisplayName')->willReturn(true);
 
-		if ($data[IAccountManager::PROPERTY_EMAIL]['value'] === $oldEmailAddress ||
+		if (strtolower($data[IAccountManager::PROPERTY_EMAIL]['value']) === strtolower($oldEmailAddress) ||
 			($oldEmailAddress === null && $data[IAccountManager::PROPERTY_EMAIL]['value'] === '')) {
 			$user->expects($this->never())->method('setSystemEMailAddress');
 		} else {
@@ -720,6 +720,14 @@ public function dataTestSaveUserSettings() {
 				'john@example.com',
 				null
 			],
+			[
+				[
+					IAccountManager::PROPERTY_EMAIL => ['value' => 'john@example.com'],
+					IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
+				],
+				'JOHN@example.com',
+				null
+			],
 
 		];
 	}