Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-06-26 06:40:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace TwoFactorAuth with self

Browse Source
This commit is contained in:
slawkens 2025-06-22 22:34:36 +02:00
parent 96b5df9d74
commit 797377e428
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
system/src/TwoFactorAuth/TwoFactorAuth.php
View File

@ -5,7 +5,6 @@ namespace MyAAC\TwoFactorAuth;
use MyAAC\Models\AccountEMailCode; use MyAAC\Models\AccountEMailCode;
use MyAAC\TwoFactorAuth\Gateway\AppAuthGateway; use MyAAC\TwoFactorAuth\Gateway\AppAuthGateway;
use MyAAC\TwoFactorAuth\Gateway\EmailAuthGateway; use MyAAC\TwoFactorAuth\Gateway\EmailAuthGateway;
use MyAAC\TwoFactorAuth\Interface\AuthGatewayInterface;
class TwoFactorAuth class TwoFactorAuth
{ {
@ -17,7 +16,7 @@ class TwoFactorAuth
const EMAIL_CODE_VALID_UNTIL = 24 * 60 * 60; const EMAIL_CODE_VALID_UNTIL = 24 * 60 * 60;
private static TwoFactorAuth $instance; private static self $instance;
private \OTS_Account $account; private \OTS_Account $account;
private int $authType; private int $authType;
@ -82,7 +81,7 @@ class TwoFactorAuth
} }
} }
if ($this->authType == TwoFactorAuth::TYPE_EMAIL) { if ($this->authType == self::TYPE_EMAIL) {
if (!$this->hasRecentEmailCode(15 * 60)) { if (!$this->hasRecentEmailCode(15 * 60)) {
$this->resendEmailCode(); $this->resendEmailCode();
//success('Resent email.'); //success('Resent email.');
@ -110,10 +109,10 @@ class TwoFactorAuth
public function getAccountManageViews(): array public function getAccountManageViews(): array
{ {
$twoFactorView = 'account.2fa.protected.html.twig'; $twoFactorView = 'account.2fa.protected.html.twig';
if ($this->authType == TwoFactorAuth::TYPE_EMAIL) { if ($this->authType == self::TYPE_EMAIL) {
$twoFactorView2 = 'account.2fa.email.activated.html.twig'; $twoFactorView2 = 'account.2fa.email.activated.html.twig';
} }
elseif ($this->authType == TwoFactorAuth::TYPE_APP) { elseif ($this->authType == self::TYPE_APP) {
$twoFactorView2 = 'account.2fa.app.activated.html.twig'; $twoFactorView2 = 'account.2fa.app.activated.html.twig';
} }
else { else {
@ -144,7 +143,7 @@ class TwoFactorAuth
return $this->authGateway; return $this->authGateway;
} }
public function hasRecentEmailCode($since = TwoFactorAuth::EMAIL_CODE_VALID_UNTIL): bool { public function hasRecentEmailCode($since = self::EMAIL_CODE_VALID_UNTIL): bool {
return AccountEMailCode::where('account_id', '=', $this->account->getId())->where('created_at', '>', time() - $since)->first() !== null; return AccountEMailCode::where('account_id', '=', $this->account->getId())->where('created_at', '>', time() - $since)->first() !== null;
} }