Revert "refactor: add migration for email setting"

provokateurin · provokateurin · commit 820090999fa6 · 2025-04-07T10:25:35.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
@@ -717,7 +717,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;
 		}
 
@@ -873,7 +873,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
@@ -1284,7 +1284,6 @@
     'OC\\Core\\Migrations\\Version29000Date20240124132202' => $baseDir . '/core/Migrations/Version29000Date20240124132202.php',
     'OC\\Core\\Migrations\\Version29000Date20240131122720' => $baseDir . '/core/Migrations/Version29000Date20240131122720.php',
     'OC\\Core\\Migrations\\Version30000Date20240814180800' => $baseDir . '/core/Migrations/Version30000Date20240814180800.php',
-    'OC\\Core\\Migrations\\Version32000Date20250402182800' => $baseDir . '/core/Migrations/Version32000Date20250402182800.php',
     'OC\\Core\\Notification\\CoreNotifier' => $baseDir . '/core/Notification/CoreNotifier.php',
     'OC\\Core\\Service\\LoginFlowV2Service' => $baseDir . '/core/Service/LoginFlowV2Service.php',
     'OC\\DB\\Adapter' => $baseDir . '/lib/private/DB/Adapter.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
@@ -1317,7 +1317,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OC\\Core\\Migrations\\Version29000Date20240124132202' => __DIR__ . '/../../..' . '/core/Migrations/Version29000Date20240124132202.php',
         'OC\\Core\\Migrations\\Version29000Date20240131122720' => __DIR__ . '/../../..' . '/core/Migrations/Version29000Date20240131122720.php',
         'OC\\Core\\Migrations\\Version30000Date20240814180800' => __DIR__ . '/../../..' . '/core/Migrations/Version30000Date20240814180800.php',
-        'OC\\Core\\Migrations\\Version32000Date20250402182800' => __DIR__ . '/../../..' . '/core/Migrations/Version32000Date20250402182800.php',
         'OC\\Core\\Notification\\CoreNotifier' => __DIR__ . '/../../..' . '/core/Notification/CoreNotifier.php',
         'OC\\Core\\Service\\LoginFlowV2Service' => __DIR__ . '/../../..' . '/core/Service/LoginFlowV2Service.php',
         'OC\\DB\\Adapter' => __DIR__ . '/../../..' . '/lib/private/DB/Adapter.php',
diff --git a/lib/private/User/User.php b/lib/private/User/User.php
@@ -441,7 +441,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
`@@ -717,7 +717,7 @@ public function getEditableFieldsForUser(string $userId): DataResponse {`
`717`	`717`	`}`
`718`	`718`
`719`	`719`	`// Fallback to display name value to avoid changing behavior with the new option.`
`720`		`- if ($this->config->getSystemValue('allow_user_to_change_email', true)) {`
	`720`	`+ if ($this->config->getSystemValue('allow_user_to_change_email', $allowDisplayNameChange)) {`
`721`	`721`	`$permittedFields[] = IAccountManager::PROPERTY_EMAIL;`
`722`	`722`	`}`
`723`	`723`
`@@ -873,7 +873,8 @@ public function editUser(string $userId, string $key, string $value): DataRespon`
`873`	`873`	`$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;`
`874`	`874`	`}`
`875`	`875`
`876`		`- if ($this->config->getSystemValue('allow_user_to_change_email', true)) {`
	`876`	`+ // Fallback to display name value to avoid changing behavior with the new option.`
	`877`	`+ if ($this->config->getSystemValue('allow_user_to_change_email', $allowDisplayNameChange)) {`
`877`	`878`	`$permittedFields[] = IAccountManager::PROPERTY_EMAIL;`
`878`	`879`	`}`
`879`	`880`
Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,8 @@ public function canChangeDisplayName() {`
`441`	`441`	`}`
`442`	`442`
`443`	`443`	`public function canChangeEmail(): bool {`
`444`		`- return $this->config->getSystemValueBool('allow_user_to_change_email', true);`
	`444`	`+ // Fallback to display name value to avoid changing behavior with the new option.`
	`445`	`+ return $this->config->getSystemValueBool('allow_user_to_change_email', $this->config->getSystemValueBool('allow_user_to_change_display_name', true));`
`445`	`446`	`}`
`446`	`447`
`447`	`448`	`/**`