[api] Fixed doc, removed server show user, added user data to accept

app/Http/Controllers/Client/ConnectController.php

@@ -39,6 +39,10 @@ class ConnectController extends Controller
      *      )
      *    ),
      *    @OA\Response(
+     *      response="404",
+     *      ref="#/components/responses/404"
+     *    ),
+     *    @OA\Response(
      *      response="422",
      *      ref="#/components/responses/422"
      *    ),
@@ -55,6 +59,11 @@ class ConnectController extends Controller
      *          property="port",
      *          type="integer"
      *        ),
+     *        @OA\Property(
+     *          property="pubkey",
+     *          type="string",
+     *          pattern="^-----BEGIN PUBLIC KEY-----(\n|\r|\r\n)([0-9a-zA-Z\+\/=]{64}(\n|\r|\r\n))*([0-9a-zA-Z\+\/=]{1,63}(\n|\r|\r\n))?-----END PUBLIC KEY-----$"
+     *        ),
      *      )
      *    ),
      *    security={{"jwt":{}}},

app/Http/Controllers/Server/AcceptController.php

@@ -4,7 +4,7 @@
 use App\Http\Controllers\Controller;
 use App\Models\User;
 use App\Http\Requests\AcceptRequest;
-use Auth;
+use Illuminate\Support\Facades\Auth;
 
 class AcceptController extends Controller
 {
@@ -37,12 +37,22 @@ class AcceptController extends Controller
      *      )
      *    ),
      *    @OA\Response(
+     *      response="404",
+     *      ref="#/components/responses/404"
+     *    ),
+     *    @OA\Response(
      *      response="422",
      *      ref="#/components/responses/422"
      *    ),
      *    @OA\Response(
-     *      response="204",
-     *      description="OK"
+     *      response="200",
+     *      description="OK",
+     *      @OA\JsonContent(
+     *        @OA\Property(
+     *          property="user",
+     *          ref="#/components/schemas/User"
+     *        ),
+     *      ),
      *    ),
      *    security={{"server-jwt":{}}},
      *  )
@@ -58,6 +68,8 @@ public function accept(AcceptRequest $request, $id) {
         }
 
         $user->connect($server);
-        return response()->noContent();
+        return response()->json([
+            "user" => $user
+        ], 200);
     }
 }

app/Http/Controllers/Server/DisconnectController.php

@@ -4,7 +4,7 @@
 use App\Http\Controllers\Controller;
 use App\Models\User;
 use App\Http\Requests\AcceptRequest;
-use Auth;
+use Illuminate\Support\Facades\Auth;
 
 class DisconnectController extends Controller
 {
@@ -12,7 +12,7 @@ class DisconnectController extends Controller
      *  @OA\Post(
      *    tags={"Servers:User"},
      *    path="/user/{id}/disconnect",
-     *    summary="Dicsonnect an user",
+     *    summary="Disconnect an user",
      *    @OA\Parameter(
      *      name="id",
      *      in="path",
@@ -24,6 +24,10 @@ class DisconnectController extends Controller
      *      ref="#/components/responses/401"
      *    ),
      *    @OA\Response(
+     *      response="404",
+     *      ref="#/components/responses/404"
+     *    ),
+     *    @OA\Response(
      *      response="403",
      *      description="Forbidden",
      *      @OA\JsonContent(

app/Http/Controllers/Shared/GameController.php

@@ -274,6 +274,10 @@ public function store(CreateGameRequest $request)
      *      ref="#/components/responses/403"
      *    ),
      *    @OA\Response(
+     *      response="404",
+     *      ref="#/components/responses/404"
+     *    ),
+     *    @OA\Response(
      *      response="422",
      *      ref="#/components/responses/422"
      *    ),

app/Http/Controllers/Shared/UserController.php

@@ -40,7 +40,7 @@ public function index()
 
     /**
      *  @OA\Get(
-     *    tags={"Clients:User", "Servers:User"},
+     *    tags={"Clients:User"},
      *    path="/user/{id}",
      *    summary="Get an user",
      *    @OA\Parameter(

routes/api.php

@@ -45,7 +45,7 @@
 
 Route::middleware(['api', 'auth:client'])->group(function () {
     Route::apiResource('server', Shared\ServerController::class);
-    Route::apiResource('user', Shared\UserController::class, ['only' => ['index']]);
+    Route::apiResource('user', Shared\UserController::class, ['only' => ['index', 'show']]);
     Route::apiResource('game', Shared\GameController::class, ['only' => ['index', 'show']]);
     Route::get('server/{id}/game' , [Shared\ServerController::class , 'index_games']);
     Route::get('user/{id}/game' , [Shared\UserController::class , 'index_usergame']);
@@ -63,10 +63,6 @@
     Route::resource('game', Shared\GameController::class, ['only' => ['store', 'update']]);
 });
 
-Route::middleware(['api', 'auth:client,server'])->group(function () {
-    Route::get('user/{id}', [Shared\UserController::class, 'show']);
-});
-
 Route::fallback(function () {
     abort(404, 'API resource not found');
 });

tests/Feature/ConnectTest.php

@@ -49,7 +49,15 @@ public function test_full_good() {
         ])->post('/api/user/' . $user->id . '/accept', [
             'token' => 'aef773374b964c42cbb44bf11452b8a912737ad3175341d1694591ef58a19ce4'
         ]);
-        $response->assertStatus(204);
+        $response->assertStatus(200);
+        $response->assertJsonStructure([
+            "user" => [
+                "id",
+                "username",
+                "created_at",
+                "updated_at"
+            ]
+        ]);
 
         $response = $this->withHeaders([
             "Authorization" => "Bearer " . $server_token
@@ -92,7 +100,15 @@ public function test_connect_already_connected() {
         ])->post('/api/user/' . $user->id . '/accept', [
             'token' => 'aef773374b964c42cbb44bf11452b8a912737ad3175341d1694591ef58a19ce4'
         ]);
-        $response->assertStatus(204);
+        $response->assertStatus(200);
+        $response->assertJsonStructure([
+            "user" => [
+                "id",
+                "username",
+                "created_at",
+                "updated_at"
+            ]
+        ]);
 
         $response = $this->withHeaders([
             "Authorization" => "Bearer " . $user_token
@@ -342,6 +358,14 @@ public function test_good_heartbeat()
         ])->post('/api/user/' . $user->id . '/accept', [
             'token' => 'aef773374b964c42cbb44bf11452b8a912737ad3175341d1694591ef58a19ce4'
         ]);
-        $response->assertStatus(204);
+        $response->assertStatus(200);
+        $response->assertJsonStructure([
+            "user" => [
+                "id",
+                "username",
+                "created_at",
+                "updated_at"
+            ]
+        ]);
     }
 }