Skip to content

Commit e7abab3

Browse files
committed
Remove normalizeBaseUri()
1 parent 41ce054 commit e7abab3

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/clients/credentials/Generic.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function getCredentialsProviderConfig(): array
5454
$url = App::parseEnv($this->url);
5555

5656
$config = array_filter([
57-
'base_uri' => AuthUrlHelper::normalizeBaseUri($url),
57+
'base_uri' => rtrim($url, '/'),
5858
]);
5959

6060
if ($this->headers) {

src/services/Service.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,10 @@ public function fetchRawData(array|string $clientOpts, string $method = '', stri
9999
// Otherwise, we're probably passing in Guzzle settings for an in-template call
100100
// Normalise the Base URI and URI
101101
$uri = ltrim($uri, '/');
102-
$clientOpts['base_uri'] = AuthUrlHelper::normalizeBaseUri(($clientOpts['base_uri'] ?? ''));
102+
103+
if (isset($clientOpts['base_uri'])) {
104+
$clientOpts['base_uri'] = rtrim($clientOpts['base_uri'], '/');
105+
}
103106

104107
$client = Craft::createGuzzleClient($clientOpts);
105108
$response = $client->request($method, $uri, $options);

0 commit comments

Comments
 (0)