Include computed data in members export

Author: jacksleight

src/Exporters/AbstractExporter.php

@@ -11,18 +11,29 @@ abstract public function contentType();
 
     abstract public function export();
 
+    protected function getKeys()
+    {
+        return User::blueprint()
+            ->fields()
+            ->except(['id', 'groups', 'roles', 'password'])
+            ->all()
+            ->keys()
+            ->merge(['id', 'last_login'])
+            ->merge(User::getComputedCallbacks()->keys())
+            ->all();
+    }
+
     protected function getData()
     {
         return Member::query()->get()
             ->map(function ($user) {
                 $data = $user->data();
+                $computedData = $user->computedData();
 
-                return User::blueprint()->fields()->all()->keys()->flip()
-                    ->reject(function ($field, $key) {
-                        return in_array($key, ['id', 'groups', 'roles', 'password']);
-                    })
-                    ->map(function ($field, $key) use ($data) {
-                        return $data[$key] ?? null;
+                return collect($this->getKeys())
+                    ->flip()
+                    ->map(function ($field, $key) use ($data, $computedData) {
+                        return $data[$key] ?? $computedData[$key] ?? null;
                     })
                     ->merge([
                         'id' => $user->id(),

src/Exporters/CsvExporter.php

@@ -4,7 +4,6 @@
 
 use League\Csv\Writer;
 use SplTempFileObject;
-use Statamic\Facades\User;
 
 class CsvExporter extends AbstractExporter
 {
@@ -22,23 +21,12 @@ public function contentType()
 
     public function export()
     {
-        $this->writer->insertOne($this->getHeaders());
+        $this->writer->insertOne($this->getKeys());
         $this->writer->insertAll($this->getData());
 
         return (string) $this->writer;
     }
 
-    protected function getHeaders()
-    {
-        return User::blueprint()
-            ->fields()
-            ->except(['id', 'groups', 'roles', 'password'])
-            ->all()
-            ->keys()
-            ->merge(['id', 'last_login'])
-            ->all();
-    }
-
     protected function getData()
     {
         return collect(parent::getData())