Merge remote-tracking branch 'upstream/develop' into ocr

[friendica.git] / src / Security / Authentication.php

diff --git a/src/Security/Authentication.php b/src/Security/Authentication.php
index 5dcc399403004af1fafc9892b8f48aec42eb309d..5ec15567f02df74a1c8c3ca8f36fa22bb26bf8a3 100644 (file)
--- a/src/Security/Authentication.php
+++ b/src/Security/Authentication.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -230,11 +230,11 @@ class Authentication
 
                // Otherwise it's probably an openid.
                try {
-                       $openid           = new LightOpenID($this->baseUrl->getHostname());
+                       $openid           = new LightOpenID($this->baseUrl->getHost());
                        $openid->identity = $openid_url;
                        $this->session->set('openid', $openid_url);
                        $this->session->set('remember', $remember);
-                       $openid->returnUrl = $this->baseUrl->get(true) . '/openid';
+                       $openid->returnUrl = $this->baseUrl . '/openid';
                        $openid->optional  = ['namePerson/friendly', 'contact/email', 'namePerson', 'namePerson/first', 'media/image/aspect11', 'media/image/default'];
                        System::externalRedirect($openid->authUrl());
                } catch (Exception $e) {
@@ -323,19 +323,21 @@ class Authentication
         */
        public function setForUser(App $a, array $user_record, bool $login_initial = false, bool $interactive = false, bool $login_refresh = false)
        {
+               $my_url = $this->baseUrl . '/profile/' . $user_record['nickname'];
+
                $this->session->setMultiple([
                        'uid'           => $user_record['uid'],
                        'theme'         => $user_record['theme'],
                        'mobile-theme'  => $this->pConfig->get($user_record['uid'], 'system', 'mobile_theme'),
                        'authenticated' => 1,
                        'page_flags'    => $user_record['page-flags'],
-                       'my_url'        => $this->baseUrl->get() . '/profile/' . $user_record['nickname'],
-                       'my_address'    => $user_record['nickname'] . '@' . substr($this->baseUrl->get(), strpos($this->baseUrl->get(), '://') + 3),
+                       'my_url'        => $my_url,
+                       'my_address'    => $user_record['nickname'] . '@' . substr($this->baseUrl, strpos($this->baseUrl, '://') + 3),
                        'addr'          => $this->remoteAddress,
                        'nickname'      => $user_record['nickname'],
                ]);
 
-               $this->session->setVisitorsContacts();
+               $this->session->setVisitorsContacts($my_url);
 
                $member_since = strtotime($user_record['register_date']);
                $this->session->set('new_member', time() < ($member_since + (60 * 60 * 24 * 14)));
@@ -392,9 +394,6 @@ class Authentication
                        }
                }
 
-               $a->setLoggedInUserId($user_record['uid']);
-               $a->setLoggedInUserNickname($user_record['nickname']);
-
                if ($login_initial) {
                        Hook::callAll('logged_in', $user_record);
                }