From 1cd878b1d6fbfdd00dbe012c1e9ecc4b2dd73147 Mon Sep 17 00:00:00 2001 From: Mateusz Bieniek Date: Tue, 17 May 2022 14:45:49 +0200 Subject: [PATCH 1/4] Added PasswordExpredException --- .../Core/MVC/Symfony/Security/UserChecker.php | 4 ++-- .../Exception/PasswordExpiredException.php | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 src/lib/MVC/Symfony/Security/Exception/PasswordExpiredException.php diff --git a/eZ/Publish/Core/MVC/Symfony/Security/UserChecker.php b/eZ/Publish/Core/MVC/Symfony/Security/UserChecker.php index 99da2a5615..a2dc89c888 100644 --- a/eZ/Publish/Core/MVC/Symfony/Security/UserChecker.php +++ b/eZ/Publish/Core/MVC/Symfony/Security/UserChecker.php @@ -10,7 +10,7 @@ use eZ\Publish\API\Repository\UserService; use eZ\Publish\Core\MVC\Symfony\Security\UserInterface as EzUserInterface; -use Symfony\Component\Security\Core\Exception\CredentialsExpiredException; +use Ibexa\Core\MVC\Symfony\Security\Exception\PasswordExpiredException; use Symfony\Component\Security\Core\Exception\DisabledException; use Symfony\Component\Security\Core\User\UserCheckerInterface; use Symfony\Component\Security\Core\User\UserInterface; @@ -46,7 +46,7 @@ public function checkPostAuth(UserInterface $user): void } if ($this->userService->getPasswordInfo($user->getAPIUser())->isPasswordExpired()) { - $exception = new CredentialsExpiredException('User account has expired.'); + $exception = new PasswordExpiredException('User account has expired.'); $exception->setUser($user); throw $exception; diff --git a/src/lib/MVC/Symfony/Security/Exception/PasswordExpiredException.php b/src/lib/MVC/Symfony/Security/Exception/PasswordExpiredException.php new file mode 100644 index 0000000000..e89abe77e5 --- /dev/null +++ b/src/lib/MVC/Symfony/Security/Exception/PasswordExpiredException.php @@ -0,0 +1,17 @@ + Date: Wed, 18 May 2022 08:36:32 +0200 Subject: [PATCH 2/4] Fixed tests --- .../Core/MVC/Symfony/Security/Tests/UserCheckerTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eZ/Publish/Core/MVC/Symfony/Security/Tests/UserCheckerTest.php b/eZ/Publish/Core/MVC/Symfony/Security/Tests/UserCheckerTest.php index 7dce12b8a1..ea74a93a9e 100644 --- a/eZ/Publish/Core/MVC/Symfony/Security/Tests/UserCheckerTest.php +++ b/eZ/Publish/Core/MVC/Symfony/Security/Tests/UserCheckerTest.php @@ -17,8 +17,8 @@ use eZ\Publish\Core\Repository\Values\Content\Content; use eZ\Publish\Core\Repository\Values\Content\VersionInfo; use eZ\Publish\Core\Repository\Values\User\User as APIUser; +use Ibexa\Core\MVC\Symfony\Security\Exception\PasswordExpiredException; use PHPUnit\Framework\TestCase; -use Symfony\Component\Security\Core\Exception\CredentialsExpiredException; use Symfony\Component\Security\Core\Exception\DisabledException; use Throwable; @@ -156,7 +156,7 @@ public function testCheckPostAuthWithExpiredUser(): void ) ); - $this->expectException(CredentialsExpiredException::class); + $this->expectException(PasswordExpiredException::class); $this->expectExceptionMessage('User account has expired.'); $this->userChecker->checkPostAuth(new User($apiUser)); From 624fb80393f336d58c099e1c2b94528e7c275d6f Mon Sep 17 00:00:00 2001 From: Mateusz Bieniek Date: Thu, 19 May 2022 13:52:57 +0200 Subject: [PATCH 3/4] Update src/lib/MVC/Symfony/Security/Exception/PasswordExpiredException.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Paweł Niedzielski --- .../MVC/Symfony/Security/Exception/PasswordExpiredException.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/MVC/Symfony/Security/Exception/PasswordExpiredException.php b/src/lib/MVC/Symfony/Security/Exception/PasswordExpiredException.php index e89abe77e5..8fbf565cb6 100644 --- a/src/lib/MVC/Symfony/Security/Exception/PasswordExpiredException.php +++ b/src/lib/MVC/Symfony/Security/Exception/PasswordExpiredException.php @@ -10,7 +10,7 @@ class PasswordExpiredException extends CustomUserMessageAccountStatusException { - public function __construct(string $message = '') + public function __construct(string $message = 'User account has expired.') { parent::__construct($message); } From 11f1ff3021c2fc14bf2ee8422db73a623fb1b1c6 Mon Sep 17 00:00:00 2001 From: Mateusz Bieniek Date: Thu, 19 May 2022 13:53:03 +0200 Subject: [PATCH 4/4] Update src/lib/MVC/Symfony/Security/Exception/PasswordExpiredException.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Paweł Niedzielski --- .../MVC/Symfony/Security/Exception/PasswordExpiredException.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/MVC/Symfony/Security/Exception/PasswordExpiredException.php b/src/lib/MVC/Symfony/Security/Exception/PasswordExpiredException.php index 8fbf565cb6..f9653ecced 100644 --- a/src/lib/MVC/Symfony/Security/Exception/PasswordExpiredException.php +++ b/src/lib/MVC/Symfony/Security/Exception/PasswordExpiredException.php @@ -8,7 +8,7 @@ use Symfony\Component\Security\Core\Exception\CustomUserMessageAccountStatusException; -class PasswordExpiredException extends CustomUserMessageAccountStatusException +final class PasswordExpiredException extends CustomUserMessageAccountStatusException { public function __construct(string $message = 'User account has expired.') {