refactor: add migration for email setting

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

Author: susnux

apps/provisioning_api/lib/Controller/UsersController.php

@@ -751,7 +751,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', $allowDisplayNameChange)) {
+		if ($this->config->getSystemValue('allow_user_to_change_email', true)) {
 			$permittedFields[] = IAccountManager::PROPERTY_EMAIL;
 		}
 
@@ -911,8 +911,7 @@ public function editUser(string $userId, string $key, string $value): DataRespon
 				$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;
 			}
 
-			// Fallback to display name value to avoid changing behavior with the new option.
-			if ($this->config->getSystemValue('allow_user_to_change_email', $allowDisplayNameChange)) {
+			if ($this->config->getSystemValue('allow_user_to_change_email', true)) {
 				$permittedFields[] = IAccountManager::PROPERTY_EMAIL;
 			}
 

core/Migrations/Version32000Date20250402182800.php

@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OC\Core\Migrations;
+
+use OCP\IConfig;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+/**
+ * Add `allow_user_to_change_email` system config
+ */
+class Version32000Date20250402182800 extends SimpleMigrationStep {
+
+	public function __construct(
+		private IConfig $config,
+	) {
+	}
+
+	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+		$allowDisplayName = $this->config->getSystemValue('allow_user_to_change_display_name', null);
+		$allowEmail = $this->config->getSystemValue('allow_user_to_change_email', null);
+
+		// if displayname was set, but not the email setting, then set the email setting to the same as the email setting
+		if ($allowDisplayName !== null && $allowEmail === null) {
+			$this->config->setSystemValue('allow_user_to_change_email', $allowDisplayName === true);
+		}
+	}
+
+}

lib/composer/composer/autoload_classmap.php

@@ -1377,6 +1377,7 @@
     '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',

lib/composer/composer/autoload_static.php

@@ -1410,6 +1410,7 @@ 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',

lib/private/User/User.php

@@ -429,8 +429,7 @@ public function canChangeDisplayName() {
 	}
 
 	public function canChangeEmail(): bool {
-		// 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));
+		return $this->config->getSystemValueBool('allow_user_to_change_email', true);
 	}
 
 	/**

version.php

@@ -9,7 +9,7 @@
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patch level
 // when updating major/minor version number.
 
-$OC_Version = [30, 0, 8, 1];
+$OC_Version = [30, 0, 8, 2];
 
 // The human-readable string
 $OC_VersionString = '30.0.8';