Merge branch '5.3' into 5

silverstripe · Jan 29, 2025 · f48a01e · f48a01e
2 parents 31e5e4f + 690838b
commit f48a01e
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 4 deletions.
diff --git a/src/Security/MemberAuthenticator/LostPasswordForm.php b/src/Security/MemberAuthenticator/LostPasswordForm.php
@@ -6,6 +6,8 @@
 use SilverStripe\Forms\EmailField;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\FormAction;
+use SilverStripe\Forms\TextField;
+use SilverStripe\Security\Member;
 
 /**
  * Class LostPasswordForm handles the requests for lost password form generation
@@ -23,9 +25,15 @@ class LostPasswordForm extends MemberLoginForm
      */
     public function getFormFields()
     {
-        return FieldList::create(
-            EmailField::create('Email', _t('SilverStripe\\Security\\Member.EMAIL', 'Email'))
-        );
+        $uniqueIdentifier = Member::config()->get('unique_identifier_field');
+        $label = Member::singleton()->fieldLabel($uniqueIdentifier);
+        if ($uniqueIdentifier === 'Email') {
+            $emailField = EmailField::create('Email', $label);
+        } else {
+            // This field needs to still be called Email, but we can re-label it
+            $emailField = TextField::create('Email', $label);
+        }
+        return FieldList::create($emailField);
     }
 
     /**

diff --git a/tests/php/Security/MemberTest.php b/tests/php/Security/MemberTest.php
@@ -1033,7 +1033,7 @@ public function testUpdateCMSFields()
     public function testMap_in_groupsReturnsAll()
     {
         $members = Member::map_in_groups();
-        $this->assertEquals(17, $members->count(), 'There are 16 members in the mock plus a fake admin');
+        $this->assertEquals(18, $members->count(), 'There are 17 members in the mock plus a fake admin');
     }
 
     /**

diff --git a/tests/php/Security/MemberTest.yml b/tests/php/Security/MemberTest.yml
@@ -92,3 +92,6 @@
   delocalemember:
     Email: [email protected]
     Locale: de_DE
+  username-member:
+    Email: [email protected]
+    Username: username1234
diff --git a/tests/php/Security/SecurityTest.php b/tests/php/Security/SecurityTest.php
@@ -485,6 +485,28 @@ public function testChangePasswordForLoggedInUsers()
         $this->assertEquals($this->idFromFixture(Member::class, 'test'), $this->session()->get('loggedInAs'));
     }
 
+    public function testLostPasswordFormWithUniqueFieldIdentifier()
+    {
+        // override the unique identifier field
+        Member::config()->set('unique_identifier_field', 'Username');
+
+        /** @var Member $admin */
+        $member = $this->objFromFixture(Member::class, 'username-member');
+        $member->FailedLoginCount = 99;
+        $member->LockedOutUntil = DBDatetime::now()->getValue();
+        $member->write();
+
+        // load lostpassword form
+        $this->get('Security/lostpassword');
+        $labelElement = $this->cssParser()->getBySelector('#LostPasswordForm_lostPasswordForm_Email_Holder label');
+
+        $this->assertEquals(1, count($labelElement ?? []));
+        $this->assertStringContainsString(
+            '<label class="left" for="LostPasswordForm_lostPasswordForm_Email">Username</label>',
+            (string)$labelElement[0]->asXML()
+        );
+    }
+
     public function testChangePasswordFromLostPassword()
     {
         /** @var Member $admin */