OXDEV-10012 Fix static analysis issues

Author: TitaKoleva

src/Authentication/TwoFactorAuth/Controller/TwoFactorAuthController.php

@@ -10,7 +10,6 @@
 namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Controller;
 
 use OxidEsales\Eshop\Application\Controller\FrontendController;
-use OxidEsales\Eshop\Core\Language;
 use OxidEsales\Eshop\Core\UtilsView;
 use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Exception\OTPValidationException;
 use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service\AuthorizeServiceInterface;
@@ -31,7 +30,6 @@ public function __construct(
         private readonly AuthorizeServiceInterface $authService,
         private readonly UserServiceInterface $userService,
         private readonly AuthCodeRequestInterface $authCodeRequest,
-        private readonly Language $language,
         private readonly UtilsView $utilsView,
     ) {
         parent::__construct();
@@ -45,10 +43,8 @@ public function handleOTP(): ?string
             );
 
             $this->userService->finalizeLogin();
-
         } catch (OTPValidationException $e) {
-            $translatedMessage = $this->language->translateString($e->getMessage());
-            $this->utilsView->addErrorToDisplay($translatedMessage);
+            $this->utilsView->addErrorToDisplay($e);
         }
 
         return null;

src/Authentication/TwoFactorAuth/Controller/services.yaml

@@ -4,7 +4,6 @@ services:
     public: false
     bind:
       OxidEsales\Eshop\Core\UtilsView: '@=service("OxidEsales\\SecurityModule\\Core\\Registry").getUtilsView()'
-      OxidEsales\Eshop\Core\Language: '@=service("OxidEsales\\SecurityModule\\Core\\Registry").getLang()'
 
   OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Controller\TwoFactorAuthController:
     public: true

src/Authentication/TwoFactorAuth/Exception/OTPValidationException.php

@@ -9,6 +9,8 @@
 
 namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Exception;
 
-class OTPValidationException extends \Exception
+use OxidEsales\Eshop\Core\Exception\StandardException;
+
+class OTPValidationException extends StandardException
 {
 }

src/Authentication/TwoFactorAuth/Service/UserService.php

@@ -42,6 +42,7 @@ public function finalizeLogin(): void
         $redirectUrl = $this->getRedirectUrl();
 
         $this->session->set('OTP_PASS', $userId);
+        /** @phpstan-ignore argument.type (password is null because user already authenticated via OTP) */
         $user->login($user->getFieldData('oxusername'), null, false);
         $this->clearOTPSessionVariables();
         Registry::getUtils()->redirect($redirectUrl, false);

src/Authentication/TwoFactorAuth/Subscriber/StoreCurrentUrlSubscriber.php

@@ -31,6 +31,9 @@ public static function getSubscribedEvents(): array
         ];
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
     public function onViewRendered(ViewRenderedEvent $event): void
     {
         if ($this->isAdmin()) {

src/Shared/Model/User.php

@@ -80,6 +80,7 @@ public function login($userName, $password, $setSessionCookie = false): bool
         return parent::login($userName, $password, $setSessionCookie);
     }
 
+    /** @phpstan-ignore missingType.return (inherited from parent without return type) */
     protected function onLogin($userName, $password)
     {
         parent::onLogin($userName, $password);

tests/Unit/Authentication/TwoFactorAuth/Controller/TwoFactorAuthControllerTest.php

@@ -9,7 +9,6 @@
 
 namespace OxidEsales\SecurityModule\Tests\Unit\Authentication\TwoFactorAuth\Controller;
 
-use OxidEsales\Eshop\Core\Language;
 use OxidEsales\Eshop\Core\UtilsView;
 use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Controller\TwoFactorAuthController;
 use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Exception\InvalidCodeException;
@@ -71,32 +70,25 @@ public function testHandleOTPDoesNotFinalizeLoginOnValidationFailure(): void
         $this->assertNull($result);
     }
 
-    public function testHandleOTPDisplaysTranslatedErrorOnValidationFailure(): void
+    public function testHandleOTPDisplaysErrorOnValidationFailure(): void
     {
-        $translatedMessage = 'The code is invalid';
+        $exception = new InvalidCodeException();
 
         $authCodeRequestStub = $this->createStub(AuthCodeRequestInterface::class);
         $authCodeRequestStub->method('getCode')->willReturn('invalid');
 
         $authServiceStub = $this->createStub(AuthorizeServiceInterface::class);
         $authServiceStub->method('validate')
-            ->willThrowException(new InvalidCodeException());
-
-        $languageMock = $this->createMock(Language::class);
-        $languageMock->expects($this->once())
-            ->method('translateString')
-            ->with('ERROR_INVALID_CODE')
-            ->willReturn($translatedMessage);
+            ->willThrowException($exception);
 
         $utilsViewMock = $this->createMock(UtilsView::class);
         $utilsViewMock->expects($this->once())
             ->method('addErrorToDisplay')
-            ->with($translatedMessage);
+            ->with($exception);
 
         $controller = $this->getSut(
             authService: $authServiceStub,
             authCodeRequest: $authCodeRequestStub,
-            language: $languageMock,
             utilsView: $utilsViewMock,
         );
 
@@ -140,14 +132,12 @@ private function getSut(
         AuthorizeServiceInterface $authService = null,
         UserServiceInterface $userService = null,
         AuthCodeRequestInterface $authCodeRequest = null,
-        Language $language = null,
         UtilsView $utilsView = null,
     ): TwoFactorAuthController {
         return new TwoFactorAuthController(
             authService: $authService ?? $this->createStub(AuthorizeServiceInterface::class),
             userService: $userService ?? $this->createStub(UserServiceInterface::class),
             authCodeRequest: $authCodeRequest ?? $this->createStub(AuthCodeRequestInterface::class),
-            language: $language ?? $this->createStub(Language::class),
             utilsView: $utilsView ?? $this->createStub(UtilsView::class),
         );
     }