From 95203efbad78b491aad2864236dc232c1b328d4e Mon Sep 17 00:00:00 2001
From: Anatoliy Poloz <t0ly.od@yandex.ru>
Date: Wed, 3 Jun 2026 10:07:00 +0300
Subject: [PATCH] fix(oauth): after saloon upgrade

---
 src/Core/AlfaBankConnector.php | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/Core/AlfaBankConnector.php b/src/Core/AlfaBankConnector.php
index 0f4aa87..a2e6626 100644
--- a/src/Core/AlfaBankConnector.php
+++ b/src/Core/AlfaBankConnector.php
@@ -8,11 +8,17 @@ namespace Apoloz\AlfaBank\Core;
 // <BELIEF_STATE "Saloon's plugin architecture requires importing traits for features like retries and timeouts. Local contracts (SignerInterface) are imported for dependency injection.">
 use Apoloz\AlfaBank\Contracts\SignerInterface;
 use Apoloz\AlfaBank\Enums\Environment;
+use Apoloz\AlfaBank\Http\Middleware\LoggingRequestMiddleware;
+use Apoloz\AlfaBank\Http\Middleware\LoggingResponseMiddleware;
 use Apoloz\AlfaBank\Http\Middleware\RequestIdMiddleware;
+use Apoloz\AlfaBank\Http\Middleware\VerifyJwsResponseMiddleware;
 use Apoloz\AlfaBank\Http\Pagination\AlfaOffsetPaginator;
 use Apoloz\AlfaBank\Traits\HasAlfaErrorHandling;
+use Psr\Log\LoggerInterface;
 use Saloon\Helpers\OAuth2\OAuthConfig;
 use Saloon\Http\Connector;
+use Saloon\Http\OAuth2\GetClientCredentialsTokenRequest;
+use Saloon\Http\PendingRequest;
 use Saloon\Http\Request;
 use Saloon\PaginationPlugin\Contracts\HasPagination;
 use Saloon\PaginationPlugin\OffsetPaginator;
@@ -42,7 +48,7 @@ class AlfaBankConnector extends Connector implements HasPagination
         return $this->alfaConfig->baseUrl;
     }
 
-    public function boot(\Saloon\Http\PendingRequest $pendingRequest): void
+    public function boot(PendingRequest $pendingRequest): void
     {
         //
     }
@@ -69,7 +75,7 @@ class AlfaBankConnector extends Connector implements HasPagination
             throw new \RuntimeException('Client ID/Secret not configured.');
         }
 
-        $request = new \Saloon\Http\OAuth2\GetClientCredentialsTokenRequest($oauthConfig, $scopes);
+        $request = new GetClientCredentialsTokenRequest($oauthConfig, $scopes);
 
         $response = $this->send($request);
 
@@ -97,10 +103,10 @@ class AlfaBankConnector extends Connector implements HasPagination
 
     // <SECTION name="logging_mutator" intent="Allow attaching a PSR-3 logger to the connector for debugging.">
     // <BELIEF_STATE "Logging should be an optional, opt-in feature. This method provides a fluent interface to attach a logging middleware, which will automatically sanitize sensitive data before output.">
-    public function withLogging(\Psr\Log\LoggerInterface $logger): static
+    public function withLogging(LoggerInterface $logger): static
     {
-        $this->middleware()->onRequest(new \Apoloz\AlfaBank\Http\Middleware\LoggingRequestMiddleware($logger));
-        $this->middleware()->onResponse(new \Apoloz\AlfaBank\Http\Middleware\LoggingResponseMiddleware($logger));
+        $this->middleware()->onRequest(new LoggingRequestMiddleware($logger));
+        $this->middleware()->onResponse(new LoggingResponseMiddleware($logger));
 
         return $this;
     }
@@ -110,7 +116,7 @@ class AlfaBankConnector extends Connector implements HasPagination
      */
     public function withJwsVerification(string $publicKeyPem): static
     {
-        $this->middleware()->onResponse(new \Apoloz\AlfaBank\Http\Middleware\VerifyJwsResponseMiddleware($publicKeyPem));
+        $this->middleware()->onResponse(new VerifyJwsResponseMiddleware($publicKeyPem));
 
         return $this;
     }
@@ -125,8 +131,9 @@ class AlfaBankConnector extends Connector implements HasPagination
             ->setClientId($this->alfaConfig->clientId ?? '')
             ->setClientSecret($this->alfaConfig->clientSecret ?? '')
             ->setRedirectUri($this->alfaConfig->redirectUri ?? '')
-            ->setAuthorizeEndpoint($idUrl . '/oidc/authorize')
-            ->setTokenEndpoint('/oidc/token');
+            ->setAuthorizeEndpoint($idUrl.'/oidc/authorize')
+            ->setTokenEndpoint('/oidc/token')
+            ->setAllowBaseUrlOverride();
     }
 
     protected function defaultConfig(): array