REFACTOR: Add/remove usages and improve flash messages

Author: Nicolas Heist

Classes/Controller/AbstractTwoFactorAuthenticationController.php

@@ -1,7 +1,6 @@
 <?php
 namespace Yeebase\TwoFactorAuthentication\Controller;
 
-use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Security\Authentication\Controller\AbstractAuthenticationController;
 
 abstract class AbstractTwoFactorAuthenticationController extends AbstractAuthenticationController

Classes/Controller/AbstractTwoFactorAuthenticationManagementController.php

@@ -4,11 +4,18 @@
 use Neos\Flow\Annotations as Flow;
 use Neos\Error\Messages\Message;
 use Neos\Flow\Mvc\Controller\ActionController;
+use Neos\Flow\Security\Context;
 use Yeebase\TwoFactorAuthentication\Service\TwoFactorAuthenticationService;
 
 abstract class AbstractTwoFactorAuthenticationManagementController extends ActionController
 {
 
+    /**
+     * @var Context
+     * @Flow\Inject
+     */
+    protected $securityContext;
+
     /**
      * @var TwoFactorAuthenticationService
      * @Flow\Inject
@@ -32,9 +39,9 @@ public function enableAction(string $secret)
 
         if ($this->twoFactorAuthenticationService->validateSecret($secret, $account, true)) {
             $this->twoFactorAuthenticationService->enableTwoFactorAuthentication($account);
-            $this->addFlashMessage('Zwei-Faktor-Authentisierung aktiviert.');
+            $this->addFlashMessage('Two-Factor-Authentication activated.', '', Message::SEVERITY_OK, [], 1511944292);
         } else {
-            $this->addFlashMessage('Falsches Secret.', Message::SEVERITY_ERROR);
+            $this->addFlashMessage('Wrong Secret.', '', Message::SEVERITY_ERROR, [], 1511944293);
         }
 
         $this->redirect('configure');
@@ -46,9 +53,9 @@ public function disableAction(string $secret)
 
         if ($this->twoFactorAuthenticationService->validateSecret($secret, $account)) {
             $this->twoFactorAuthenticationService->disableTwoFactorAuthentication($account);
-            $this->addFlashMessage('Zwei-Faktor-Authentisierung deaktiviert.');
+            $this->addFlashMessage('Two-Factor-Authentication deactivated.', '', Message::SEVERITY_OK, [], 1511944294);
         } else {
-            $this->addFlashMessage('Falsches Secret.', Message::SEVERITY_ERROR);
+            $this->addFlashMessage('Wrong Secret.', '', Message::SEVERITY_ERROR, [], 1511944293);
         }
 
         $this->redirect('configure');

Classes/Service/TwoFactorAuthenticationService.php

@@ -116,7 +116,7 @@ protected function setupTwoFactorAuthenticationCredentials(Account $account)
         $this->setTwoFactorAuthenticationCredentials($account, $credentials);
     }
 
-    protected function getTwoFactorAuthenticationCredentials(Account $account): TwoFactorAuthenticationCredentialsSource
+    protected function getTwoFactorAuthenticationCredentials(Account $account)
     {
         if (! $this->hasTwoFactorAuthenticationCredentials($account)) {
             throw new \Exception('Trying to access uninitialized Two-Factor-Authentication credentials.', 1511271518);