set auth header instead of token

Author: eluhr

src/HttpClient.php

@@ -92,11 +92,6 @@ protected function resolveTokenProvider(): ?AccessTokenProviderInterface
         return $this->tokenProvider;
     }
 
-    protected function getAccessToken(): ?string
-    {
-        return $this->resolveTokenProvider()?->getAccessToken();
-    }
-
     protected function clientConfig(): array
     {
         return [
@@ -114,16 +109,15 @@ protected function clientConfig(): array
 
     /**
      * Merge request options with per-request auth header.
-     * Resolves the access token at request time to avoid stale tokens.
-     * Only adds Authorization header when a token is available.
+     * Only adds Authorization header when the provider returns a value.
      */
     protected function requestOptions(array $options = []): array
     {
-        $token = $this->getAccessToken();
-        if ($token !== null) {
+        $authHeader = $this->resolveTokenProvider()?->getAuthorizationHeader();
+        if ($authHeader !== null) {
             $options[RequestOptions::HEADERS] = array_merge(
                 $options[RequestOptions::HEADERS] ?? [],
-                ['Authorization' => 'Bearer ' . $token]
+                ['Authorization' => $authHeader]
             );
         }
         return $options;

src/auth/AccessTokenProviderInterface.php

@@ -5,7 +5,8 @@
 interface AccessTokenProviderInterface
 {
     /**
-     * Returns the current access token, or null when no token is available (skips auth header).
+     * Returns the full Authorization header value (e.g. "Bearer xxx", "Basic xxx"),
+     * or null when no auth is available (skips Authorization header).
      */
-    public function getAccessToken(): ?string;
+    public function getAuthorizationHeader(): ?string;
 }

src/auth/TokenProvider.php

@@ -7,15 +7,21 @@
 /**
  * Configurable token provider for static API keys, service tokens, or no auth.
  *
- * - Set $token for a static token
- * - Set neither for unauthenticated requests (null token → no Authorization header)
+ * - Set $token and optionally $scheme to control the Authorization header
+ * - Omit $token for unauthenticated requests (null → no Authorization header)
  */
 class TokenProvider extends BaseObject implements AccessTokenProviderInterface
 {
     public ?string $token = null;
 
-    public function getAccessToken(): ?string
+    public string $scheme = 'Bearer';
+
+    public function getAuthorizationHeader(): ?string
     {
-        return $this->token ?: null;
+        if (empty($this->token)) {
+            return null;
+        }
+
+        return $this->scheme . ' ' . $this->token;
     }
 }

tests/auth/TokenProviderTest.php

@@ -14,28 +14,34 @@ public function testImplementsInterface(): void
         $this->assertInstanceOf(AccessTokenProviderInterface::class, $provider);
     }
 
-    public function testReturnsStaticToken(): void
+    public function testReturnsBearerHeaderByDefault(): void
     {
         $provider = new TokenProvider(['token' => 'my-api-key']);
-        $this->assertSame('my-api-key', $provider->getAccessToken());
+        $this->assertSame('Bearer my-api-key', $provider->getAuthorizationHeader());
+    }
+
+    public function testCustomScheme(): void
+    {
+        $provider = new TokenProvider(['token' => 'my-api-key', 'scheme' => 'Basic']);
+        $this->assertSame('Basic my-api-key', $provider->getAuthorizationHeader());
     }
 
     public function testReturnsNullWhenTokenIsNull(): void
     {
         $provider = new TokenProvider();
-        $this->assertNull($provider->getAccessToken());
+        $this->assertNull($provider->getAuthorizationHeader());
     }
 
     public function testReturnsNullWhenTokenIsEmpty(): void
     {
         $provider = new TokenProvider(['token' => '']);
-        $this->assertNull($provider->getAccessToken());
+        $this->assertNull($provider->getAuthorizationHeader());
     }
 
     public function testNullAuthWhenNothingConfigured(): void
     {
         $provider = new TokenProvider();
-        $this->assertNull($provider->getAccessToken());
-        $this->assertNull($provider->getAccessToken());
+        $this->assertNull($provider->getAuthorizationHeader());
+        $this->assertNull($provider->getAuthorizationHeader());
     }
 }