X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FMagic.php;h=af8ff3605639113a9cf1164eb6777082c01ba6a0;hb=122ad0af14f046c2462a03fe33967dc41abfc8b5;hp=85da8eb485150e19e057af3b8661258525539b12;hpb=13a10b8f20ac7c5927c39d9e80e1a7d515385736;p=friendica.git diff --git a/src/Module/Magic.php b/src/Module/Magic.php index 85da8eb485..af8ff36056 100644 --- a/src/Module/Magic.php +++ b/src/Module/Magic.php @@ -28,7 +28,6 @@ use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; use Friendica\Util\HTTPSignature; -use Friendica\Util\Network; use Friendica\Util\Strings; /** @@ -42,9 +41,9 @@ class Magic extends BaseModule { $a = DI::app(); $ret = ['success' => false, 'url' => '', 'message' => '']; - Logger::log('magic mdule: invoked', Logger::DEBUG); + Logger::info('magic mdule: invoked'); - Logger::log('args: ' . print_r($_REQUEST, true), Logger::DATA); + Logger::debug('args', ['request' => $_REQUEST]); $addr = $_REQUEST['addr'] ?? ''; $dest = $_REQUEST['dest'] ?? ''; @@ -73,7 +72,7 @@ class Magic extends BaseModule return $ret; } - Logger::log('Contact is already authenticated', Logger::DEBUG); + Logger::info('Contact is already authenticated'); System::externalRedirect($dest); } @@ -89,19 +88,19 @@ class Magic extends BaseModule $exp = explode('/profile/', $contact['url']); $basepath = $exp[0]; - $headers = []; - $headers['Accept'] = 'application/x-dfrn+json, application/x-zot+json'; - $headers['X-Open-Web-Auth'] = Strings::getRandomHex(); + $header = []; + $header['Accept'] = 'application/x-dfrn+json, application/x-zot+json'; + $header['X-Open-Web-Auth'] = Strings::getRandomHex(); // Create a header that is signed with the local users private key. - $headers = HTTPSignature::createSig( - $headers, + $header = HTTPSignature::createSig( + $header, $user['prvkey'], 'acct:' . $user['nickname'] . '@' . DI::baseUrl()->getHostname() . (DI::baseUrl()->getUrlPath() ? '/' . DI::baseUrl()->getUrlPath() : '') ); // Try to get an authentication token from the other instance. - $curlResult = Network::curl($basepath . '/owa', false, ['headers' => $headers]); + $curlResult = DI::httpRequest()->get($basepath . '/owa', ['header' => $header]); if ($curlResult->isSuccess()) { $j = json_decode($curlResult->getBody(), true);