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

Merge branch 'develop' into phpstan-level-1

Browse source
This commit is contained in:
Art4 2024-11-18 21:45:42 +00:00
commit c79f3cde22
150 changed files with 2429 additions and 1781 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/Module/Magic.php
View file

@ -8,7 +8,9 @@
namespace Friendica\Module;
use Exception;
use Friendica\App;
use Friendica\App\Arguments;
use Friendica\App\BaseURL;
use Friendica\AppHelper;
use Friendica\BaseModule;
use Friendica\Core\L10n;
use Friendica\Core\Protocol;
@ -35,8 +37,8 @@ use Psr\Log\LoggerInterface;
*/
class Magic extends BaseModule
{
/** @var App */
protected $app;
/** @var AppHelper */
protected $appHelper;
/** @var Database */
protected $dba;
/** @var ICanSendHttpRequests */
@ -44,11 +46,11 @@ class Magic extends BaseModule
/** @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, IHandleUserSessions $userSession, $server, array $parameters = [])
public function __construct(AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, 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->appHelper = $appHelper;
$this->dba = $dba;
$this->httpClient = $httpClient;
$this->userSession = $userSession;
@ -79,12 +81,12 @@ class Magic extends BaseModule
$contact = Contact::getByURL($addr ?: $dest);
if ($contact === [] && $owa === 0) {
$this->logger->info('No contact record found, no oWA, redirecting to destination.', ['request' => $request, 'server' => $_SERVER, 'dest' => $dest]);
$this->app->redirect($dest);
$this->appHelper->redirect($dest);
}
if ($contact !== []) {
// Redirect if the contact is already authenticated on this site.
if ($this->app->getContactId() && strpos($contact['nurl'], Strings::normaliseLink($this->baseUrl)) !== false) {
if ($this->appHelper->getContactId() && strpos($contact['nurl'], Strings::normaliseLink($this->baseUrl)) !== false) {
$this->logger->info('Contact is already authenticated, redirecting to destination.', ['dest' => $dest]);
System::externalRedirect($dest);
}
@ -94,7 +96,7 @@ class Magic extends BaseModule
if (!$this->userSession->getLocalUserId() || $owa === 0) {
$this->logger->notice('Not logged in or not OWA, redirecting to destination.', ['uid' => $this->userSession->getLocalUserId(), 'owa' => $owa, 'dest' => $dest]);
$this->app->redirect($dest);
$this->appHelper->redirect($dest);
}
$dest = Network::removeUrlParameter($dest, 'zid');
@ -164,7 +166,7 @@ class Magic extends BaseModule
$j = json_decode($curlResult->getBodyString(), true);
if (empty($j) || !$j['success']) {
$this->logger->notice('Invalid JSON, redirecting to destination.', ['json' => $j, 'dest' => $dest]);
$this->app->redirect($dest);
$this->appHelper->redirect($dest);
}
if ($j['encrypted_token']) {