X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FMagic.php;h=c47a7a4d504dffce50bf9e1acd7647692c8accf3;hb=fd7c1d766c2c922909b858f7af6aa440fbc697aa;hp=c51c05844cbecadf9f5d5bd27e2b35b9f0fdcc84;hpb=409d909d0f52395eae4bebf7960c368efed3865f;p=friendica.git

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index c51c05844c..c47a7a4d50 100644
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -21,16 +21,18 @@
 
 namespace Friendica\Module;
 
+use Friendica\App;
 use Friendica\BaseModule;
-use Friendica\Core\Logger;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBA;
-use Friendica\DI;
+use Friendica\Database\Database;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
+use Friendica\Network\HTTPClient\Capability\ICanSendHttpRequests;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Strings;
+use Psr\Log\LoggerInterface;
 
 /**
  * Magic Auth (remote authentication) module.
@@ -39,17 +41,35 @@ use Friendica\Util\Strings;
  */
 class Magic extends BaseModule
 {
-	public static function init(array $parameters = [])
+	/** @var App */
+	protected $app;
+	/** @var LoggerInterface */
+	protected $logger;
+	/** @var Database */
+	protected $dba;
+	/** @var ICanSendHttpRequests */
+	protected $httpClient;
+	protected $baseUrl;
+
+	public function __construct(App $app, App\BaseURL $baseUrl, LoggerInterface $logger, Database $dba, ICanSendHttpRequests $httpClient, L10n $l10n, array $parameters = [])
 	{
-		$a = DI::app();
-		$ret = ['success' => false, 'url' => '', 'message' => ''];
-		Logger::info('magic mdule: invoked');
+		parent::__construct($l10n, $parameters);
 
-		Logger::debug('args', ['request' => $_REQUEST]);
+		$this->app        = $app;
+		$this->logger     = $logger;
+		$this->dba        = $dba;
+		$this->httpClient = $httpClient;
+		$this->baseUrl    = $baseUrl;
+	}
+
+	public function rawContent()
+	{
+		$this->logger->info('magic module: invoked');
+
+		$this->logger->debug('args', ['request' => $_REQUEST]);
 
 		$addr = $_REQUEST['addr'] ?? '';
 		$dest = $_REQUEST['dest'] ?? '';
-		$test = (!empty($_REQUEST['test']) ? intval($_REQUEST['test']) : 0);
 		$owa  = (!empty($_REQUEST['owa'])  ? intval($_REQUEST['owa'])  : 0);
 		$cid  = 0;
 
@@ -60,21 +80,15 @@ class Magic extends BaseModule
 		}
 
 		if (!$cid) {
-			Logger::info('No contact record found', $_REQUEST);
+			$this->logger->info('No contact record found', $_REQUEST);
 			// @TODO Finding a more elegant possibility to redirect to either internal or external URL
-			$a->redirect($dest);
+			$this->app->redirect($dest);
 		}
-		$contact = DBA::selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]);
+		$contact = $this->dba->selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]);
 
 		// Redirect if the contact is already authenticated on this site.
-		if ($a->getContactId() && strpos($contact['nurl'], Strings::normaliseLink(DI::baseUrl()->get())) !== false) {
-			if ($test) {
-				$ret['success'] = true;
-				$ret['message'] .= 'Local site - you are already authenticated.' . EOL;
-				return $ret;
-			}
-
-			Logger::info('Contact is already authenticated');
+		if ($this->app->getContactId() && strpos($contact['nurl'], Strings::normaliseLink($this->baseUrl->get())) !== false) {
+			$this->logger->info('Contact is already authenticated');
 			System::externalRedirect($dest);
 		}
 
@@ -98,11 +112,11 @@ class Magic extends BaseModule
 			$header = HTTPSignature::createSig(
 				$header,
 				$user['prvkey'],
-				'acct:' . $user['nickname'] . '@' . DI::baseUrl()->getHostname() . (DI::baseUrl()->getUrlPath() ? '/' . DI::baseUrl()->getUrlPath() : '')
+				'acct:' . $user['nickname'] . '@' . $this->baseUrl->getHostname() . ($this->baseUrl->getUrlPath() ? '/' . $this->baseUrl->getUrlPath() : '')
 			);
 
 			// Try to get an authentication token from the other instance.
-			$curlResult = DI::httpClient()->get($basepath . '/owa', [HttpClientOptions::HEADERS => $header]);
+			$curlResult = $this->httpClient->get($basepath . '/owa', [HttpClientOptions::HEADERS => $header]);
 
 			if ($curlResult->isSuccess()) {
 				$j = json_decode($curlResult->getBody(), true);
@@ -118,19 +132,14 @@ class Magic extends BaseModule
 					}
 					$args = (strpbrk($dest, '?&') ? '&' : '?') . 'owt=' . $token;
 
-					Logger::info('Redirecting', ['path' => $dest . $args]);
+					$this->logger->info('Redirecting', ['path' => $dest . $args]);
 					System::externalRedirect($dest . $args);
 				}
 			}
 			System::externalRedirect($dest);
 		}
 
-		if ($test) {
-			$ret['message'] = 'Not authenticated or invalid arguments' . EOL;
-			return $ret;
-		}
-
 		// @TODO Finding a more elegant possibility to redirect to either internal or external URL
-		$a->redirect($dest);
+		$this->app->redirect($dest);
 	}
 }