From b52477958ecf4d66273e1c3d05f728ef3f8477fc Mon Sep 17 00:00:00 2001
From: catch <6915-catch@users.noreply.drupalcode.org>
Date: Wed, 17 Jul 2024 21:30:55 +0900
Subject: [PATCH] Issue #3458701 by yash.rode: Add validation constraints to
 user.mail

---
 .../migrate_drupal/tests/fixtures/drupal6.php | 56 +++++++++++++++++++
 .../migrate_drupal/tests/fixtures/drupal7.php | 22 ++++++++
 .../user/config/schema/user.schema.yml        |  2 +
 core/modules/user/migrations/d6_user_mail.yml | 16 ++++++
 core/modules/user/migrations/d7_user_mail.yml |  6 ++
 5 files changed, 102 insertions(+)

diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal6.php b/core/modules/migrate_drupal/tests/fixtures/drupal6.php
index 0a4a7411703..3c070915602 100644
--- a/core/modules/migrate_drupal/tests/fixtures/drupal6.php
+++ b/core/modules/migrate_drupal/tests/fixtures/drupal6.php
@@ -10660,6 +10660,26 @@ $connection->insert('i18n_variable')
   'language' => 'fr',
   'value' => 's:54:"fr - Account details for !username at !site (approved)";',
 ))
+->values(array(
+  'name' => 'user_mail_register_pending_approval_admin_subject',
+  'language' => 'fr',
+  'value' => 's:68:"fr - Account details for !username at !site (pending admin approval)";',
+))
+->values(array(
+  'name' => 'user_mail_register_pending_approval_admin_body',
+  'language' => 'fr',
+  'value' => 's:59:"fr - !username has applied for an account.\r\n\r\n!edit_uri";',
+))
+->values(array(
+  'name' => 'user_mail_status_canceled_subject',
+  'language' => 'fr',
+  'value' => 's:54:"fr - Account details for !username at !site (canceled)";',
+))
+->values(array(
+  'name' => 'user_mail_status_canceled_body',
+  'language' => 'fr',
+  'value' => 's:63:"fr - !username,\r\n\r\nYour account on !site has been canceled.";',
+))
 ->values(array(
   'name' => 'user_mail_status_blocked_body',
   'language' => 'fr',
@@ -10845,6 +10865,26 @@ $connection->insert('i18n_variable')
   'language' => 'zu',
   'value' => 's:49:"Account details for !username at !site (approved)";',
 ))
+->values(array(
+  'name' => 'user_mail_register_pending_approval_admin_subject',
+  'language' => 'zu',
+  'value' => 's:63:"Account details for !username at !site (pending admin approval)";',
+))
+->values(array(
+  'name' => 'user_mail_register_pending_approval_admin_body',
+  'language' => 'zu',
+  'value' => 's:54:"!username has applied for an account.\r\n\r\n!edit_uri";',
+))
+->values(array(
+  'name' => 'user_mail_status_canceled_subject',
+  'language' => 'zu',
+  'value' => 's:49:"Account details for !username at !site (canceled)";',
+))
+->values(array(
+  'name' => 'user_mail_status_canceled_body',
+  'language' => 'zu',
+  'value' => 's:58:"!username,\r\n\r\nYour account on !site has been canceled.";',
+))
 ->values(array(
   'name' => 'user_mail_status_blocked_body',
   'language' => 'zu',
@@ -50491,6 +50531,22 @@ $connection->insert('variable')
   'name' => 'user_mail_status_activated_subject',
   'value' => 's:49:"Account details for !username at !site (approved)";',
 ))
+->values(array(
+  'name' => 'user_mail_register_pending_approval_admin_subject',
+  'value' => 's:63:"Account details for !username at !site (pending admin approval)";',
+))
+->values(array(
+  'name' => 'user_mail_register_pending_approval_admin_body',
+  'value' => 's:54:"!username has applied for an account.\r\n\r\n!edit_uri";',
+))
+->values(array(
+  'name' => 'user_mail_status_canceled_subject',
+  'value' => 's:49:"Account details for !username at !site (canceled)";',
+))
+->values(array(
+  'name' => 'user_mail_status_canceled_body',
+  'value' => 's:54:"!username,\n\nYour account on !site has been canceled.";',
+))
 ->values(array(
   'name' => 'user_mail_status_blocked_body',
   'value' => "s:51:\"!username,\n\nYour account on !site has been blocked.\";",
diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal7.php b/core/modules/migrate_drupal/tests/fixtures/drupal7.php
index b5d57779ab8..3519f44e352 100644
--- a/core/modules/migrate_drupal/tests/fixtures/drupal7.php
+++ b/core/modules/migrate_drupal/tests/fixtures/drupal7.php
@@ -66220,6 +66220,14 @@ $connection->insert('variable')
   'name' => 'user_mail_status_activated_subject',
   'value' => 's:25:"Your account is approved!";',
 ))
