UserSession class [6] - Refactor src/Module/ files without DI

diff --git a/src/Module/BaseNotifications.php b/src/Module/BaseNotifications.php
index 9e7456c7b5d813950dd24c3c4acc23754ef9d9db..a011961b67ede1026b6ce2737c1b4ba71dedb373 100644 (file)
--- a/src/Module/BaseNotifications.php
+++ b/src/Module/BaseNotifications.php
@@ -28,7 +28,7 @@ use Friendica\BaseModule;
 use Friendica\Content\Pager;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\System;
 use Friendica\Navigation\Notifications\ValueObject\FormattedNotify;
 use Friendica\Network\HTTPException\ForbiddenException;
@@ -90,11 +90,11 @@ abstract class BaseNotifications extends BaseModule
         */
        abstract public function getNotifications();
 
-       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $userSession, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-               if (!Session::getLocalUser()) {
+               if (!$userSession->getLocalUserId()) {
                        throw new ForbiddenException($this->t('Permission denied.'));
                }
 

diff --git a/src/Module/Contact/Conversations.php b/src/Module/Contact/Conversations.php
index a2f969c9ce9230b0c4fa82ec57030beb2d4b2444..838e499ccbaaf7fa94e7b3a08d65e7dc755471a4 100644 (file)
--- a/src/Module/Contact/Conversations.php
+++ b/src/Module/Contact/Conversations.php
@@ -29,7 +29,7 @@ use Friendica\Content\Nav;
 use Friendica\Content\Widget;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
-use Friendica\Core\Session;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\Theme;
 use Friendica\Model;
 use Friendica\Module\Contact;
@@ -56,25 +56,30 @@ class Conversations extends BaseModule
         * @var LocalRelationship
         */
        private $localRelationship;
+       /**
+        * @var IHandleUserSessions
+        */
+       private $userSession;
 
-       public function __construct(L10n $l10n, LocalRelationship $localRelationship, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, App\Page $page, Conversation $conversation, array $server, array $parameters = [])
+       public function __construct(L10n $l10n, LocalRelationship $localRelationship, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, App\Page $page, Conversation $conversation, IHandleUserSessions $userSession, $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->page              = $page;
                $this->conversation      = $conversation;
                $this->localRelationship = $localRelationship;
+               $this->userSession       = $userSession;
        }
 
        protected function content(array $request = []): string
        {
-               if (!Session::getLocalUser()) {
+               if (!$this->userSession->getLocalUserId()) {
                        return Login::form($_SERVER['REQUEST_URI']);
                }
 
                // Backward compatibility: Ensure to use the public contact when the user contact is provided
                // Remove by version 2022.03
-               $data = Model\Contact::getPublicAndUserContactID(intval($this->parameters['id']), Session::getLocalUser());
+               $data = Model\Contact::getPublicAndUserContactID(intval($this->parameters['id']), $this->userSession->getLocalUserId());
                if (empty($data)) {
                        throw new NotFoundException($this->t('Contact not found.'));
                }
@@ -89,7 +94,7 @@ class Conversations extends BaseModule
                        throw new NotFoundException($this->t('Contact not found.'));
                }
 
-               $localRelationship = $this->localRelationship->getForUserContact(Session::getLocalUser(), $contact['id']);
+               $localRelationship = $this->localRelationship->getForUserContact($this->userSession->getLocalUserId(), $contact['id']);
                if ($localRelationship->rel === Model\Contact::SELF) {
                        $this->baseUrl->redirect('profile/' . $contact['nick']);
                }

diff --git a/src/Module/Contact/Posts.php b/src/Module/Contact/Posts.php
index 78cd42b1ab7ed8954072fb3d7da6510e60806c07..c5a6da0d17328c86ac813bca17ddfe88d5afb11b 100644 (file)
--- a/src/Module/Contact/Posts.php
+++ b/src/Module/Contact/Posts.php
@@ -28,7 +28,7 @@ use Friendica\Content\Nav;
 use Friendica\Content\Widget;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
-use Friendica\Core\Session;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Database\DBA;
 use Friendica\Model;
 use Friendica\Module\Contact;
@@ -51,24 +51,29 @@ class Posts extends BaseModule
         * @var App\Page
         */
        private $page;
+       /**
+        * @var IHandleUserSessions
+        */
+       private $userSession;
 
-       public function __construct(L10n $l10n, LocalRelationship $localRelationship, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, App\Page $page, array $server, array $parameters = [])
+       public function __construct(L10n $l10n, LocalRelationship $localRelationship, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, App\Page $page, IHandleUserSessions $userSession, $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->localRelationship = $localRelationship;
                $this->page              = $page;
+               $this->userSession       = $userSession;
        }
 
        protected function content(array $request = []): string
        {
-               if (!Session::getLocalUser()) {
+               if (!$this->userSession->getLocalUserId()) {
                        return Login::form($_SERVER['REQUEST_URI']);
                }
 
                // Backward compatibility: Ensure to use the public contact when the user contact is provided
                // Remove by version 2022.03
-               $data = Model\Contact::getPublicAndUserContactID(intval($this->parameters['id']), Session::getLocalUser());
+               $data = Model\Contact::getPublicAndUserContactID(intval($this->parameters['id']), $this->userSession->getLocalUserId());
                if (empty($data)) {
                        throw new NotFoundException($this->t('Contact not found.'));
                }
@@ -83,7 +88,7 @@ class Posts extends BaseModule
                        throw new NotFoundException($this->t('Contact not found.'));
                }
 
-               $localRelationship = $this->localRelationship->getForUserContact(Session::getLocalUser(), $contact['id']);
+               $localRelationship = $this->localRelationship->getForUserContact($this->userSession->getLocalUserId(), $contact['id']);
                if ($localRelationship->rel === Model\Contact::SELF) {
                        $this->baseUrl->redirect('profile/' . $contact['nick']);
                }

diff --git a/src/Module/Filer/RemoveTag.php b/src/Module/Filer/RemoveTag.php
index b940e69837407700ca71f43ebae2703f1042bcaf..fccc90f9d2f5d03d80b58f9e595015b1d896e1fd 100644 (file)
--- a/src/Module/Filer/RemoveTag.php
+++ b/src/Module/Filer/RemoveTag.php
@@ -24,7 +24,7 @@ namespace Friendica\Module\Filer;
 use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
-use Friendica\Core\Session;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Post;
@@ -41,12 +41,15 @@ class RemoveTag extends BaseModule
 {
        /** @var SystemMessages */
        private $systemMessages;
+       /** @var IHandleUserSessions */
+       private $userSession;
 
-       public function __construct(SystemMessages $systemMessages, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(SystemMessages $systemMessages, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $userSession, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->systemMessages = $systemMessages;
+               $this->userSession    = $userSession;
        }
 
        protected function post(array $request = [])
@@ -56,7 +59,7 @@ class RemoveTag extends BaseModule
 
        protected function content(array $request = []): string
        {
-               if (!Session::getLocalUser()) {
+               if (!$this->userSession->getLocalUserId()) {
                        throw new HTTPException\ForbiddenException();
                }
 
@@ -108,7 +111,7 @@ class RemoveTag extends BaseModule
                        return 404;
                }
 
-               if (!Post\Category::deleteFileByURIId($item['uri-id'], Session::getLocalUser(), $type, $term)) {
+               if (!Post\Category::deleteFileByURIId($item['uri-id'], $this->userSession->getLocalUserId(), $type, $term)) {
                        $this->systemMessages->addNotice($this->l10n->t('Item was not removed'));
                        return 500;
                }

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index 42eae695e15dc810106776b0bab186b1edc1f593..c300e5971e4bddd4f0d550d443d906ec78c47f7d 100644 (file)
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -24,7 +24,7 @@ namespace Friendica\Module;
 use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
-use Friendica\Core\Session;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\System;
 use Friendica\Database\Database;
 use Friendica\Model\Contact;
@@ -50,14 +50,17 @@ class Magic extends BaseModule
        protected $dba;
        /** @var ICanSendHttpRequests */
        protected $httpClient;
+       /** @var IHandleUserSessions */
+       protected $userSession;
 
-       public function __construct(App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, Database $dba, ICanSendHttpRequests $httpClient, array $server, array $parameters = [])
+       public function __construct(App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, Database $dba, ICanSendHttpRequests $httpClient, IHandleUserSessions $userSession, $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-               $this->app        = $app;
-               $this->dba        = $dba;
-               $this->httpClient = $httpClient;
+               $this->app         = $app;
+               $this->dba         = $dba;
+               $this->httpClient  = $httpClient;
+               $this->userSession = $userSession;
        }
 
        protected function rawContent(array $request = [])
@@ -91,8 +94,8 @@ class Magic extends BaseModule
                }
 
                // OpenWebAuth
-               if (Session::getLocalUser() && $owa) {
-                       $user = User::getById(Session::getLocalUser());
+               if ($this->userSession->getLocalUserId() && $owa) {
+                       $user = User::getById($this->userSession->getLocalUserId());
 
                        // Extract the basepath
                        // NOTE: we need another solution because this does only work

diff --git a/src/Module/ParseUrl.php b/src/Module/ParseUrl.php
index 91d09240b7e6d39e5b530f3c28fc10643ba17915..fc096bbd585bf09fd62aa98157ef7ee605347011 100644 (file)
--- a/src/Module/ParseUrl.php
+++ b/src/Module/ParseUrl.php
@@ -21,19 +21,33 @@
 
 namespace Friendica\Module;
 
+use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\Session;
+use Friendica\Core\L10n;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\System;
 use Friendica\Network\HTTPException\BadRequestException;
 use Friendica\Util;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 class ParseUrl extends BaseModule
 {
+       /** @var IHandleUserSessions */
+       protected $userSession;
+
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, Session\Capability\IHandleUserSessions $userSession, $server, array $parameters = [])
+       {
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+               $this->userSession = $userSession;
+       }
+
        protected function rawContent(array $request = [])
        {
-               if (!Session::isAuthenticated()) {
+               if (!$this->userSession->isAuthenticated()) {
                        throw new \Friendica\Network\HTTPException\ForbiddenException();
                }
 

diff --git a/src/Module/Security/PasswordTooLong.php b/src/Module/Security/PasswordTooLong.php
index 32008f0486d6e3a2041479eab612f4f6d005d758..4331444196afe9103592cdb17e4b9290a1d0597c 100644 (file)
--- a/src/Module/Security/PasswordTooLong.php
+++ b/src/Module/Security/PasswordTooLong.php
@@ -24,7 +24,7 @@ namespace Friendica\Module\Security;
 use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Database\DBA;
 use Friendica\Model\User;
 use Friendica\Module\Response;
@@ -36,12 +36,15 @@ class PasswordTooLong extends \Friendica\BaseModule
 {
        /** @var SystemMessages */
        private $sysmsg;
+       /** @var IHandleUserSessions */
+       private $userSession;
 
-       public function __construct(SystemMessages $sysmsg, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(SystemMessages $sysmsg, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $userSession, $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-               $this->sysmsg = $sysmsg;
+               $this->sysmsg      = $sysmsg;
+               $this->userSession = $userSession;
        }
 
        protected function post(array $request = [])
@@ -55,13 +58,13 @@ class PasswordTooLong extends \Friendica\BaseModule
                        }
 
                        //  check if the old password was supplied correctly before changing it to the new value
-                       User::getIdFromPasswordAuthentication(Session::getLocalUser(), $request['password_current']);
+                       User::getIdFromPasswordAuthentication($this->userSession->getLocalUserId(), $request['password_current']);
 
                        if (strlen($request['password_current']) <= 72) {
                                throw new \Exception($this->l10n->t('Password does not need changing.'));
                        }
 
-                       $result = User::updatePassword(Session::getLocalUser(), $newpass);
+                       $result = User::updatePassword($this->userSession->getLocalUserId(), $newpass);
                        if (!DBA::isResult($result)) {
                                throw new \Exception($this->l10n->t('Password update failed. Please try again.'));
                        }

diff --git a/src/Module/Security/TwoFactor/Verify.php b/src/Module/Security/TwoFactor/Verify.php
index 93a9fd4dea48b1b8288be1af4ee500904bc78a69..efd7e2c73aa7e663b8336dd1ed2db777a9457a8b 100644 (file)
--- a/src/Module/Security/TwoFactor/Verify.php
+++ b/src/Module/Security/TwoFactor/Verify.php
@@ -26,8 +26,8 @@ use Friendica\BaseModule;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Core\Session\Capability\IHandleSessions;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Module\Response;
 use Friendica\Util\Profiler;
 use PragmaRX\Google2FA\Google2FA;
@@ -47,18 +47,21 @@ class Verify extends BaseModule
        protected $session;
        /** @var IManagePersonalConfigValues  */
        protected $pConfig;
+       /** @var IHandleUserSessions */
+       protected $userSession;
 
-       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManagePersonalConfigValues $pConfig, IHandleSessions $session, array $server, array $parameters = [])
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManagePersonalConfigValues $pConfig, IHandleSessions $session, IHandleUserSessions $userSession, $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-               $this->session = $session;
-               $this->pConfig = $pConfig;
+               $this->session     = $session;
+               $this->pConfig     = $pConfig;
+               $this->userSession = $userSession;
        }
 
        protected function post(array $request = [])
        {
-               if (!Session::getLocalUser()) {
+               if (!$this->userSession->getLocalUserId()) {
                        return;
                }
 
@@ -67,7 +70,7 @@ class Verify extends BaseModule
 
                        $code = $request['verify_code'] ?? '';
 
-                       $valid = (new Google2FA())->verifyKey($this->pConfig->get(Session::getLocalUser(), '2fa', 'secret'), $code);
+                       $valid = (new Google2FA())->verifyKey($this->pConfig->get($this->userSession->getLocalUserId(), '2fa', 'secret'), $code);
 
                        // The same code can't be used twice even if it's valid
                        if ($valid && $this->session->get('2fa') !== $code) {
@@ -82,7 +85,7 @@ class Verify extends BaseModule
 
        protected function content(array $request = []): string
        {
-               if (!Session::getLocalUser()) {
+               if (!$this->userSession->getLocalUserId()) {
                        $this->baseUrl->redirect();
                }