Merge branch 'release/v1.2.3'

Author: codeFareith

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [Unreleased]
 - nothing, yet
 
+## [1.2.3] - 2020-07-23
+### Fixed
+- use `$GLOBALS['BE_USER']` instead of `TYPO3\CMS\Core\Authentication\BackendUserAuthentication` in `..\Classes\Hook\UserSettings` to detect authenticator enabled state
+
 ## [1.2.2] - 2020-07-06
 ### Fixed
 - use `TYPO3\CMS\Core\Authentication\BackendUserAuthentication` in `..\Classes\Hook\UserSettings` to detect authenticator enabled state
@@ -184,7 +188,8 @@ to meet frontend requirements
 ## [1.0.0] - 2018-06-17
 - Initial development
 
-[Unreleased]: https://github.com/codeFareith/cf_google_authenticator/compare/v1.2.2...HEAD
+[Unreleased]: https://github.com/codeFareith/cf_google_authenticator/compare/v1.2.3...HEAD
+[1.2.2]: https://github.com/codeFareith/cf_google_authenticator/compare/v1.2.2...v1.2.3
 [1.2.2]: https://github.com/codeFareith/cf_google_authenticator/compare/v1.2.1...v1.2.2
 [1.2.1]: https://github.com/codeFareith/cf_google_authenticator/compare/v1.2.0...v1.2.1
 [1.2.0]: https://github.com/codeFareith/cf_google_authenticator/compare/v1.1.7...v1.2.0

Classes/Hook/UserSettings.php

@@ -21,7 +21,6 @@
 use CodeFareith\CfGoogleAuthenticator\Utility\Base32Utility;
 use CodeFareith\CfGoogleAuthenticator\Utility\PathUtility;
 use Exception;
-use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\SignalSlot\Dispatcher;
 use TYPO3\CMS\Fluid\View\StandaloneView;
@@ -207,8 +206,7 @@ private function getSecretKey(): string
     private function isGoogleAuthenticatorEnabled(): bool
     {
         if ($this->data['type'] === 'user' && !is_array($this->data['row'])) {
-            $backendUserAuthentication = $this->objectManager()->get(BackendUserAuthentication::class);
-            $this->data['row'] = $backendUserAuthentication->user;
+            $this->data['row'] = $GLOBALS['BE_USER']->user;
         }
         return (bool) $this->data['row']['tx_cfgoogleauthenticator_enabled'];
     }