fix: use private $member property

silverstripe · Oct 25, 2024 · 5ffc710 · 5ffc710
1 parent 2ab7b64
commit 5ffc710
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/src/FormField/RegisteredMFAMethodListField.php b/src/FormField/RegisteredMFAMethodListField.php
@@ -16,6 +16,11 @@
 
 class RegisteredMFAMethodListField extends FormField
 {
+    /**
+     * @var Member
+     */
+    private $member;
+
     /**
      * {@inheritDoc}
      *
@@ -44,22 +49,22 @@ public function getSchemaDataDefaults()
         $generator = SchemaGenerator::create();
 
         if (!$this->value && $this->getForm() && $this->getForm()->getRecord() instanceof Member) {
-            $member = $this->getForm()->getRecord();
+            $this->member = $this->getForm()->getRecord();
         } else {
-            $member = DataObject::get_by_id(Member::class, $this->value);
+            $this->member = DataObject::get_by_id(Member::class, $this->value);
         }
 
         return array_merge($defaults, [
-            'schema' => $generator->getSchema($member) + [
+            'schema' => $generator->getSchema($this->member) + [
                 'endpoints' => [
                     'register' => $adminController->Link('register/{urlSegment}'),
                     'remove' => $adminController->Link('method/{urlSegment}'),
                     'setDefault' => $adminController->Link('method/{urlSegment}/default'),
                 ],
                 // We need all available methods so we can re-register pre-existing methods
                 'allAvailableMethods' => $generator->getAvailableMethods(),
-                'backupCreatedDate' => $this->getBackupMethod($member)
-                    ? $this->getBackupMethod($member)->Created
+                'backupCreatedDate' => $this->getBackupMethod()
+                    ? $this->getBackupMethod()->Created
                     : null,
                 'resetEndpoint' => SecurityAdmin::singleton()->Link("users/reset/{$this->value}"),
                 'isMFARequired' => EnforcementManager::create()->isMFARequired(),
@@ -70,12 +75,14 @@ public function getSchemaDataDefaults()
     /**
      * Get the registered backup method (if any) from the currently logged in user.
      *
-     * @param Member $member
      * @return RegisteredMethod|null
      */
-    protected function getBackupMethod(Member $member): ?RegisteredMethod
+    protected function getBackupMethod(): ?RegisteredMethod
     {
         $backupMethod = MethodRegistry::singleton()->getBackupMethod();
-        return RegisteredMethodManager::singleton()->getFromMember($member, $backupMethod);
+        return RegisteredMethodManager::singleton()->getFromMember(
+            $this->member ?? Security::getCurrentUser(),
+            $backupMethod
+        );
     }
 }