+->values(array(
+  'name' => 'user_mail_register_pending_approval_admin_subject',
+  'value' => 's:34:"Account pending for admin approval";',
+))
+->values(array(
+  'name' => 'user_mail_register_pending_approval_admin_body',
+  'value' => 's:32:"You have applied for an account.";',
+))
 ->values(array(
   'name' => 'user_mail_status_blocked_body',
   'value' => 's:72:"You no longer please the robot overlords. Go to your room and chill out.";',
@@ -66532,6 +66540,20 @@ $connection->insert('variable_store')
   'value' => 'is - You no longer please the robot overlords. Go to your room and chill out.',
   'serialized' => '0',
 ))
+->values(array(
+  'realm' => 'language',
+  'realm_key' => 'is',
+  'name' => 'user_mail_register_pending_approval_admin_subject',
+  'value' => 'is - Account pending for admin approval',
+  'serialized' => '0',
+))
+->values(array(
+  'realm' => 'language',
+  'realm_key' => 'is',
+  'name' => 'user_mail_register_pending_approval_admin_body',
+  'value' => 'is - You have applied for an account.',
+  'serialized' => '0',
+))
 ->values(array(
   'realm' => 'language',
   'realm_key' => 'is',
diff --git a/core/modules/user/config/schema/user.schema.yml b/core/modules/user/config/schema/user.schema.yml
index 88ffa397815..699d0ee6fc5 100644
--- a/core/modules/user/config/schema/user.schema.yml
+++ b/core/modules/user/config/schema/user.schema.yml
@@ -71,6 +71,8 @@ user.settings:
 user.mail:
   type: config_object
   label: 'Email settings'
+  constraints:
+    FullyValidatable: ~
   mapping:
     cancel_confirm:
       type: mail
diff --git a/core/modules/user/migrations/d6_user_mail.yml b/core/modules/user/migrations/d6_user_mail.yml
index d80ed32c7b1..85a3164ad20 100644
--- a/core/modules/user/migrations/d6_user_mail.yml
+++ b/core/modules/user/migrations/d6_user_mail.yml
@@ -20,6 +20,10 @@ source:
     - user_mail_register_pending_approval_body
     - user_mail_status_blocked_subject
     - user_mail_status_blocked_body
+    - user_mail_register_pending_approval_admin_subject
+    - user_mail_register_pending_approval_admin_body
+    - user_mail_status_canceled_subject
+    - user_mail_status_canceled_body
   source_module: user
 process:
   'status_activated/subject':
@@ -64,6 +68,18 @@ process:
   'status_blocked/body':
     plugin: convert_tokens
     source: user_mail_status_blocked_body
+  'register_pending_approval_admin/subject':
+    plugin: convert_tokens
+    source: user_mail_register_pending_approval_admin_subject
+  'register_pending_approval_admin/body':
+    plugin: convert_tokens
+    source: user_mail_register_pending_approval_admin_body
+  'status_canceled/subject':
+    plugin: convert_tokens
+    source: user_mail_status_canceled_subject
+  'status_canceled/body':
+    plugin: convert_tokens
+    source: user_mail_status_canceled_body
 destination:
   plugin: config
   config_name: user.mail
diff --git a/core/modules/user/migrations/d7_user_mail.yml b/core/modules/user/migrations/d7_user_mail.yml
index c9209e1accf..8d38fee1940 100644
--- a/core/modules/user/migrations/d7_user_mail.yml
+++ b/core/modules/user/migrations/d7_user_mail.yml
@@ -20,6 +20,8 @@ source:
     - user_mail_register_pending_approval_body
     - user_mail_status_blocked_subject
     - user_mail_status_blocked_body
+    - user_mail_register_pending_approval_admin_subject
+    - user_mail_register_pending_approval_admin_body
   source_module: user
 process:
   'status_activated/subject': user_mail_status_activated_subject
@@ -36,6 +38,10 @@ process:
   'register_pending_approval/body': user_mail_register_pending_approval_body
   'status_blocked/subject': user_mail_status_blocked_subject
   'status_blocked/body': user_mail_status_blocked_body
+  'register_pending_approval_admin/subject': user_mail_register_pending_approval_admin_subject
+  'register_pending_approval_admin/body': user_mail_register_pending_approval_admin_body
+  'status_canceled/subject': user_mail_status_canceled_subject
+  'status_canceled/body': user_mail_status_canceled_body
 destination:
   plugin: config
   config_name: user.mail