From 0ea9db317038f5510a1ca875b55af770997ec148 Mon Sep 17 00:00:00 2001 From: wn_ Date: Sun, 24 Dec 2023 11:21:43 +0000 Subject: [PATCH] Fix specifying auth type in UrlHelper::fetch(), add a test for 403 auth retry. --- classes/UrlHelper.php | 2 +- tests/UrlHelperTest.php | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/classes/UrlHelper.php b/classes/UrlHelper.php index d088a355b..03202cff8 100644 --- a/classes/UrlHelper.php +++ b/classes/UrlHelper.php @@ -333,7 +333,7 @@ class UrlHelper { if ($login && $pass && in_array($auth_type, ['basic', 'digest', 'ntlm'])) { // Let Guzzle handle the details for auth types it supports - $req_options[GuzzleHttp\RequestOptions::AUTH] = [$login, $pass]; + $req_options[GuzzleHttp\RequestOptions::AUTH] = [$login, $pass, $auth_type]; } elseif ($auth_type === 'any') { // https://docs.guzzlephp.org/en/stable/faq.html#how-can-i-add-custom-curl-options $req_options['curl'][\CURLOPT_HTTPAUTH] = \CURLAUTH_ANY; diff --git a/tests/UrlHelperTest.php b/tests/UrlHelperTest.php index 30a0201c1..58960add0 100644 --- a/tests/UrlHelperTest.php +++ b/tests/UrlHelperTest.php @@ -102,13 +102,19 @@ final class UrlHelperTest extends TestCase { $this->assertFalse($result); $this->assertEquals('Successful response, but no content was received.', UrlHelper::$fetch_last_error); - // Currently failing with `Error: Undefined constant "CURLOPT_HTTPAUTH"`. - // $mock->append( - // new Response(403, []), - // new Response(200, [], 'Hello, World'), - // ); - // $result = UrlHelper::fetch(['url' => 'https://example.com/requires-credentials', 'login' => 'some_username', 'pass' => 'some_password']); - // $this->assertEquals(200, UrlHelper::$fetch_last_error_code); - // $this->assertEquals('Hello, World', $result); + // Fake a 403 for basic auth and success with `CURLAUTH_ANY` in the retry attempt + $mock->append( + new Response(403, []), + new Response(200, [], 'Hello, World'), + ); + $result = UrlHelper::fetch([ + 'url' => 'https://example.com/requires-credentials', + 'login' => 'some_username', + 'pass' => 'some_password', + 'auth_type' => 'basic', + ]); + $this->assertEquals(200, UrlHelper::$fetch_last_error_code); + $this->assertEquals('Hello, World', $result); + $this->assertEquals($mock->getLastOptions()['curl'][\CURLOPT_HTTPAUTH], \CURLAUTH_ANY); } }