Remove permission user/two-factor-authentication

The user should not need to ask for more security.

Author: jrauh01

application/controllers/AccountController.php

@@ -74,24 +74,23 @@ public function indexAction()
             }
         }
 
-        if ($user->can('user/two-factor-authentication')) {
-            $twoFactor = TwoFactorTotp::loadFromDb($this->getDb(), $user->getUsername());
-            if ($twoFactor === null) {
-                $twoFactor = TwoFactorTotp::generate($user->getUsername());
+        $twoFactor = TwoFactorTotp::loadFromDb($this->getDb(), $user->getUsername());
+        if ($twoFactor === null) {
+            $twoFactor = TwoFactorTotp::generate($user->getUsername());
+        }
+
+        $twoFactorForm = new TwoFactorConfigForm();
+        $twoFactorForm->setUser($user);
+        $twoFactorForm->setTwoFactor($twoFactor);
+        $twoFactorForm->on(Form::ON_SUBMIT, function (TwoFactorConfigForm $form) {
+            if ($redirectUrl = $form->getRedirectUrl()) {
+                $this->redirectNow($redirectUrl);
             }
+        });
+        $twoFactorForm->handleRequest(ServerRequest::fromGlobals());
 
-            $twoFactorForm = new TwoFactorConfigForm();
-            $twoFactorForm->setUser($user);
-            $twoFactorForm->setTwoFactor($twoFactor);
-            $twoFactorForm->on(Form::ON_SUBMIT, function (TwoFactorConfigForm $form) {
-                if ($redirectUrl = $form->getRedirectUrl()) {
-                    $this->redirectNow($redirectUrl);
-                }
-            });
-            $twoFactorForm->handleRequest(ServerRequest::fromGlobals());
+        $this->view->twoFactorForm = $twoFactorForm;
 
-            $this->view->twoFactorForm = $twoFactorForm;
-        }
 
         $form = new PreferenceForm();
         $form->setPreferences($user->getPreferences());

application/forms/Security/RoleForm.php

@@ -573,9 +573,6 @@ public static function collectProvidedPrivileges()
             'user/password-change' => [
                 'description' => t('Allow password changes in the account preferences')
             ],
-            'user/two-factor-authentication'=> [
-                'description' => t('Allow 2FA configuration in the account preferences')
-            ],
             'user/application/stacktraces' => [
                 'description' => t('Allow to adjust in the preferences whether to show stacktraces')
             ],