Merge remote-tracking branch 'upstream/develop' into app-user2

[friendica.git] / src / Module / Magic.php

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index 5b4676dd561966b7d9fb28d5cbc10bf3a9d13c3d..45fde43f64657bc334958ca85eef3f2fac3908c6 100644 (file)
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -27,6 +27,7 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
+use Friendica\Model\User;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Strings;
 
@@ -65,7 +66,7 @@ class Magic extends BaseModule
                $contact = DBA::selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]);
 
                // Redirect if the contact is already authenticated on this site.
-               if (!empty($a->getContactId()) && strpos($contact['nurl'], Strings::normaliseLink(DI::baseUrl()->get())) !== false) {
+               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;
@@ -76,52 +77,50 @@ class Magic extends BaseModule
                        System::externalRedirect($dest);
                }
 
-               if (local_user()) {
-                       $user = $a->user;
-
-                       // OpenWebAuth
-                       if ($owa) {
-                               // Extract the basepath
-                               // NOTE: we need another solution because this does only work
-                               // for friendica contacts :-/ . We should have the basepath
-                               // of a contact also in the contact table.
-                               $exp = explode('/profile/', $contact['url']);
-                               $basepath = $exp[0];
-
-                               $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.
-                               $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 = DI::httpRequest()->get($basepath . '/owa', ['header' => $header]);
-
-                               if ($curlResult->isSuccess()) {
-                                       $j = json_decode($curlResult->getBody(), true);
-
-                                       if ($j['success']) {
-                                               $token = '';
-                                               if ($j['encrypted_token']) {
-                                                       // The token is encrypted. If the local user is really the one the other instance
-                                                       // thinks he/she is, the token can be decrypted with the local users public key.
-                                                       openssl_private_decrypt(Strings::base64UrlDecode($j['encrypted_token']), $token, $user['prvkey']);
-                                               } else {
-                                                       $token = $j['token'];
-                                               }
-                                               $args = (strpbrk($dest, '?&') ? '&' : '?') . 'owt=' . $token;
-
-                                               Logger::info('Redirecting', ['path' => $dest . $args]);
-                                               System::externalRedirect($dest . $args);
+               // OpenWebAuth
+               if (local_user() && $owa) {
+                       $user = User::getById(local_user());
+
+                       // Extract the basepath
+                       // NOTE: we need another solution because this does only work
+                       // for friendica contacts :-/ . We should have the basepath
+                       // of a contact also in the contact table.
+                       $exp = explode('/profile/', $contact['url']);
+                       $basepath = $exp[0];
+
+                       $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.
+                       $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 = DI::httpRequest()->get($basepath . '/owa', ['header' => $header]);
+
+                       if ($curlResult->isSuccess()) {
+                               $j = json_decode($curlResult->getBody(), true);
+
+                               if ($j['success']) {
+                                       $token = '';
+                                       if ($j['encrypted_token']) {
+                                               // The token is encrypted. If the local user is really the one the other instance
+                                               // thinks he/she is, the token can be decrypted with the local users public key.
+                                               openssl_private_decrypt(Strings::base64UrlDecode($j['encrypted_token']), $token, $user['prvkey']);
+                                       } else {
+                                               $token = $j['token'];
                                        }
+                                       $args = (strpbrk($dest, '?&') ? '&' : '?') . 'owt=' . $token;
+
+                                       Logger::info('Redirecting', ['path' => $dest . $args]);
+                                       System::externalRedirect($dest . $args);
                                }
-                               System::externalRedirect($dest);
                        }
+                       System::externalRedirect($dest);
                }
 
                if ($test) {