Merge branch 'release/1.1.3'

Author: codeFareith

CHANGELOG.md

@@ -11,6 +11,25 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - nothing, yet
 
+## [1.1.3] - 2019-05-04
+
+### Changed
+
+- provide `TYPO3\CMS\Lang\LanguageService` via constructor injection
+in `CodeFareith\CfGoogleAuthenticator\Controller\Frontend\SetupController`
+- use `CodeFareith\CfGoogleAuthenticator\Domain\Repository\FrontendUserRepository` instead of
+`TYPO3\CMS\Extbase\Domain\Repository\FrontendUserRepository` in `CodeFareith\CfGoogleAuthenticator\Controller\Frontend\SetupController`
+- remove object mapping in `setup.typoscript` and move table mapping to `ext_typoscript_setup.typoscript`
+
+### Added
+
+#### Files
+
+- Classes/Domain/Repository/FrontendUserRepository
+- ext_typoscript_setup.typoscript
+
+
+
 ## [1.1.2] - 2018-10-15
 
 ### Changed

Classes/Controller/Frontend/SetupController.php

@@ -15,16 +15,21 @@
 use CodeFareith\CfGoogleAuthenticator\Domain\Form\SetupForm;
 use CodeFareith\CfGoogleAuthenticator\Domain\Immutable\AuthenticationSecret;
 use CodeFareith\CfGoogleAuthenticator\Domain\Model\FrontendUser;
+use CodeFareith\CfGoogleAuthenticator\Domain\Repository\FrontendUserRepository;
 use CodeFareith\CfGoogleAuthenticator\Service\GoogleQrCodeGenerator;
 use CodeFareith\CfGoogleAuthenticator\Service\QrCodeGeneratorInterface;
-use CodeFareith\CfGoogleAuthenticator\Traits\GeneralUtilityContext;
 use CodeFareith\CfGoogleAuthenticator\Utility\Base32Utility;
 use CodeFareith\CfGoogleAuthenticator\Utility\PathUtility;
 use CodeFareith\CfGoogleAuthenticator\Validation\Validator\SetupFormValidator;
+use Exception;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
-use TYPO3\CMS\Extbase\Domain\Repository\FrontendUserRepository;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException;
+use TYPO3\CMS\Extbase\Mvc\Exception\StopActionException;
+use TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException;
+use TYPO3\CMS\Extbase\Object\InvalidClassException;
+use TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException;
+use TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException;
 use TYPO3\CMS\Lang\LanguageService;
 
 /**
@@ -50,6 +55,9 @@ class SetupController
     /** @var SetupFormValidator */
     protected $setupFormValidator;
 
+    /** @var LanguageService */
+    protected $languageService;
+
     /** @var AuthenticationSecret */
     private $authenticationSecret;
 
@@ -59,18 +67,20 @@ class SetupController
     public function __construct(
         FrontendUserRepository $frontendUserRepository,
         GoogleQrCodeGenerator $qrCodeGenerator,
-        SetupFormValidator $setupFormValidator
+        SetupFormValidator $setupFormValidator,
+        LanguageService $languageService
     )
     {
         parent::__construct();
 
         $this->frontendUserRepository = $frontendUserRepository;
         $this->qrCodeGenerator = $qrCodeGenerator;
         $this->setupFormValidator = $setupFormValidator;
+        $this->languageService = $languageService;
     }
 
     /**
-     * @throws \Exception
+     * @throws Exception
      */
     public function indexAction(): void
     {
@@ -107,10 +117,10 @@ public function initializeUpdateAction(): void
 
     /**
      * @throws NoSuchArgumentException
-     * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
-     * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
-     * @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException
-     * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
+     * @throws StopActionException
+     * @throws IllegalObjectTypeException
+     * @throws UnknownObjectException
+     * @throws UnsupportedRequestTypeException
      */
     public function updateAction(): void
     {
@@ -155,7 +165,7 @@ private function isUserLoggedin(): bool
     }
 
     /**
-     * @throws \Exception
+     * @throws Exception
      */
     private function getAuthenticationSecret(): AuthenticationSecret
     {
@@ -195,7 +205,7 @@ private function getUsername(): string
     }
 
     /**
-     * @throws \Exception
+     * @throws Exception
      */
     private function getSecretKey(): string
     {
@@ -226,16 +236,30 @@ private function isGoogleAuthenticatorEnabled(): bool
     }
 
     /**
-     * @throws \Exception
+     * @throws Exception
      */
     private function getSetupForm(): SetupForm
     {
         /** @noinspection PhpMethodParametersCountMismatchInspection */
-        return $this->objectManager->get(
+        $object = $this->objectManager->get(
             SetupForm::class,
             $this->getAuthenticationSecret()->getSecretKey(),
             ''
         );
+
+        if (!$object instanceof SetupForm) {
+            throw new InvalidClassException(
+                \vsprintf(
+                    'Invalid class. Expected "%s", got "%s".',
+                    [
+                        SetupForm::class,
+                        \get_class($object),
+                    ]
+                )
+            );
+        }
+
+        return $object;
     }
 
     /**
@@ -274,6 +298,6 @@ private function getFrontendUserId(): int
 
     private function getLanguageService(): LanguageService
     {
-        return $GLOBALS['LANG'];
+        return $this->languageService;
     }
 }

Classes/Domain/Repository/FrontendUserRepository.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * @author Robin 'codeFareith' von den Bergen <robinvonberg@gmx.de>
+ * @copyright (c) 2018 by Robin von den Bergen
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version 1.0.0
+ *
+ * @link https://github.com/codeFareith/cf_google_authenticator
+ * @see https://www.fareith.de
+ * @see https://typo3.org
+ */
+
+namespace CodeFareith\CfGoogleAuthenticator\Domain\Repository;
+
+use TYPO3\CMS\Extbase\Persistence\Repository;
+
+class FrontendUserRepository extends Repository
+{
+}

Configuration/TypoScript/setup.typoscript

@@ -1,26 +1,4 @@
 plugin {
-    tx_cfgoogleauthenticator {
-        persistence {
-            classes {
-                CodeFareith\CfGoogleAuthenticator\Domain\Model\FrontendUser {
-                    mapping {
-                        tableName = fe_users
-                    }
-                }
-                CodeFareith\CfGoogleAuthenticator\Domain\Model\BackendUser {
-                    mapping {
-                        tableName = be_users
-                    }
-                }
-            }
-        }
-
-        objects {
-            TYPO3\CMS\Extbase\Domain\Model\FrontendUser.className = CodeFareith\CfGoogleAuthenticator\Domain\Model\FrontendUser
-            TYPO3\CMS\Extbase\Domain\Model\BackendUser.className = CodeFareith\CfGoogleAuthenticator\Domain\Model\BackendUser
-        }
-    }
-
     tx_cfgoogleauthenticator_setup {
         view {
             layoutRootPaths {

ext_emconf.php

@@ -27,7 +27,7 @@
     'author_company' => '',
 
     'state' => 'stable',
-    'version' => '1.1.2',
+    'version' => '1.1.3',
 
     'uploadFolders' => false,
     'createDirs' => '',

ext_typoscript_setup.typoscript

@@ -0,0 +1,18 @@
+config {
+    tx_extbase {
+        persistence {
+            classes {
+                CodeFareith\CfGoogleAuthenticator\Domain\Model\FrontendUser {
+                    mapping {
+                        tableName = fe_users
+                    }
+                }
+                CodeFareith\CfGoogleAuthenticator\Domain\Model\BackendUser {
+                    mapping {
+                        tableName = be_users
+                    }
+                }
+            }
+        }
+    }
+}