Merge branch 'friendica:develop' into doc_faq_client-clean-up

[friendica.git] / src / Module / Settings / TwoFactor / Verify.php

diff --git a/src/Module/Settings/TwoFactor/Verify.php b/src/Module/Settings/TwoFactor/Verify.php
index 18aa6ca9f08c0faab290a9e26244b9196c441b63..93fdde9207d5a709d85cd9d758827f0f038cb97b 100644 (file)
--- a/src/Module/Settings/TwoFactor/Verify.php
+++ b/src/Module/Settings/TwoFactor/Verify.php
@@ -25,9 +25,11 @@ use BaconQrCode\Renderer\Image\SvgImageBackEnd;
 use BaconQrCode\Renderer\ImageRenderer;
 use BaconQrCode\Renderer\RendererStyle\RendererStyle;
 use BaconQrCode\Writer;
+use Friendica\App\BaseURL;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
-use Friendica\DI;
 use Friendica\Module\BaseSettings;
 use Friendica\Module\Security\Login;
 use PragmaRX\Google2FA\Google2FA;
@@ -39,22 +41,32 @@ use PragmaRX\Google2FA\Google2FA;
  */
 class Verify extends BaseSettings
 {
-       public function init()
+       /** @var IManagePersonalConfigValues */
+       protected $pConfig;
+       /** @var BaseURL */
+       protected $baseUrl;
+
+       public function __construct(IManagePersonalConfigValues $pConfig, BaseURL $baseUrl, L10n $l10n, array $parameters = [])
        {
+               parent::__construct($l10n, $parameters);
+
+               $this->pConfig = $pConfig;
+               $this->baseUrl = $baseUrl;
+
                if (!local_user()) {
                        return;
                }
 
-               $secret = DI::pConfig()->get(local_user(), '2fa', 'secret');
-               $verified = DI::pConfig()->get(local_user(), '2fa', 'verified');
+               $secret   = $this->pConfig->get(local_user(), '2fa', 'secret');
+               $verified = $this->pConfig->get(local_user(), '2fa', 'verified');
 
                if ($secret && $verified) {
-                       DI::baseUrl()->redirect('settings/2fa');
+                       $this->baseUrl->redirect('settings/2fa');
                }
 
                if (!self::checkFormSecurityToken('settings_2fa_password', 't')) {
-                       notice(DI::l10n()->t('Please enter your password to access this page.'));
-                       DI::baseUrl()->redirect('settings/2fa');
+                       notice($this->t('Please enter your password to access this page.'));
+                       $this->baseUrl->redirect('settings/2fa');
                }
        }
 
@@ -69,17 +81,17 @@ class Verify extends BaseSettings
 
                        $google2fa = new Google2FA();
 
-                       $valid = $google2fa->verifyKey(DI::pConfig()->get(local_user(), '2fa', 'secret'), $_POST['verify_code'] ?? '');
+                       $valid = $google2fa->verifyKey($this->pConfig->get(local_user(), '2fa', 'secret'), $_POST['verify_code'] ?? '');
 
                        if ($valid) {
-                               DI::pConfig()->set(local_user(), '2fa', 'verified', true);
+                               $this->pConfig->set(local_user(), '2fa', 'verified', true);
                                Session::set('2fa', true);
 
-                               info(DI::l10n()->t('Two-factor authentication successfully activated.'));
+                               info($this->t('Two-factor authentication successfully activated.'));
 
-                               DI::baseUrl()->redirect('settings/2fa');
+                               $this->baseUrl->redirect('settings/2fa');
                        } else {
-                               notice(DI::l10n()->t('Invalid code, please retry.'));
+                               notice($this->t('Invalid code, please retry.'));
                        }
                }
        }
@@ -94,7 +106,7 @@ class Verify extends BaseSettings
 
                $company = 'Friendica';
                $holder = Session::get('my_address');
-               $secret = DI::pConfig()->get(local_user(), '2fa', 'secret');
+               $secret = $this->pConfig->get(local_user(), '2fa', 'secret');
 
                $otpauthUrl = (new Google2FA())->getQRCodeUrl($company, $holder, $secret);
 
@@ -108,7 +120,7 @@ class Verify extends BaseSettings
 
                $shortOtpauthUrl = explode('?', $otpauthUrl)[0];
 
-               $manual_message = DI::l10n()->t('<p>Or you can submit the authentication settings manually:</p>
+               $manual_message = $this->t('<p>Or you can submit the authentication settings manually:</p>
 <dl>
        <dt>Issuer</dt>
        <dd>%s</dd>
@@ -128,18 +140,18 @@ class Verify extends BaseSettings
                        '$form_security_token'     => self::getFormSecurityToken('settings_2fa_verify'),
                        '$password_security_token' => self::getFormSecurityToken('settings_2fa_password'),
 
-                       '$title'              => DI::l10n()->t('Two-factor code verification'),
-                       '$help_label'         => DI::l10n()->t('Help'),
-                       '$message'            => DI::l10n()->t('<p>Please scan this QR Code with your authenticator app and submit the provided code.</p>'),
+                       '$title'              => $this->t('Two-factor code verification'),
+                       '$help_label'         => $this->t('Help'),
+                       '$message'            => $this->t('<p>Please scan this QR Code with your authenticator app and submit the provided code.</p>'),
                        '$qrcode_image'       => $qrcode_image,
-                       '$qrcode_url_message' => DI::l10n()->t('<p>Or you can open the following URL in your mobile device:</p><p><a href="%s">%s</a></p>', $otpauthUrl, $shortOtpauthUrl),
+                       '$qrcode_url_message' => $this->t('<p>Or you can open the following URL in your mobile device:</p><p><a href="%s">%s</a></p>', $otpauthUrl, $shortOtpauthUrl),
                        '$manual_message'     => $manual_message,
                        '$company'            => $company,
                        '$holder'             => $holder,
                        '$secret'             => $secret,
 
-                       '$verify_code'  => ['verify_code', DI::l10n()->t('Please enter a code from your authentication app'), '', '', DI::l10n()->t('Required'), 'autofocus autocomplete="off" placeholder="000000"'],
-                       '$verify_label' => DI::l10n()->t('Verify code and enable two-factor authentication'),
+                       '$verify_code'  => ['verify_code', $this->t('Please enter a code from your authentication app'), '', '', $this->t('Required'), 'autofocus autocomplete="off" placeholder="000000"'],
+                       '$verify_label' => $this->t('Verify code and enable two-factor authentication'),
                ]);
        }
 }