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;
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 = [])
}
// 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