Update wrong references to ISession::delete

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

diff --git a/src/App/Authentication.php b/src/App/Authentication.php
index b8073698f2e2bb2d669594735039ac9845c6ded9..9fc4393e248d248e39ca2c1e2908fe3c0728c5b8 100644 (file)
--- a/src/App/Authentication.php
+++ b/src/App/Authentication.php
@@ -8,13 +8,14 @@ namespace Friendica\App;
 
 use Exception;
 use Friendica\App;
-use Friendica\Core\Config\Configuration;
+use Friendica\Core\Config\IConfiguration;
 use Friendica\Core\Hook;
 use Friendica\Core\PConfig;
 use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException;
 use Friendica\Util\DateTimeFormat;
@@ -29,7 +30,7 @@ use Psr\Log\LoggerInterface;
  */
 class Authentication
 {
-       /** @var Configuration */
+       /** @var IConfiguration */
        private $config;
        /** @var App\Mode */
        private $mode;
@@ -49,7 +50,7 @@ class Authentication
        /**
         * Authentication constructor.
         *
-        * @param Configuration   $config
+        * @param IConfiguration   $config
         * @param App\Mode        $mode
         * @param App\BaseURL     $baseUrl
         * @param L10n            $l10n
@@ -58,7 +59,7 @@ class Authentication
         * @param User\Cookie     $cookie
         * @param Session\ISession $session
         */
-       public function __construct(Configuration $config, App\Mode $mode, App\BaseURL $baseUrl, L10n $l10n, Database $dba, LoggerInterface $logger, User\Cookie $cookie, Session\ISession $session)
+       public function __construct(IConfiguration $config, App\Mode $mode, App\BaseURL $baseUrl, L10n $l10n, Database $dba, LoggerInterface $logger, User\Cookie $cookie, Session\ISession $session)
        {
                $this->config  = $config;
                $this->mode = $mode;
@@ -101,7 +102,7 @@ class Authentication
                                        $user['password'] ?? '',
                                        $user['prvkey'] ?? '')) {
                                        $this->logger->notice("Hash doesn't fit.", ['user' => $data->uid]);
-                                       $this->session->delete();
+                                       $this->session->clear();
                                        $this->baseUrl->redirect();
                                }
 
@@ -136,7 +137,7 @@ class Authentication
                                                        'addr'        => $this->session->get('addr'),
                                                        'remote_addr' => $_SERVER['REMOTE_ADDR']]
                                        );
-                                       $this->session->delete();
+                                       $this->session->clear();
                                        $this->baseUrl->redirect();
                                }
 
@@ -152,7 +153,7 @@ class Authentication
                                        ]
                                );
                                if (!$this->dba->isResult($user)) {
-                                       $this->session->delete();
+                                       $this->session->clear();
                                        $this->baseUrl->redirect();
                                }
 
@@ -378,7 +379,7 @@ class Authentication
                if ($login_initial) {
                        Hook::callAll('logged_in', $a->user);
 
-                       if ($a->module !== 'home' && $this->session->exists('return_path')) {
+                       if (DI::module()->getName() !== 'home' && $this->session->exists('return_path')) {
                                $this->baseUrl->redirect($this->session->get('return_path'));
                        }
                }