OXDEV-9078 Remove unnecessary session constant container class

Signed-off-by: Anton Fedurtsya <anton@fedurtsya.com>

Author: Sieg

src/Authentication/Service/InternalRedirectService.php

@@ -11,10 +11,10 @@
 
 use OxidEsales\Eshop\Core\Config;
 use OxidEsales\EshopCommunity\Internal\Framework\Session\SessionInterface;
-use OxidEsales\SecurityModule\Authentication\Session\SessionKeys;
 
 readonly class InternalRedirectService implements InternalRedirectServiceInterface
 {
+    public const AUTH_REDIRECT_URL = 'otp_target_url';
     public function __construct(
         private SessionInterface $session,
         private Config $config,
@@ -23,7 +23,7 @@ public function __construct(
 
     public function getRedirectUrl(): string
     {
-        $storedUrl = $this->session->get(SessionKeys::AUTH_REDIRECT_URL);
+        $storedUrl = $this->session->get(self::AUTH_REDIRECT_URL);
 
         if ($storedUrl && $this->isInternalUrl($storedUrl)) {
             return $storedUrl;

src/Authentication/Session/SessionKeys.php

@@ -13,7 +13,7 @@
 use OxidEsales\Eshop\Core\Request;
 use OxidEsales\EshopCommunity\Internal\Framework\Session\SessionInterface;
 use OxidEsales\EshopCommunity\Internal\Transition\ShopEvents\ViewRenderedEvent;
-use OxidEsales\SecurityModule\Authentication\Session\SessionKeys;
+use OxidEsales\SecurityModule\Authentication\Service\InternalRedirectService;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 readonly class StoreCurrentUrlSubscriber implements EventSubscriberInterface
@@ -63,7 +63,7 @@ public function onViewRendered(ViewRenderedEvent $event): void
 
         $currentUrl = $this->getCurrentPageUrl();
         if ($currentUrl) {
-            $this->session->set(SessionKeys::AUTH_REDIRECT_URL, $currentUrl);
+            $this->session->set(InternalRedirectService::AUTH_REDIRECT_URL, $currentUrl);
         }
     }
 

src/Authentication/Subscriber/StoreCurrentUrlSubscriber.php

@@ -12,7 +12,6 @@
 use OxidEsales\Eshop\Core\Config;
 use OxidEsales\EshopCommunity\Internal\Framework\Session\SessionInterface;
 use OxidEsales\SecurityModule\Authentication\Service\InternalRedirectService;
-use OxidEsales\SecurityModule\Authentication\Session\SessionKeys;
 use PHPUnit\Framework\TestCase;
 
 class InternalRedirectServiceTest extends TestCase
@@ -24,7 +23,7 @@ public function testGetRedirectUrlReturnsStoredUrlWhenInternal(): void
 
         $sessionStub = $this->createStub(SessionInterface::class);
         $sessionStub->method('get')
-            ->with(SessionKeys::AUTH_REDIRECT_URL)
+            ->with(InternalRedirectService::AUTH_REDIRECT_URL)
             ->willReturn($storedUrl);
 
         $configStub = $this->createStub(Config::class);
@@ -44,7 +43,7 @@ public function testGetRedirectUrlReturnsStoredUrlWhenMatchesSslShopUrl(): void
 
         $sessionStub = $this->createStub(SessionInterface::class);
         $sessionStub->method('get')
-            ->with(SessionKeys::AUTH_REDIRECT_URL)
+            ->with(InternalRedirectService::AUTH_REDIRECT_URL)
             ->willReturn($storedUrl);
 
         $configStub = $this->createStub(Config::class);
@@ -64,7 +63,7 @@ public function testGetRedirectUrlReturnsShopHomeWhenStoredUrlIsExternal(): void
 
         $sessionStub = $this->createStub(SessionInterface::class);
         $sessionStub->method('get')
-            ->with(SessionKeys::AUTH_REDIRECT_URL)
+            ->with(InternalRedirectService::AUTH_REDIRECT_URL)
             ->willReturn($externalUrl);
 
         $configStub = $this->createStub(Config::class);
@@ -83,7 +82,7 @@ public function testGetRedirectUrlReturnsShopHomeWhenNoStoredUrl(): void
 
         $sessionStub = $this->createStub(SessionInterface::class);
         $sessionStub->method('get')
-            ->with(SessionKeys::AUTH_REDIRECT_URL)
+            ->with(InternalRedirectService::AUTH_REDIRECT_URL)
             ->willReturn(null);
 
         $configStub = $this->createStub(Config::class);
@@ -100,7 +99,7 @@ public function testGetRedirectUrlReturnsShopHomeWhenStoredUrlIsEmpty(): void
 
         $sessionStub = $this->createStub(SessionInterface::class);
         $sessionStub->method('get')
-            ->with(SessionKeys::AUTH_REDIRECT_URL)
+            ->with(InternalRedirectService::AUTH_REDIRECT_URL)
             ->willReturn('');
 
         $configStub = $this->createStub(Config::class);

tests/Unit/Authentication/Service/InternalRedirectServiceTest.php

@@ -15,7 +15,7 @@
 use OxidEsales\EshopCommunity\Application\Controller\FrontendController;
 use OxidEsales\EshopCommunity\Internal\Framework\Session\SessionInterface;
 use OxidEsales\EshopCommunity\Internal\Transition\ShopEvents\ViewRenderedEvent;
-use OxidEsales\SecurityModule\Authentication\Session\SessionKeys;
+use OxidEsales\SecurityModule\Authentication\Service\InternalRedirectService;
 use OxidEsales\SecurityModule\Authentication\Subscriber\StoreCurrentUrlSubscriber;
 use PHPUnit\Framework\TestCase;
 
@@ -47,7 +47,7 @@ public function testOnViewRenderedStoresCurrentUrl(): void
         $sessionMock = $this->createMock(SessionInterface::class);
         $sessionMock->expects($this->once())
             ->method('set')
-            ->with(SessionKeys::AUTH_REDIRECT_URL, $currentUrl);
+            ->with(InternalRedirectService::AUTH_REDIRECT_URL, $currentUrl);
 
         $sut = $this->getSut(
             session: $sessionMock,
@@ -259,7 +259,7 @@ public function testOnViewRenderedStoresUrlWithOtherFunction(): void
         $sessionMock = $this->createMock(SessionInterface::class);
         $sessionMock->expects($this->once())
             ->method('set')
-            ->with(SessionKeys::AUTH_REDIRECT_URL, $currentUrl);
+            ->with(InternalRedirectService::AUTH_REDIRECT_URL, $currentUrl);
 
         $sut = $this->getSut(
             session: $sessionMock,