[Experimental] Fix user transformation and update tests for 2FA and identifier attributes

Author: TekExplorer

app/Transformers/Api/Client/UserTransformer.php

@@ -30,14 +30,14 @@ public function transform(User $model): array
             'email' => $model->email,
             'image' => 'https://gravatar.com/avatar/' . md5(Str::lower($model->email)),
             // which do we prefer?
-            'admin' => (bool) $user->root_admin,
-            'root_admin' => (bool) $user->root_admin,
-            '2fa_enabled' => $model->use_totp,
+            'admin' => (bool) $model->root_admin,
+            'root_admin' => (bool) $model->root_admin,
+            '2fa_enabled' => (bool) $model->use_totp,
             'first_name' => $model->name_first,
             'last_name' => $model->name_last,
             'language' => $model->language,
-            'created_at' => $this->formatTimestamp($user->created_at),
-            'updated_at' => $this->formatTimestamp($user->updated_at),
+            'created_at' => $this->formatTimestamp($model->created_at),
+            'updated_at' => $this->formatTimestamp($model->updated_at),
         ];
     }
 }

tests/Integration/Api/Application/Users/UserControllerTest.php

@@ -56,8 +56,8 @@ public function testGetUsers()
                     'last_name' => $this->getApiUser()->name_last,
                     'language' => $this->getApiUser()->language,
                     'root_admin' => $this->getApiUser()->root_admin,
-                    '2fa_enabled' => (bool) $this->getApiUser()->totp_enabled,
-                    '2fa' => (bool) $this->getApiUser()->totp_enabled,
+                    '2fa_enabled' => (bool) $this->getApiUser()->use_totp,
+                    '2fa' => (bool) $this->getApiUser()->use_totp,
                     'created_at' => $this->formatTimestamp($this->getApiUser()->created_at),
                     'updated_at' => $this->formatTimestamp($this->getApiUser()->updated_at),
                 ],
@@ -74,8 +74,8 @@ public function testGetUsers()
                     'last_name' => $user->name_last,
                     'language' => $user->language,
                     'root_admin' => (bool) $user->root_admin,
-                    '2fa_enabled' => (bool) $user->totp_enabled,
-                    '2fa' => (bool) $user->totp_enabled,
+                    '2fa_enabled' => (bool) $user->use_totp,
+                    '2fa' => (bool) $user->use_totp,
                     'created_at' => $this->formatTimestamp($user->created_at),
                     'updated_at' => $this->formatTimestamp($user->updated_at),
                 ],

tests/Integration/Api/Client/AccountControllerTest.php

@@ -27,6 +27,7 @@ public function testAccountDetailsAreReturned()
             'attributes' => [
                 'id' => $user->id,
                 'uuid' => $user->uuid,
+                'identifier' => $user->identifier,
                 // TODO: pick one or keep both
                 'admin' => false,
                 'root_admin' => false,