<?php
-
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
namespace Friendica\Module\Settings\TwoFactor;
-
+use Friendica\App;
use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
use Friendica\Core\Renderer;
-use Friendica\Model\TwoFactorRecoveryCode;
-use Friendica\Module\BaseSettingsModule;
-use Friendica\Module\Login;
+use Friendica\Module\Response;
+use Friendica\Security\TwoFactor\Model\RecoveryCode;
+use Friendica\Module\BaseSettings;
+use Friendica\Module\Security\Login;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
/**
* // Page 3: 2FA enabled but not verified, show recovery codes
*
* @package Friendica\Module\TwoFactor
*/
-class Recovery extends BaseSettingsModule
+class Recovery extends BaseSettings
{
- public static function init()
+ /** @var IManagePersonalConfigValues */
+ protected $pConfig;
+
+ public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManagePersonalConfigValues $pConfig, array $server, array $parameters = [])
{
+ parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+ $this->pConfig = $pConfig;
+
if (!local_user()) {
return;
}
- $secret = PConfig::get(local_user(), '2fa', 'secret');
+ $secret = $this->pConfig->get(local_user(), '2fa', 'secret');
if (!$secret) {
- self::getApp()->internalRedirect('settings/2fa');
+ $this->baseUrl->redirect('settings/2fa');
}
if (!self::checkFormSecurityToken('settings_2fa_password', 't')) {
- notice(L10n::t('Please enter your password to access this page.'));
- self::getApp()->internalRedirect('settings/2fa');
+ notice($this->t('Please enter your password to access this page.'));
+ $this->baseUrl->redirect('settings/2fa');
}
}
- public static function post()
+ protected function post(array $request = [], array $post = [])
{
if (!local_user()) {
return;
self::checkFormSecurityTokenRedirectOnError('settings/2fa/recovery', 'settings_2fa_recovery');
if ($_POST['action'] == 'regenerate') {
- TwoFactorRecoveryCode::regenerateForUser(local_user());
- notice(L10n::t('New recovery codes successfully generated.'));
- self::getApp()->internalRedirect('settings/2fa/recovery?t=' . self::getFormSecurityToken('settings_2fa_password'));
+ RecoveryCode::regenerateForUser(local_user());
+ info($this->t('New recovery codes successfully generated.'));
+ $this->baseUrl->redirect('settings/2fa/recovery?t=' . self::getFormSecurityToken('settings_2fa_password'));
}
}
}
- public static function content()
+ protected function content(array $request = []): string
{
if (!local_user()) {
return Login::form('settings/2fa/recovery');
parent::content();
- if (!TwoFactorRecoveryCode::countValidForUser(local_user())) {
- TwoFactorRecoveryCode::generateForUser(local_user());
+ if (!RecoveryCode::countValidForUser(local_user())) {
+ RecoveryCode::generateForUser(local_user());
}
- $recoveryCodes = TwoFactorRecoveryCode::getListForUser(local_user());
+ $recoveryCodes = RecoveryCode::getListForUser(local_user());
- $verified = PConfig::get(local_user(), '2fa', 'verified');
+ $verified = $this->pConfig->get(local_user(), '2fa', 'verified');
return Renderer::replaceMacros(Renderer::getMarkupTemplate('settings/twofactor/recovery.tpl'), [
- '$form_security_token' => self::getFormSecurityToken('settings_2fa_recovery'),
+ '$form_security_token' => self::getFormSecurityToken('settings_2fa_recovery'),
'$password_security_token' => self::getFormSecurityToken('settings_2fa_password'),
- '$title' => L10n::t('Two-factor recovery codes'),
- '$help_label' => L10n::t('Help'),
- '$message' => L10n::t('<p>Recovery codes can be used to access your account in the event you lose access to your device and cannot receive two-factor authentication codes.</p><p><strong>Put these in a safe spot!</strong> If you lose your device and don’t have the recovery codes you will lose access to your account.</p>'),
- '$recovery_codes' => $recoveryCodes,
- '$password' => ['password', L10n::t('Please enter your password for verification:'), '', L10n::t('You need to provide your current password to enable or disable two-factor authentication.'), 'required', 'autofocus'],
- '$regenerate_message' => L10n::t('When you generate new recovery codes, you must copy the new codes. Your old codes won’t work anymore.'),
- '$regenerate_label' => L10n::t('Generate new recovery codes'),
- '$verified' => $verified,
- '$verify_label' => L10n::t('Next: Verification'),
+
+ '$title' => $this->t('Two-factor recovery codes'),
+ '$help_label' => $this->t('Help'),
+ '$message' => $this->t('<p>Recovery codes can be used to access your account in the event you lose access to your device and cannot receive two-factor authentication codes.</p><p><strong>Put these in a safe spot!</strong> If you lose your device and don’t have the recovery codes you will lose access to your account.</p>'),
+ '$recovery_codes' => $recoveryCodes,
+ '$regenerate_message' => $this->t('When you generate new recovery codes, you must copy the new codes. Your old codes won’t work anymore.'),
+ '$regenerate_label' => $this->t('Generate new recovery codes'),
+ '$verified' => $verified,
+ '$verify_label' => $this->t('Next: Verification'),
]);
}
}
projects / friendica.git / blobdiff