Fix blank emails in exports

Author: jacksleight

src/Exporters/AbstractExporter.php

@@ -15,30 +15,30 @@ protected function getKeys()
     {
         return User::blueprint()
             ->fields()
-            ->except(['id', 'groups', 'roles', 'password'])
+            ->except(['groups', 'roles'])
             ->all()
             ->keys()
-            ->merge(['id', 'last_login'])
             ->merge(User::getComputedCallbacks()->keys())
+            ->merge(['id', 'last_login'])
+            ->reject('password')
             ->all();
     }
 
     protected function getData()
     {
         return Member::query()->get()
             ->map(function ($user) {
-                $data = $user->data();
-                $computedData = $user->computedData();
-
-                return collect($this->getKeys())
-                    ->flip()
-                    ->map(function ($field, $key) use ($data, $computedData) {
-                        return $data[$key] ?? $computedData[$key] ?? null;
-                    })
+                $data = $user->data()
+                    ->merge($user->computedData())
                     ->merge([
                         'id' => $user->id(),
+                        'email' => $user->email(),
                         'last_login' => $user->lastLogin(),
-                    ])
+                    ]);
+
+                return collect($this->getKeys())
+                    ->flip()
+                    ->map(fn ($field, $key) => $data->get($key))
                     ->all();
             })
             ->all();