From d7f92bf3b27e956f84c354239a256101e099ab92 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Mon, 1 Jun 2020 09:07:26 +0800
Subject: [PATCH] tweak user API

---
 app/Http/Controllers/UserController.php               | 10 ++++------
 tests/HttpTest/ControllersTest/UserControllerTest.php | 10 +---------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 7887a106..f926c354 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -21,12 +21,10 @@ class UserController extends Controller
 {
     public function user()
     {
-        $user = auth()
-            ->user()
-            ->makeHidden(['password', 'ip', 'remember_token', 'verification_token'])
-            ->toArray();
-
-        return json('', 0, $user);
+        /** @var User */
+        $user = auth()->user();
+        return $user
+            ->makeHidden(['password', 'ip', 'remember_token', 'verification_token']);
     }
 
     public function index(Filter $filter)
diff --git a/tests/HttpTest/ControllersTest/UserControllerTest.php b/tests/HttpTest/ControllersTest/UserControllerTest.php
index f7c6e44e..46eb15a7 100644
--- a/tests/HttpTest/ControllersTest/UserControllerTest.php
+++ b/tests/HttpTest/ControllersTest/UserControllerTest.php
@@ -23,15 +23,7 @@ class UserControllerTest extends TestCase
         $user = factory(User::class)->create();
         $this->actingAs($user, 'jwt')
             ->get('/api/user')
-            ->assertJson([
-                'code' => 0,
-                'data' => [
-                    'uid' => $user->uid,
-                    'email' => $user->email,
-                    'nickname' => $user->nickname,
-                    'score' => $user->score,
-                ],
-            ]);
+            ->assertJson($user->toArray());
     }
 
     public function testIndex()