UserSession class [5] - Refactor src/Module/ files with DI

[friendica.git] / src / Module / Security / OpenID.php

diff --git a/src/Module/Security/OpenID.php b/src/Module/Security/OpenID.php
index 0baa8bb543bdd755b5902573293bfec433304430..2675f1fec335af80af3fa9c6911f855c845f5753 100644 (file)
--- a/src/Module/Security/OpenID.php
+++ b/src/Module/Security/OpenID.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module\Security;
 
@@ -12,7 +31,7 @@ use LightOpenID;
  */
 class OpenID extends BaseModule
 {
-       public static function content(array $parameters = [])
+       protected function content(array $request = []): string
        {
                if (DI::config()->get('system', 'no_openid')) {
                        DI::baseUrl()->redirect();
@@ -52,11 +71,9 @@ class OpenID extends BaseModule
                                        // successful OpenID login
                                        $session->remove('openid');
 
-                                       DI::auth()->setForUser(self::getApp(), $user, true, true);
+                                       DI::auth()->setForUser(DI::app(), $user, true, true);
 
-                                       // just in case there was no return url set
-                                       // and we fell through
-                                       DI::baseUrl()->redirect();
+                                       $this->baseUrl->redirect(DI::session()->pop('return_path', ''));
                                }
 
                                // Successful OpenID login - but we can't match it to an existing account.
@@ -65,18 +82,20 @@ class OpenID extends BaseModule
                                $session->set('openid_identity', $authId);
 
                                // Detect the server URL
-                               $open_id_obj = new LightOpenID(DI::baseUrl()->getHostName());
+                               $open_id_obj = new LightOpenID(DI::baseUrl()->getHostname());
                                $open_id_obj->identity = $authId;
                                $session->set('openid_server', $open_id_obj->discover($open_id_obj->identity));
 
                                if (intval(DI::config()->get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED) {
-                                       notice($l10n->t('Account not found. Please login to your existing account to add the OpenID to it.'));
+                                       DI::sysmsg()->addNotice($l10n->t('Account not found. Please login to your existing account to add the OpenID to it.'));
                                } else {
-                                       notice($l10n->t('Account not found. Please register a new account or login to your existing account to add the OpenID to it.'));
+                                       DI::sysmsg()->addNotice($l10n->t('Account not found. Please register a new account or login to your existing account to add the OpenID to it.'));
                                }
 
                                DI::baseUrl()->redirect('login');
                        }
                }
+
+               return '';
        }
 }