Merge pull request #8006 from MrPetovan/bug/7991-remove-group-add-restrictions

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

diff --git a/src/Module/Login.php b/src/Module/Login.php
index f43bd221e8b8bb80e6d4ed803c6d959deec71dea..d7c537839d92d6cd638219ef9db048926a944853 100644 (file)
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -7,7 +7,7 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Core\Authentication;
+use Friendica\App\Authentication;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
@@ -35,11 +35,8 @@ class Login extends BaseModule
 
        public static function post(array $parameters = [])
        {
-               $openid_identity = Session::get('openid_identity');
-               $openid_server = Session::get('openid_server');
-
                $return_path = Session::get('return_path');
-               session_unset();
+               Session::clear();
                Session::set('return_path', $return_path);
 
                // OpenId Login
@@ -50,16 +47,19 @@ class Login extends BaseModule
                ) {
                        $openid_url = trim(($_POST['openid_url'] ?? '') ?: $_POST['username']);
 
-                       Authentication::openIdAuthentication($openid_url, !empty($_POST['remember']));
+                       /** @var Authentication $authentication */
+                       $authentication = self::getClass(Authentication::class);
+                       $authentication->withOpenId($openid_url, !empty($_POST['remember']));
                }
 
                if (!empty($_POST['auth-params']) && $_POST['auth-params'] === 'login') {
-                       Authentication::passwordAuthentication(
+                       /** @var Authentication $authentication */
+                       $authentication = self::getClass(Authentication::class);
+                       $authentication->withPassword(
+                               self::getApp(),
                                trim($_POST['username']),
                                trim($_POST['password']),
-                               !empty($_POST['remember']),
-                               $openid_identity,
-                               $openid_server
+                               !empty($_POST['remember'])
                        );
                }
        }