Revert "refactor: add migration for email setting"

provokateurin · provokateurin · commit d44b42fd240d · 2025-04-07T10:23:23.000+02:00
This reverts commit e7859f0. Signed-off-by: provokateurin <kate@provokateurin.de>
diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php
@@ -753,7 +753,7 @@ public function getEditableFieldsForUser(string $userId): DataResponse {
 		}
 
 		// Fallback to display name value to avoid changing behavior with the new option.
-		if ($this->config->getSystemValue('allow_user_to_change_email', true)) {
+		if ($this->config->getSystemValue('allow_user_to_change_email', $allowDisplayNameChange)) {
 			$permittedFields[] = IAccountManager::PROPERTY_EMAIL;
 		}
 
@@ -913,7 +913,8 @@ public function editUser(string $userId, string $key, string $value): DataRespon
 				$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;
 			}
 
-			if ($this->config->getSystemValue('allow_user_to_change_email', true)) {
+			// Fallback to display name value to avoid changing behavior with the new option.
+			if ($this->config->getSystemValue('allow_user_to_change_email', $allowDisplayNameChange)) {
 				$permittedFields[] = IAccountManager::PROPERTY_EMAIL;
 			}
 
diff --git a/core/Migrations/Version32000Date20250402182800.php b/core/Migrations/Version32000Date20250402182800.php
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
@@ -1377,7 +1377,6 @@
     'OC\\Core\\Migrations\\Version30000Date20240814180800' => $baseDir . '/core/Migrations/Version30000Date20240814180800.php',
     'OC\\Core\\Migrations\\Version30000Date20240815080800' => $baseDir . '/core/Migrations/Version30000Date20240815080800.php',
     'OC\\Core\\Migrations\\Version30000Date20240906095113' => $baseDir . '/core/Migrations/Version30000Date20240906095113.php',
-    'OC\\Core\\Migrations\\Version32000Date20250402182800' => $baseDir . '/core/Migrations/Version32000Date20250402182800.php',
     'OC\\Core\\Notification\\CoreNotifier' => $baseDir . '/core/Notification/CoreNotifier.php',
     'OC\\Core\\ResponseDefinitions' => $baseDir . '/core/ResponseDefinitions.php',
     'OC\\Core\\Service\\LoginFlowV2Service' => $baseDir . '/core/Service/LoginFlowV2Service.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
@@ -1410,7 +1410,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OC\\Core\\Migrations\\Version30000Date20240814180800' => __DIR__ . '/../../..' . '/core/Migrations/Version30000Date20240814180800.php',
         'OC\\Core\\Migrations\\Version30000Date20240815080800' => __DIR__ . '/../../..' . '/core/Migrations/Version30000Date20240815080800.php',
         'OC\\Core\\Migrations\\Version30000Date20240906095113' => __DIR__ . '/../../..' . '/core/Migrations/Version30000Date20240906095113.php',
-        'OC\\Core\\Migrations\\Version32000Date20250402182800' => __DIR__ . '/../../..' . '/core/Migrations/Version32000Date20250402182800.php',
         'OC\\Core\\Notification\\CoreNotifier' => __DIR__ . '/../../..' . '/core/Notification/CoreNotifier.php',
         'OC\\Core\\ResponseDefinitions' => __DIR__ . '/../../..' . '/core/ResponseDefinitions.php',
         'OC\\Core\\Service\\LoginFlowV2Service' => __DIR__ . '/../../..' . '/core/Service/LoginFlowV2Service.php',
diff --git a/lib/private/User/User.php b/lib/private/User/User.php
@@ -429,7 +429,8 @@ public function canChangeDisplayName() {
 	}
 
 	public function canChangeEmail(): bool {
-		return $this->config->getSystemValueBool('allow_user_to_change_email', true);
+		// Fallback to display name value to avoid changing behavior with the new option.
+		return $this->config->getSystemValueBool('allow_user_to_change_email', $this->config->getSystemValueBool('allow_user_to_change_display_name', true));
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -753,7 +753,7 @@ public function getEditableFieldsForUser(string $userId): DataResponse {`
`753`	`753`	`}`
`754`	`754`
`755`	`755`	`// Fallback to display name value to avoid changing behavior with the new option.`
`756`		`- if ($this->config->getSystemValue('allow_user_to_change_email', true)) {`
	`756`	`+ if ($this->config->getSystemValue('allow_user_to_change_email', $allowDisplayNameChange)) {`
`757`	`757`	`$permittedFields[] = IAccountManager::PROPERTY_EMAIL;`
`758`	`758`	`}`
`759`	`759`
`@@ -913,7 +913,8 @@ public function editUser(string $userId, string $key, string $value): DataRespon`
`913`	`913`	`$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;`
`914`	`914`	`}`
`915`	`915`
`916`		`- if ($this->config->getSystemValue('allow_user_to_change_email', true)) {`
	`916`	`+ // Fallback to display name value to avoid changing behavior with the new option.`
	`917`	`+ if ($this->config->getSystemValue('allow_user_to_change_email', $allowDisplayNameChange)) {`
`917`	`918`	`$permittedFields[] = IAccountManager::PROPERTY_EMAIL;`
`918`	`919`	`}`
`919`	`920`
Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,8 @@ public function canChangeDisplayName() {`
`429`	`429`	`}`
`430`	`430`
`431`	`431`	`public function canChangeEmail(): bool {`
`432`		`- return $this->config->getSystemValueBool('allow_user_to_change_email', true);`
	`432`	`+ // Fallback to display name value to avoid changing behavior with the new option.`
	`433`	`+ return $this->config->getSystemValueBool('allow_user_to_change_email', $this->config->getSystemValueBool('allow_user_to_change_display_name', true));`
`433`	`434`	`}`
`434`	`435`
`435`	`436`	`/**`