Changing paths and verbs

Author: mmoreram

App/HttpAppRepository.php

@@ -40,12 +40,11 @@ public function addToken(Token $token)
         $response = $this
             ->httpClient
             ->get(
-                '/token',
-                'post',
-                Http::getAppQueryValues($this),
-                [
-                    Http::TOKEN_FIELD => $token->toArray(),
-                ]
+                sprintf('/%s/tokens', $this->getAppUUID()->getId()),
+                'put',
+                [],
+                $token->toArray(),
+                Http::getApisearchHeaders($this)
             );
 
         self::throwTransportableExceptionIfNeeded($response);
@@ -61,12 +60,15 @@ public function deleteToken(TokenUUID $tokenUUID)
         $response = $this
             ->httpClient
             ->get(
-                '/token',
+                sprintf(
+                    '/%s/tokens/%s',
+                    $this->getAppUUID()->composeUUID(),
+                    $tokenUUID->composeUUID()
+                ),
                 'delete',
-                Http::getAppQueryValues($this),
-                [
-                    Http::TOKEN_FIELD => $tokenUUID->toArray(),
-                ]
+                [],
+                [],
+                Http::getApisearchHeaders($this)
             );
 
         self::throwTransportableExceptionIfNeeded($response);
@@ -82,9 +84,14 @@ public function getTokens(): array
         $response = $this
             ->httpClient
             ->get(
-                '/tokens',
+                sprintf(
+                    '/%s/tokens',
+                    $this->getAppUUID()->getId()
+                ),
                 'get',
-                Http::getAppQueryValues($this)
+                [],
+                [],
+                Http::getApisearchHeaders($this)
             );
 
         self::throwTransportableExceptionIfNeeded($response);
@@ -102,9 +109,14 @@ public function deleteTokens()
         $response = $this
             ->httpClient
             ->get(
-                '/tokens',
+                sprintf(
+                    '/%s/tokens',
+                    $this->getAppUUID()->getId()
+                ),
                 'delete',
-                Http::getAppQueryValues($this)
+                [],
+                [],
+                Http::getApisearchHeaders($this)
             );
 
         self::throwTransportableExceptionIfNeeded($response);
@@ -120,9 +132,14 @@ public function getIndices(): array
         $response = $this
             ->httpClient
             ->get(
-                '/indices',
+                sprintf(
+                    '/%s/indices',
+                    $this->getAppUUID()->getId()
+                ),
                 'get',
-                Http::getAppQueryValues($this)
+                [],
+                [],
+                Http::getApisearchHeaders($this)
             );
 
         self::throwTransportableExceptionIfNeeded($response);
@@ -150,13 +167,17 @@ public function createIndex(
         $response = $this
             ->httpClient
             ->get(
-                '/index',
+                sprintf(
+                    '/%s/indices',
+                    $this->getAppUUID()->getId()
+                ),
                 'put',
-                Http::getAppQueryValues($this),
+                [],
                 [
                     Http::INDEX_FIELD => $indexUUID->toArray(),
                     Http::CONFIG_FIELD => $config->toArray(),
-                ]
+                ],
+                Http::getApisearchHeaders($this)
             );
 
         self::throwTransportableExceptionIfNeeded($response);
@@ -174,9 +195,15 @@ public function deleteIndex(IndexUUID $indexUUID)
         $response = $this
             ->httpClient
             ->get(
-                '/index',
+                sprintf(
+                    '/%s/indices/%s',
+                    $this->getAppUUID()->composeUUID(),
+                    $indexUUID->composeUUID()
+                ),
                 'delete',
-                Http::getAppQueryValues($this, $indexUUID)
+                [],
+                [],
+                Http::getApisearchHeaders($this)
             );
 
         self::throwTransportableExceptionIfNeeded($response);
@@ -194,9 +221,15 @@ public function resetIndex(IndexUUID $indexUUID)
         $response = $this
             ->httpClient
             ->get(
-                '/index/reset',
+                sprintf(
+                    '/%s/indices/%s/reset',
+                    $this->getAppUUID()->composeUUID(),
+                    $indexUUID->composeUUID()
+                ),
                 'post',
-                Http::getAppQueryValues($this, $indexUUID)
+                [],
+                [],
+                Http::getApisearchHeaders($this)
             );
 
         self::throwTransportableExceptionIfNeeded($response);
@@ -214,9 +247,15 @@ public function checkIndex(IndexUUID $indexUUID): bool
         $response = $this
             ->httpClient
             ->get(
-                '/index',
+                sprintf(
+                    '/%s/indices/%s',
+                    $this->getAppUUID()->composeUUID(),
+                    $indexUUID->composeUUID()
+                ),
                 'head',
-                Http::getAppQueryValues($this, $indexUUID)
+                [],
+                [],
+                Http::getApisearchHeaders($this)
             );
 
         if (null === $response) {
@@ -241,12 +280,15 @@ public function configureIndex(
         $response = $this
             ->httpClient
             ->get(
-                '/index',
+                sprintf(
+                    '/%s/indices/%s/configure',
+                    $this->getAppUUID()->composeUUID(),
+                    $indexUUID->composeUUID()
+                ),
                 'post',
-                Http::getAppQueryValues($this, $indexUUID),
-                [
-                    Http::CONFIG_FIELD => $config->toArray(),
-                ]
+                [],
+                $config->toArray(),
+                Http::getApisearchHeaders($this)
             );
 
         if (null === $response) {

Http/CurlAdapter.php

@@ -41,6 +41,11 @@ public function getByRequestParts(
         $json = json_encode($requestParts->getParameters()['json']);
         $formattedUrl = rtrim($host, '/').'/'.ltrim($requestParts->getUrl(), '/');
         $method = strtoupper($method);
+        $headers = [];
+        foreach ($requestParts->getParameters()['headers'] ?? [] as $header => $value) {
+            $headers[] = "$header: $value";
+        }
+
         $c = curl_init();
         curl_setopt($c, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($c, CURLOPT_URL, $formattedUrl);
@@ -50,23 +55,27 @@ public function getByRequestParts(
 
         if (!in_array($method, ['GET', 'HEAD'])) {
             curl_setopt($c, CURLOPT_POSTFIELDS, $json);
-            curl_setopt($c, CURLOPT_HTTPHEADER, [
-                'Content-Type: application/json',
-                'Content-Length: '.strlen($json),
-            ]);
+            $headers[] = 'Content-Type: application/json';
+            $headers[] = 'Content-Length: '.strlen($json);
         }
 
+        curl_setopt($c, CURLOPT_HTTPHEADER, $headers);
         $content = curl_exec($c);
         $responseCode = curl_getinfo($c, CURLINFO_HTTP_CODE);
         curl_close($c);
 
-        if (false === $content) {
+        if (
+            'HEAD' !== $method &&
+            false === $content
+        ) {
             throw ConnectionException::buildConnectExceptionByUrl($requestParts->getUrl());
         }
 
         return [
             'code' => (int) $responseCode,
-            'body' => json_decode($content, true),
+            'body' => empty($content)
+                ? []
+                : json_decode($content, true),
         ];
     }
 }