Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-24 01:50:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

UserSession class [5] - Refactor src/Module/ files with DI

Browse source
This commit is contained in:
Philipp 2022-10-20 22:59:12 +02:00
parent a729f3255d
commit eecc456e0c
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
78 changed files with 455 additions and 530 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,6 @@ use Friendica\App;
use Friendica\BaseModule;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\Core\Session\Capability\IHandleSessions;
use Friendica\DI;
use Friendica\Model\User;
@ -60,7 +59,7 @@ class Recovery extends BaseModule
protected function post(array $request = [])
{
if (!Session::getLocalUser()) {
if (!DI::userSession()->getLocalUserId()) {
return;
}
@ -69,10 +68,10 @@ class Recovery extends BaseModule
$recovery_code = $_POST['recovery_code'] ?? '';
if (RecoveryCode::existsForUser(Session::getLocalUser(), $recovery_code)) {
RecoveryCode::markUsedForUser(Session::getLocalUser(), $recovery_code);
if (RecoveryCode::existsForUser(DI::userSession()->getLocalUserId(), $recovery_code)) {
RecoveryCode::markUsedForUser(DI::userSession()->getLocalUserId(), $recovery_code);
$this->session->set('2fa', true);
DI::sysmsg()->addInfo($this->t('Remaining recovery codes: %d', RecoveryCode::countValidForUser(Session::getLocalUser())));
DI::sysmsg()->addInfo($this->t('Remaining recovery codes: %d', RecoveryCode::countValidForUser(DI::userSession()->getLocalUserId())));
$this->auth->setForUser($this->app, User::getById($this->app->getLoggedInUserId()), true, true);
@ -85,7 +84,7 @@ class Recovery extends BaseModule
protected function content(array $request = []): string
{
if (!Session::getLocalUser()) {
if (!DI::userSession()->getLocalUserId()) {
$this->baseUrl->redirect();
}

7
src/Module/Security/TwoFactor/SignOut.php
View file

@ -25,7 +25,6 @@ use Friendica\App;
use Friendica\BaseModule;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\Core\Session\Capability\IHandleSessions;
use Friendica\DI;
use Friendica\Model\User\Cookie;
@ -62,7 +61,7 @@ class SignOut extends BaseModule
protected function post(array $request = [])
{
if (!Session::getLocalUser() || !($this->cookie->get('2fa_cookie_hash'))) {
if (!DI::userSession()->getLocalUserId() || !($this->cookie->get('2fa_cookie_hash'))) {
return;
}
@ -81,7 +80,7 @@ class SignOut extends BaseModule
$this->baseUrl->redirect();
break;
case 'sign_out':
$this->trustedBrowserRepository->removeForUser(Session::getLocalUser(), $this->cookie->get('2fa_cookie_hash'));
$this->trustedBrowserRepository->removeForUser(DI::userSession()->getLocalUserId(), $this->cookie->get('2fa_cookie_hash'));
$this->cookie->clear();
$this->session->clear();
@ -96,7 +95,7 @@ class SignOut extends BaseModule
protected function content(array $request = []): string
{
if (!Session::getLocalUser() || !($this->cookie->get('2fa_cookie_hash'))) {
if (!DI::userSession()->getLocalUserId() || !($this->cookie->get('2fa_cookie_hash'))) {
$this->baseUrl->redirect();
}

7
src/Module/Security/TwoFactor/Trust.php
View file

@ -25,7 +25,6 @@ use Friendica\App;
use Friendica\BaseModule;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\Core\Session\Capability\IHandleSessions;
use Friendica\DI;
use Friendica\Model\User;
@ -75,7 +74,7 @@ class Trust extends BaseModule
protected function post(array $request = [])
{
if (!Session::getLocalUser() || !$this->session->get('2fa')) {
if (!DI::userSession()->getLocalUserId() || !$this->session->get('2fa')) {
$this->logger->info('Invalid call', ['request' => $request]);
return;
}
@ -88,7 +87,7 @@ class Trust extends BaseModule
switch ($action) {
case 'trust':
case 'dont_trust':
$trustedBrowser = $this->trustedBrowserFactory->createForUserWithUserAgent(Session::getLocalUser(), $this->server['HTTP_USER_AGENT'], $action === 'trust');
$trustedBrowser = $this->trustedBrowserFactory->createForUserWithUserAgent(DI::userSession()->getLocalUserId(), $this->server['HTTP_USER_AGENT'], $action === 'trust');
try {
$this->trustedBrowserRepository->save($trustedBrowser);
@ -116,7 +115,7 @@ class Trust extends BaseModule
protected function content(array $request = []): string
{
if (!Session::getLocalUser() || !$this->session->get('2fa')) {
if (!DI::userSession()->getLocalUserId() || !$this->session->get('2fa')) {
$this->baseUrl->redirect();
}