Remove normalizeBaseUri()

verbb · Dec 17, 2023 · e7abab3 · e7abab3
1 parent 41ce054
commit e7abab3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/clients/credentials/Generic.php b/src/clients/credentials/Generic.php
@@ -54,7 +54,7 @@ public function getCredentialsProviderConfig(): array
         $url = App::parseEnv($this->url);
 
         $config = array_filter([
-            'base_uri' => AuthUrlHelper::normalizeBaseUri($url),
+            'base_uri' => rtrim($url, '/'),
         ]);
 
         if ($this->headers) {

diff --git a/src/services/Service.php b/src/services/Service.php
@@ -99,7 +99,10 @@ public function fetchRawData(array|string $clientOpts, string $method = '', stri
             // Otherwise, we're probably passing in Guzzle settings for an in-template call
             // Normalise the Base URI and URI
             $uri = ltrim($uri, '/');
-            $clientOpts['base_uri'] = AuthUrlHelper::normalizeBaseUri(($clientOpts['base_uri'] ?? ''));
+
+            if (isset($clientOpts['base_uri'])) {
+                $clientOpts['base_uri'] = rtrim($clientOpts['base_uri'], '/');
+            }
 
             $client = Craft::createGuzzleClient($clientOpts);
             $response = $client->request($method, $uri, $options);