Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-19 08:30:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Get rid of App->user completely

Browse source
This commit is contained in:
Michael 2021-08-08 19:30:21 +00:00
parent fc283ab928
commit 28090bd793
39 changed files with 158 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Module/Security/TwoFactor/Recovery.php
View file

@ -25,6 +25,7 @@ use Friendica\BaseModule;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\DI;
use Friendica\Model\User;
use Friendica\Security\TwoFactor\Model\RecoveryCode;
/**
@ -59,7 +60,7 @@ class Recovery extends BaseModule
Session::set('2fa', true);
info(DI::l10n()->t('Remaining recovery codes: %d', RecoveryCode::countValidForUser(local_user())));
DI::auth()->setForUser($a, $a->user, true, true);
DI::auth()->setForUser($a, User::getById($a->getUserId()), true, true);
} else {
notice(DI::l10n()->t('Invalid code, please retry.'));
}

3
src/Module/Security/TwoFactor/Verify.php
View file

@ -25,6 +25,7 @@ use Friendica\BaseModule;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\DI;
use Friendica\Model\User;
use PragmaRX\Google2FA\Google2FA;
use Friendica\Security\TwoFactor;
@ -70,7 +71,7 @@ class Verify extends BaseModule
}
// Resume normal login workflow
DI::auth()->setForUser($a, $a->user, true, true);
DI::auth()->setForUser($a, User::getById($a->getUserId()), true, true);
} else {
self::$errors[] = DI::l10n()->t('Invalid code, please retry.');
}