Standards

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

diff --git a/src/Module/Security/Logout.php b/src/Module/Security/Logout.php
index 2a4b33e2f8fa4432501c43e15478ffe9b59516fa..f9c702d51b22af2543ff308aa934b59a766dd582 100644 (file)
--- a/src/Module/Security/Logout.php
+++ b/src/Module/Security/Logout.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,45 +21,71 @@
 
 namespace Friendica\Module\Security;
 
+use Friendica\App;
 use Friendica\BaseModule;
+use Friendica\Core\Cache\Capability\ICanCache;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\Session\Capability\IHandleSessions;
 use Friendica\Core\System;
-use Friendica\DI;
 use Friendica\Model\Profile;
+use Friendica\Model\User\Cookie;
+use Friendica\Module\Response;
 use Friendica\Security\TwoFactor;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 /**
  * Logout module
  */
 class Logout extends BaseModule
 {
+       /** @var ICanCache */
+       protected $cache;
+       /** @var Cookie */
+       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, Response $response, TwoFactor\Repository\TrustedBrowser $trustedBrowserRepo, ICanCache $cache, Cookie $cookie, IHandleSessions $session, array $server, array $parameters = [])
+       {
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+               $this->cache              = $cache;
+               $this->cookie             = $cookie;
+               $this->session            = $session;
+               $this->trustedBrowserRepo = $trustedBrowserRepo;
+       }
+
+
        /**
         * Process logout requests
         */
-       public static function init(array $parameters = [])
+       protected function rawContent(array $request = [])
        {
                $visitor_home = null;
                if (remote_user()) {
                        $visitor_home = Profile::getMyURL();
-                       DI::cache()->delete('zrlInit:' . $visitor_home);
+                       $this->cache->delete('zrlInit:' . $visitor_home);
                }
 
                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 (DI::cookie()->get('trusted')) {
-                       $trustedBrowserRepository = new TwoFactor\Repository\TrustedBrowser(DI::dba(), DI::logger());
-                       $trustedBrowserRepository->removeForUser(local_user(), DI::cookie()->get('trusted'));
+               if ($this->cookie->get('trusted')) {
+                       $this->trustedBrowserRepo->removeForUser(local_user(), $this->cookie->get('trusted'));
                }
 
-               DI::cookie()->clear();
-               DI::session()->clear();
+               $this->cookie->clear();
+               $this->session->clear();
 
                if ($visitor_home) {
                        System::externalRedirect($visitor_home);
                } else {
-                       info(DI::l10n()->t('Logged out.'));
-                       DI::baseUrl()->redirect();
+                       info($this->t('Logged out.'));
+                       $this->baseUrl->redirect();
                }
        }
 }