fix webservice request headers

joomla-projects · Nov 17, 2024 · b4bb224 · b4bb224
1 parent 23dc2e7
commit b4bb224
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/app/Http/Controllers/Api/V1/SiteController.php b/app/Http/Controllers/Api/V1/SiteController.php
@@ -34,7 +34,7 @@ public function register(SiteRequest $request): JsonResponse
         $url = $request->string('url');
         $key = $request->string('key');
 
-        $connectionService = App::makeWith(Connection::class, [$url, $key]);
+        $connectionService = App::makeWith(Connection::class, ["baseUrl" => $url, "key" => $key]);
 
         // Do a health check
         try {
@@ -49,7 +49,7 @@ public function register(SiteRequest $request): JsonResponse
         $site = new Site();
 
         $site->key = $key;
-        $site->url = $url;
+        $site->url = rtrim($url, "/");
         $site->last_seen = Carbon::now();
 
         // Fill with site info

diff --git a/app/RemoteSite/Connection.php b/app/RemoteSite/Connection.php
@@ -67,15 +67,13 @@ public function performExtractionRequest(array $requestData): array
             ]
         );
 
-        $responseData = $this->decodeResponse($response, $request);
-
-        return $responseData;
+        return $this->decodeResponse($response, $request);
     }
 
     protected function performWebserviceRequest(
         HttpMethod $method,
         string $endpoint,
-        array $requestData = []
+        ?array $requestData = null
     ): array {
         $request = new Request(
             $method->name,
@@ -89,7 +87,11 @@ protected function performWebserviceRequest(
         $response = $this->performHttpRequest(
             $request,
             [
-                "json" => $requestData
+                "json" => $requestData,
+                "headers" => [
+                    "Content-Type" => "application/json",
+                    "Accept" => "application/vnd.api+json"
+                ]
             ]
         );