[BUGFIX] Read frontend user instance from request where possible

Classes/ViewHelpers/Security/AbstractSecurityViewHelper.php

@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Utility\ContextUtility;
+use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Context\Exception\AspectNotFoundException;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
@@ -346,10 +347,20 @@ public function getCurrentFrontendUser(): ?FrontendUser
         if (empty($GLOBALS['TSFE']->loginUser)) {
             return null;
         }
-        /** @var TypoScriptFrontendController $tsfe */
-        $tsfe = $GLOBALS['TSFE'];
-        /** @var FrontendUserAuthentication $frontendUserAuthentication */
-        $frontendUserAuthentication = $tsfe->fe_user;
+
+        $frontendUserAuthentication = null;
+        if ($GLOBALS['TYPO3_REQUEST'] instanceof ServerRequestInterface) {
+            /** @var FrontendUserAuthentication|null $frontendUserAuthentication */
+            $frontendUserAuthentication = $GLOBALS['TYPO3_REQUEST']->getAttribute('frontend.user');
+        }
+
+        if ($frontendUserAuthentication === null) {
+            /** @var TypoScriptFrontendController $tsfe */
+            $tsfe = $GLOBALS['TSFE'];
+            /** @var FrontendUserAuthentication $frontendUserAuthentication */
+            $frontendUserAuthentication = $tsfe->fe_user;
+        }
+
         /** @var FrontendUser|null $frontendUser */
         $frontendUser = $this->frontendUserRepository->findByUid($frontendUserAuthentication->user['uid'] ?? 0);
         return $frontendUser;