wip commit

app/Http/Controllers/Api/V1/SiteController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api\V1;
 
 use App\Http\Controllers\Controller;
+use App\Http\Requests\SiteRequest;
 use App\Jobs\CheckSiteHealth;
 use App\Models\Site;
 use App\RemoteSite\Connection;
@@ -23,20 +24,16 @@ class SiteController extends Controller
     use ApiResponse;
 
     /**
-     * @param Request $request
+     * @param SiteRequest $request
      *
      * @return JsonResponse
      * @throws \Exception
      */
-    public function register(Request $request): JsonResponse
+    public function register(SiteRequest $request): JsonResponse
     {
         $url = $request->string('url');
         $key = $request->string('key');
 
-        if ($url->isEmpty() || $key->isEmpty()) {
-            return $this->error('BadRequest');
-        }
-
         $connectionService = new Connection($url, $key);
 
         // Do a health check
@@ -66,19 +63,15 @@ public function register(Request $request): JsonResponse
     }
 
     /**
-     * @param Request $request
+     * @param SiteRequest $request
      *
      * @return JsonResponse
      */
-    public function check(Request $request): JsonResponse
+    public function check(SiteRequest $request): JsonResponse
     {
         $url = $request->string('url');
         $key = $request->string('key');
 
-        if ($url->isEmpty() || $key->isEmpty()) {
-            return $this->error('BadRequest');
-        }
-
         $connectionService = new Connection($url, $key);
 
         // Do a health check
@@ -94,19 +87,15 @@ public function check(Request $request): JsonResponse
     }
 
     /**
-     * @param Request $request
+     * @param SiteRequest $request
      *
      * @return JsonResponse
      */
-    public function delete(Request $request): JsonResponse
+    public function delete(SiteRequest $request): JsonResponse
     {
         $url = $request->string('url');
         $key = $request->string('key');
 
-        if ($url->isEmpty() || $key->isEmpty()) {
-            return $this->error('BadRequest');
-        }
-
         try {
             Site::where('url', $url)->where('key', $key)->delete();
         } catch (\Exception $e) {

app/Http/Requests/SiteRequest.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class SiteRequest extends FormRequest
+{
+    public function rules(): array
+    {
+        return [
+            'url' => 'required|url',
+            'key' => 'required|string|min:32|max:64',
+        ];
+    }
+}