FIX Export registered methods in enabled members report

src/Exception/AuthenticationFailedException.php

@@ -6,5 +6,4 @@
 
 class AuthenticationFailedException extends Exception
 {
-
 }

src/Exception/EncryptionAdapterException.php

@@ -9,5 +9,4 @@
  */
 class EncryptionAdapterException extends Exception
 {
-
 }

src/Exception/InvalidMethodException.php

@@ -6,5 +6,4 @@
 
 class InvalidMethodException extends LogicException
 {
-
 }

src/Exception/MemberNotFoundException.php

@@ -9,5 +9,4 @@
  */
 class MemberNotFoundException extends Exception
 {
-
 }

src/Exception/RegistrationFailedException.php

@@ -6,5 +6,4 @@
 
 class RegistrationFailedException extends LogicException
 {
-
 }

src/Extension/MemberExtension.php

@@ -69,6 +69,26 @@ public function setDefaultRegisteredMethod(RegisteredMethod $registeredMethod):
         return $this->owner;
     }
 
+    /**
+     * @return string
+     */
+    public function getDefaultRegisteredMethodName(): string
+    {
+        $method = $this->getDefaultRegisteredMethod();
+        return $method ? $method->getMethod()->getName() : '';
+    }
+
+    /**
+     * @return string
+     */
+    public function getRegisteredMethodNames(): string
+    {
+        $arr = array_map(function ($method) {
+            return $method->getMethod()->getName();
+        }, $this->owner->RegisteredMFAMethods()->toArray());
+        return implode(', ', $arr);
+    }
+
     public function updateCMSFields(FieldList $fields): FieldList
     {
         $fields->removeByName(['DefaultRegisteredMethodID', 'HasSkippedMFARegistration', 'RegisteredMFAMethods']);

src/Report/EnabledMembers.php

@@ -94,13 +94,11 @@ public function sourceRecords($params): DataList
     public function columns(): array
     {
         $columns = singleton(Member::class)->summaryFields() + [
-            'registeredMethods' => [
-                'title' => _t(__CLASS__ . '.COLUMN_METHODS_REGISTERED', 'Registered methods'),
-                'formatting' => [$this, 'formatMethodsColumn']
+            'RegisteredMethodNames' => [
+                'title' => _t(__CLASS__ . '.COLUMN_METHODS_REGISTERED', 'Registered methods')
             ],
-            'defaultMethodName' => [
-                'title' => _t(__CLASS__ . '.COLUMN_METHOD_DEFAULT', 'Default method'),
-                'formatting' => [$this, 'formatDefaultMethodColumn']
+            'DefaultRegisteredMethodName' => [
+                'title' => _t(__CLASS__ . '.COLUMN_METHOD_DEFAULT', 'Default method')
             ],
             'HasSkippedMFARegistration' => [
                 'title' => _t(__CLASS__ . '.COLUMN_SKIPPED_REGISTRATION', 'Skipped registration'),
@@ -153,6 +151,7 @@ public function parameterFields(): FieldList
      * @param null $_
      * @param Member $record
      * @return string
+     * @deprecated Will be removed in 5.0 use MemberExtension::getRegisteredMethodNames() instead
      */
     public function formatMethodsColumn($_, Member $record): string
     {
@@ -170,6 +169,7 @@ public function formatMethodsColumn($_, Member $record): string
      * @param null $_
      * @param Member&MemberExtension $record
      * @return string
+     * @deprecated Will be removed in 5.0 use MemberExtension::getDefaultRegisteredMethodName() instead
      */
     public function formatDefaultMethodColumn($_, Member $record): string
     {

src/State/AvailableMethodDetailsInterface.php

@@ -10,5 +10,4 @@
  */
 interface AvailableMethodDetailsInterface extends JsonSerializable
 {
-
 }

src/State/RegisteredMethodDetailsInterface.php

@@ -10,5 +10,4 @@
  */
 interface RegisteredMethodDetailsInterface extends JsonSerializable
 {
-
 }

tests/php/Extension/MemberExtensionTest.php

@@ -70,4 +70,27 @@ public function testSetDefaultRegisteredMethodThrowsExceptionWhenSettingSomeoneE
         $anotherMember = $this->objFromFixture(Member::class, 'squib');
         $anotherMember->setDefaultRegisteredMethod($registeredMethod);
     }
+
+    public function testGetDefaultRegisteredMethodName()
+    {
+        $member = $this->createMemberWithRegisteredMethods();
+        $this->assertSame('Recovery codes', $member->getDefaultRegisteredMethodName());
+    }
+
+    public function testGetRegisteredMethodNames()
+    {
+        $member = $this->createMemberWithRegisteredMethods();
+        $this->assertSame('Recovery codes, MemberExtensionTestMethod2', $member->getRegisteredMethodNames());
+    }
+
+    private function createMemberWithRegisteredMethods(): Member
+    {
+        $manager = RegisteredMethodManager::singleton();
+        $member = $this->objFromFixture(Member::class, 'squib');
+        $method = new Method();
+        $method2 = new MemberExtensionTestMethod2();
+        $manager->registerForMember($member, $method, ['foo' => 'bar']);
+        $manager->registerForMember($member, $method2, ['abc' => 'xyz']);
+        return $member;
+    }
 }

tests/php/Extension/MemberExtensionTestMethod2.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace SilverStripe\MFA\Tests\Extension;
+
+use SilverStripe\MFA\BackupCode\Method;
+
+/**
+ * This needs to be a separate class rather than an anonymous class
+ * because Injector in php 7.3 doesn't work with an anonmyous classes
+ * in this context
+ */
+class MemberExtensionTestMethod2 extends Method
+{
+    public function getName(): string
+    {
+        return 'MemberExtensionTestMethod2';
+    }
+    public function getURLSegment(): string
+    {
+        return 'MemberExtensionTestMethod2';
+    }
+}

tests/php/Stub/DuplicatedBasicMath/Method.php

@@ -9,5 +9,4 @@
  */
 class Method extends BasicMathMethod
 {
-
 }

tests/php/Stub/Null/RegisterHandler.php

@@ -10,7 +10,6 @@
 
 class RegisterHandler implements RegisterHandlerInterface, TestOnly
 {
-
     /**
      * Stores any data required to handle a registration process with a method, and returns relevant state to be applied
      * to the front-end application managing the process.