adaptions

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

diff --git a/src/Module/Security/Logout.php b/src/Module/Security/Logout.php
index b8bc0f0224279796abc20f9581253cb5153f875d..004292cb5cce85d87812d9a0c879d8521aab6f1c 100644 (file)
--- a/src/Module/Security/Logout.php
+++ b/src/Module/Security/Logout.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -30,7 +30,7 @@ use Friendica\Core\Session\Capability\IHandleSessions;
 use Friendica\Core\System;
 use Friendica\Model\Profile;
 use Friendica\Model\User\Cookie;
-use Friendica\Security\TwoFactor;
+use Friendica\Module\Response;
 use Friendica\Util\Profiler;
 use Psr\Log\LoggerInterface;
 
@@ -45,17 +45,14 @@ class Logout extends BaseModule
        protected $cookie;
        /** @var IHandleSessions */
        protected $session;
-       /** @var TwoFactor\Repository\TrustedBrowser */
-       protected $trustedBrowserRepo;
 
-       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, TwoFactor\Repository\TrustedBrowser $trustedBrowserRepo, ICanCache $cache, Cookie $cookie, IHandleSessions $session, array $server, array $parameters = [])
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, ICanCache $cache, Cookie $cookie, IHandleSessions $session, array $server, array $parameters = [])
        {
-               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $server, $parameters);
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-               $this->cache              = $cache;
-               $this->cookie             = $cookie;
-               $this->session            = $session;
-               $this->trustedBrowserRepo = $trustedBrowserRepo;
+               $this->cache   = $cache;
+               $this->cookie  = $cookie;
+               $this->session = $session;
        }
 
 
@@ -72,9 +69,9 @@ class Logout extends BaseModule
 
                Hook::callAll("logging_out");
 
-               // Remove this trusted browser as it won't be able to be used ever again after the cookie is cleared
-               if ($this->cookie->get('trusted')) {
-                       $this->trustedBrowserRepo->removeForUser(local_user(), $this->cookie->get('trusted'));
+               // If this is a trusted browser, redirect to the 2fa signout page
+               if ($this->cookie->get('2fa_cookie_hash')) {
+                       $this->baseUrl->redirect('2fa/signout');
                }
 
                $this->cookie->clear();