Fix deprecated classes usage

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 2.3.3 under development
 
 - Enh #120: Explicitly import classes and constants in "use" section (@vjik)
+- Enh #127: Fix deprecated classes usage (@klsoft-web)
 
 ## 2.3.2 December 23, 2025
 

composer.json

@@ -35,7 +35,7 @@
         "psr/http-server-middleware": "^1.0",
         "psr/log": "^1.1 || ^2.0 || ^3.0",
         "yiisoft/access": "^2.0",
-        "yiisoft/auth": "^2.0 || ^3.0",
+        "yiisoft/auth": "^3.3.0",
         "yiisoft/cookies": "^1.2",
         "yiisoft/session": "^1.0 || ^2.0 || ^3.0",
         "yiisoft/http": "^1.2"

src/Method/ApiAuth.php

@@ -6,24 +6,21 @@
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Yiisoft\Auth\AuthenticationMethodInterface;
+use Yiisoft\Auth\AuthenticatorWithChallengeInterface;
 use Yiisoft\Auth\IdentityInterface;
 use Yiisoft\User\CurrentUser;
+use Yiisoft\User\UserAuthenticator;
 
 /**
- * Implementation of the `AuthenticationMethodInterface` for authenticating users in the API clients.
+ * Implementation of the `AuthenticatorWithChallengeInterface` for authenticating users in the API clients.
  */
-final class ApiAuth implements AuthenticationMethodInterface
+final class ApiAuth implements AuthenticatorWithChallengeInterface
 {
     public function __construct(private readonly CurrentUser $currentUser) {}
 
     public function authenticate(ServerRequestInterface $request): ?IdentityInterface
     {
-        if ($this->currentUser->isGuest()) {
-            return null;
-        }
-
-        return $this->currentUser->getIdentity();
+        return (new UserAuthenticator($this->currentUser))->authenticate($request);
     }
 
     public function challenge(ResponseInterface $response): ResponseInterface

src/Method/WebAuth.php

@@ -7,15 +7,16 @@
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Yiisoft\Auth\AuthenticationMethodInterface;
+use Yiisoft\Auth\AuthenticatorWithChallengeInterface;
 use Yiisoft\Auth\IdentityInterface;
 use Yiisoft\Http\Status;
 use Yiisoft\User\CurrentUser;
+use Yiisoft\User\UserAuthenticator;
 
 /**
- * Implementation of the `AuthenticationMethodInterface` for authenticating users in the web applications.
+ * Implementation of the `AuthenticatorWithChallengeInterface` for authenticating users in the web applications.
  */
-final class WebAuth implements AuthenticationMethodInterface
+final class WebAuth implements AuthenticatorWithChallengeInterface
 {
     private string $authUrl = '/login';
 
@@ -26,11 +27,7 @@ public function __construct(
 
     public function authenticate(ServerRequestInterface $request): ?IdentityInterface
     {
-        if ($this->currentUser->isGuest()) {
-            return null;
-        }
-
-        return $this->currentUser->getIdentity();
+        return (new UserAuthenticator($this->currentUser))->authenticate($request);
     }
 
     /**

src/UserAuth.php

@@ -7,7 +7,7 @@
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Yiisoft\Auth\AuthenticationMethodInterface;
+use Yiisoft\Auth\AuthenticatorWithChallengeInterface;
 use Yiisoft\Auth\IdentityInterface;
 use Yiisoft\Http\Status;
 use Yiisoft\User\Method\WebAuth;
@@ -17,19 +17,15 @@
  *
  * @deprecated Use {@see WebAuth}. This class will be removed in the next major version.
  */
-final class UserAuth implements AuthenticationMethodInterface
+final class UserAuth implements AuthenticatorWithChallengeInterface
 {
     private string $authUrl = '/login';
 
     public function __construct(private CurrentUser $currentUser, private ResponseFactoryInterface $responseFactory) {}
 
     public function authenticate(ServerRequestInterface $request): ?IdentityInterface
     {
-        if ($this->currentUser->isGuest()) {
-            return null;
-        }
-
-        return $this->currentUser->getIdentity();
+        return (new UserAuthenticator($this->currentUser))->authenticate($request);
     }
 
     /**

src/UserAuthenticator.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\User;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Yiisoft\Auth\AuthenticatorInterface;
+use Yiisoft\Auth\IdentityInterface;
+
+/**
+ * Implementation of the AuthenticatorInterface for the user.
+ */
+final class UserAuthenticator implements AuthenticatorInterface
+{
+    public function __construct(private CurrentUser $currentUser) {}
+
+    public function authenticate(ServerRequestInterface $request): ?IdentityInterface
+    {
+        if ($this->currentUser->isGuest()) {
+            return null;
+        }
+
+        return $this->currentUser->getIdentity();
+    }
+}

tests/UserAuthenticatorTest.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\User\Tests;
+
+use HttpSoft\Message\ServerRequest;
+use PHPUnit\Framework\TestCase;
+use Yiisoft\Test\Support\EventDispatcher\SimpleEventDispatcher;
+use Yiisoft\User\Tests\Support\MockArraySessionStorage;
+use Yiisoft\User\Tests\Support\MockIdentity;
+use Yiisoft\User\Tests\Support\MockIdentityRepository;
+use Yiisoft\User\CurrentUser;
+use Yiisoft\User\UserAuthenticator;
+
+final class UserAuthenticatorTest extends TestCase
+{
+    public function testSuccessfulAuthentication(): void
+    {
+        $user = $this->createCurrentUser();
+        $user->login(new MockIdentity('test-id'));
+        $result = (new UserAuthenticator($user))->authenticate(new ServerRequest());
+
+        $this->assertNotNull($result);
+        $this->assertSame('test-id', $result->getId());
+    }
+
+    public function testIdentityNotAuthenticated(): void
+    {
+        $user = $this->createCurrentUser();
+        $result = (new UserAuthenticator($user))->authenticate(new ServerRequest());
+
+        $this->assertNull($result);
+    }
+
+
+    private function createCurrentUser(): CurrentUser
+    {
+        return (new CurrentUser(new MockIdentityRepository(), new SimpleEventDispatcher()))
+            ->withSession(new MockArraySessionStorage());
+    }
+}