Merge branch 'ISAICP-9554' into 'develop'

ISAICP-9554: Update the text of the email new users receive after registration

See merge request digit/digit-joinup-dev!1999

config/sync/user.mail.yml

@@ -64,7 +64,9 @@ register_pending_approval:
   body: |-
     Dear [user:field_user_first_name],
 
-    Thank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to sign in, and other details.
+    Thank you for registering on the [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to sign in and other details.
+
+    We would like to inform you that our system automatically places accounts registered with certain generic email domains under review. This measure helps us maintain the integrity of the platform by minimising the risk of spam or misuse. If your account has not been validated in the following 3 business days, please contact us through our <a href="[site:contact-form]">contact form</a>.
 
     Kind regards,
 
@@ -125,4 +127,4 @@ status_canceled:
 
     Kind regards,
 
-    The Portal Support Team
\ No newline at end of file
+    The Portal Support Team

resources/runner/drupal.yml

@@ -40,6 +40,7 @@ drupal:
         - Permissions
         - Null mail collector
         - EU OSS Catalogue
+        - String overrides
       site-clone:
         - Main settings
         - Databases
@@ -60,6 +61,7 @@ drupal:
         - Monolog
         - EU OSS Catalogue
         - Stage file proxy
+        - String overrides
       site-clean:
         - Main settings
         - Databases
@@ -82,6 +84,7 @@ drupal:
         - Monolog
         - EU OSS Catalogue
         - Stage file proxy
+        - String overrides
       behat:
         - Main settings
         - Databases
@@ -103,6 +106,8 @@ drupal:
         - Test mail collector
         - Monolog
         - EU OSS Catalogue
+        - String overrides
+        - Visitors can create their own accounts
       phpunit:
         - Main settings
         - Databases
@@ -124,6 +129,7 @@ drupal:
         - Custom queue services
         - Monolog
         - EU OSS Catalogue
+        - String overrides
       prod:
         - Main settings
         - Site email
@@ -144,6 +150,7 @@ drupal:
         - Varnish purge
         - Reverse proxy
         - EU OSS Catalogue
+        - String overrides
       acc-override:
         - Stage file proxy
     header: |
@@ -366,6 +373,12 @@ drupal:
         $settings['reverse_proxy_trusted_headers'] = \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_FOR | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_HOST | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PORT | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PROTO;
       EU OSS Catalogue: |
         $settings['eu_oss_catalogue']['platform_github']['access_token'] = getenv('JOINUP_GITHUB_TOKEN');
+      String overrides: |
+        $settings['locale_custom_strings_en'][''] = [
+          'Thank you for applying for an account. Your account is currently pending approval by the site administrator.<br />In the meantime, a welcome message with further instructions has been sent to your email address.' => 'Thank you for applying for an account. Your account is currently pending approval by the site administrator. In the meantime, a welcome message has been sent to your email address. We would like to inform you that our system automatically places accounts registered with certain generic email domains under review. This measure helps us maintain the integrity of the platform by minimising the risk of spam or misuse. If your account has not been validated in the following 3 business days, please contact us through our <a href="/contact">contact form</a>.',
+        ];
+      Visitors can create their own accounts: |
+        $config['user.settings']['register'] = 'visitors';
       Stage file proxy: |
         $config['stage_file_proxy.settings']['hotlink'] = TRUE;
         $config['stage_file_proxy.settings']['origin'] = 'https://interoperable-europe.ec.europa.eu';

web/modules/custom/joinup_cas_mock_server/src/Config/JoinupCasMockServerConfigOverrider.php

@@ -8,7 +8,6 @@
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Config\ConfigFactoryOverrideInterface;
 use Drupal\Core\Config\StorageInterface;
-use Drupal\user\UserInterface;
 
 /**
  * Overrides some configs for testing purposes.
@@ -40,9 +39,6 @@ public function loadOverrides($names): array {
           'path' => 'p3/serviceValidate',
         ],
       ],
-      'user.settings' => [
-        'register' => UserInterface::REGISTER_VISITORS,
-      ],
     ];
   }
 

web/modules/custom/joinup_user/tests/src/ExistingSite/ApprovalRegistrationTest.php

+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\Tests\joinup_user\Functional;
+
+use Drupal\Tests\cas\Traits\CasTestTrait;
+use Drupal\Tests\joinup_test\ExistingSite\JoinupExistingSiteTestBase;
+
+/**
+ * Tests auto-registration with admin approval on registration.
+ *
+ * @group joinup_user
+ */
+class ApprovalRegistrationTest extends JoinupExistingSiteTestBase {
+
+  use CasTestTrait;
+
+  const string USERNAME = 'beavis';
+
+  /**
+   * Tests the massage when user requires admin approval.
+   */
+  public function testApprovalMessage(): void {
+    $assert = $this->assertSession();
+
+    $email = self::USERNAME . '@example.com';
+    $this->createCasUser(self::USERNAME, $email, 'needtp', [
+      'firstname' => 'Beavis',
+      'lastname' => 'El Gran Cornholio',
+    ]
+    );
+    $this->casLogin($email, 'needtp');
+
+    $assert->statusMessageContains('Thank you for applying for an account. Your account is currently pending approval by the site administrator. In the meantime, a welcome message has been sent to your email address.');
+    $assert->statusMessageContains('We would like to inform you that our system automatically places accounts registered with certain generic email domains under review.');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function tearDown(): void {
+    $account = user_load_by_name(self::USERNAME);
+    if ($account) {
+      $account->delete();
+    }
+  }
+
+}