Merge pull request #350 from UN-OCHA/OPS-11223-user_expire-update

chore: remove patch and update user_expire module

composer.json

@@ -50,7 +50,7 @@
         "drupal/seckit": "^2.0",
         "drupal/social_auth_hid": "^3.2",
         "drupal/stage_file_proxy": "^3",
-        "drupal/user_expire": "^1.1",
+        "drupal/user_expire": "^2",
         "drupal/username_enumeration_prevention": "^1.3",
         "drupal/view_unpublished": "^1.1",
         "drush/drush": "^12",
@@ -190,4 +190,4 @@
         }
     },
     "version": "2.1.10"
-}
+}

composer.patches.json

@@ -10,7 +10,6 @@
             "Consolidated fixes for issues 3345123 and 3345129": "PATCHES/paragraphs_viewmode-consolidated-fixes-3345123-3345129.patch"
         },
         "drupal/user_expire": {
-            "Allow the notification email to be customised": "PATCHES/user_expire-customize-notification-email.patch",
             "Reset expiration when user is reactivated": "PATCHES/user_expire-reset-expiration-on-reactivation.patch"
         },
         "drupal/username_enumeration_prevention": {

config/user_expire.settings.yml

@@ -1,10 +1,15 @@
 _core:
   default_config_hash: PeDvVH4C3IZ7QFkvC1BUv3BZJVc7jLwQmJAEttVuVOw
 frequency: 432000
-mail:
-  subject: '[site:name]: Account expiration warning'
-  body: "Hello [user:display-name]\r\n\r\nBecause you have not logged in recently, your account at [site:name] will be de-activated in the near future. If you still use this site, please log in [site:login-url] to avoid having your account de-activated.\r\n\r\nThanks, [site:name]"
 offset: 604800
-send_mail: 1
 user_expire_roles:
   authenticated: 15552000
+send_expiration_warnings: true
+expiration_warning_mail:
+  subject: "[site:name]: Account expiration warning"
+  body: |-
+    Hello [user:display-name]
+
+    Because you have not logged in recently, your account at [site:name] will be blocked in the near future. If you still use this site, log in now [site:login-url] to prevent your account being blocked.
+
+    -- [site:name] team