[TASK] Drop autologout for no-longer-supported onetimeaccount logins (#…

…3556) As we no longer support real FE logins with the onetimeaccount extension, we no longer need the outologout.
oliverklee · Sep 16, 2024 · 8af5814 · 8af5814
1 parent bcc7956
commit 8af5814
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 75 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ### Removed
 
+- Drop the autologout for no-longer-supported onetimeaccount logins (#3556)
 - Drop `$isFileName` parameter in `::getConfValueString()` (#2835)
 - Remove the `omitDateIfSameAsPrevious` setting (#2314)
 - Drop `SeparateBillingAddressUpgradeWizard` (#3496)

diff --git a/Classes/Service/OneTimeAccountConnector.php b/Classes/Service/OneTimeAccountConnector.php
@@ -35,14 +35,6 @@ public function __construct()
         $this->frontEndUserAuthentication = $frontEndUserAuthentication;
     }
 
-    /**
-     * Checks whether a login session is active, and that is has been created by the "onetimeaccount" extension.
-     */
-    public function existsOneTimeAccountLoginSession(): bool
-    {
-        return $this->frontEndUserAuthentication->getKey('user', 'onetimeaccount') === true;
-    }
-
     /**
      * Returns the user UID of a FE user created by the "onetimeaccount" extension (without a FE login session).
      *
@@ -59,19 +51,12 @@ public function getOneTimeAccountUserUid(): ?int
     }
 
     /**
-     * Destroys any onetimeaccount sessions (with or without login).
-     *
-     * If a onetimeaccount login session is active, the user will be logged out.
+     * Destroys any onetimeaccount sessions (without login).
      *
-     * If no user is logged in, but a onetimeaccount user UID is available in the session, it will be deleted.
-     *
-     * If regular FE user is logged in, nothing happens.
+     * If a onetimeaccount user UID is available in the session, it will be deleted.
      */
     public function destroyOneTimeSession(): void
     {
-        if ($this->existsOneTimeAccountLoginSession()) {
-            $this->frontEndUserAuthentication->logoff();
-        }
         if (\is_int($this->getOneTimeAccountUserUid())) {
             $this->frontEndUserAuthentication->setAndSaveSessionData('onetimeaccountUserUid', null);
         }

diff --git a/Tests/Unit/Service/OneTimeAccountConnectorTest.php b/Tests/Unit/Service/OneTimeAccountConnectorTest.php
@@ -80,26 +80,6 @@ public function isSingleton(): void
         self::assertInstanceOf(SingletonInterface::class, $this->subject);
     }
 
-    /**
-     * @test
-     */
-    public function existsOneTimeAccountLoginSessionForNoSessionDataReturnsFalse(): void
-    {
-        $this->frontEndUserAuthenticationMock->method('getKey')->with('user', 'onetimeaccount')->willReturn(null);
-
-        self::assertFalse($this->subject->existsOneTimeAccountLoginSession());
-    }
-
-    /**
-     * @test
-     */
-    public function existsOneTimeAccountLoginSessionForSessionDataReturnsTrue(): void
-    {
-        $this->frontEndUserAuthenticationMock->method('getKey')->with('user', 'onetimeaccount')->willReturn(true);
-
-        self::assertTrue($this->subject->existsOneTimeAccountLoginSession());
-    }
-
     /**
      * @test
      */
@@ -143,18 +123,6 @@ public function getOneTimeAccountUserUidForPositiveUserUidReturnsUserUid(): void
         self::assertSame($userUid, $this->subject->getOneTimeAccountUserUid());
     }
 
-    /**
-     * @test
-     */
-    public function destroyOneTimeSessionForRegularLoginDoesNotLogUserOut(): void
-    {
-        $this->frontEndUserAuthenticationMock->method('getKey')->with('user', 'onetimeaccount')->willReturn(null);
-
-        $this->frontEndUserAuthenticationMock->expects(self::never())->method('logoff');
-
-        $this->subject->destroyOneTimeSession();
-    }
-
     /**
      * @test
      */
@@ -167,18 +135,6 @@ public function destroyOneTimeSessionForRegularLoginDoesSetAnySessionDate(): voi
         $this->subject->destroyOneTimeSession();
     }
 
-    /**
-     * @test
-     */
-    public function destroyOneTimeSessionForOneTimeLoginLogsUserOut(): void
-    {
-        $this->frontEndUserAuthenticationMock->method('getKey')->with('user', 'onetimeaccount')->willReturn(true);
-
-        $this->frontEndUserAuthenticationMock->expects(self::once())->method('logoff');
-
-        $this->subject->destroyOneTimeSession();
-    }
-
     /**
      * @test
      */
@@ -194,20 +150,6 @@ public function destroyOneTimeSessionForOneTimeSessionWithoutLoginRemovesUserUid
         $this->subject->destroyOneTimeSession();
     }
 
-    /**
-     * @test
-     */
-    public function destroyOneTimeSessionForRegularLoginAndOneTimeSessionDoesNotLogUserOut(): void
-    {
-        $this->frontEndUserAuthenticationMock->method('getKey')->with('user', 'onetimeaccount')->willReturn(null);
-        $this->frontEndUserAuthenticationMock->method('getSessionData')->with('onetimeaccountUserUid')
-            ->willReturn(5);
-
-        $this->frontEndUserAuthenticationMock->expects(self::never())->method('logoff');
-
-        $this->subject->destroyOneTimeSession();
-    }
-
     /**
      * @test
      */