fix(AuthHelper): check the authorization type first and do other checks later

rtm-ctrlz · rtm-ctrlz · commit e8adca0e4615 · 2025-05-19T22:48:07.000+02:00
diff --git a/src/Composer/Util/AuthHelper.php b/src/Composer/Util/AuthHelper.php
@@ -257,8 +257,8 @@ public function addAuthenticationHeader(array $headers, string $origin, string $
                     $authenticationDisplayMessage = 'Using GitHub token authentication';
                 }
             } elseif (
-                in_array($origin, $this->config->get('gitlab-domains'), true)
-                && in_array($auth['password'], ['oauth2', 'private-token', 'gitlab-ci-token'], true)
+                in_array($auth['password'], ['oauth2', 'private-token', 'gitlab-ci-token'], true)
+                && in_array($origin, $this->config->get('gitlab-domains'), true)
             ) {
                 if ($auth['password'] === 'oauth2') {
                     $headers[] = 'Authorization: Bearer '.$auth['username'];
diff --git a/tests/Composer/Test/Util/AuthHelperTest.php b/tests/Composer/Test/Util/AuthHelperTest.php
@@ -203,11 +203,6 @@ public function testAddAuthenticationHeaderWithBitbucketOathToken(): void
 
         $this->expectsAuthentication($origin, $auth);
 
-        $this->config->expects($this->once())
-            ->method('get')
-            ->with('gitlab-domains')
-            ->willReturn([]);
-
         $this->io->expects($this->once())
             ->method('writeError')
             ->with('Using Bitbucket OAuth token authentication', true, IOInterface::DEBUG);
@@ -245,11 +240,6 @@ public function testAddAuthenticationHeaderWithBitbucketPublicUrl(string $url):
 
         $this->expectsAuthentication($origin, $auth);
 
-        $this->config->expects($this->once())
-            ->method('get')
-            ->with('gitlab-domains')
-            ->willReturn([]);
-
         self::assertSame(
             $headers,
             $this->authHelper->addAuthenticationHeader($headers, $origin, $url)
@@ -302,11 +292,6 @@ public function testAddAuthenticationHeaderWithBasicHttpAuthentication(string $u
 
         $this->expectsAuthentication($origin, $auth);
 
-        $this->config->expects($this->once())
-            ->method('get')
-            ->with('gitlab-domains')
-            ->willReturn([$origin]);
-
         $this->io->expects($this->once())
             ->method('writeError')
             ->with(
