Removing Unused Code

cms-forks · Aug 3, 2020 · 107fc12 · 107fc12
1 parent 1ce6546
commit 107fc12
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 26 deletions.
diff --git a/src/Http/Middleware/SudoMiddleware.php b/src/Http/Middleware/SudoMiddleware.php
@@ -23,7 +23,7 @@ class SudoMiddleware
      * @var string[]
      */
     protected $except = [
-        'octopyid/sudo/signin', 'octopyid/sudo/logout',
+        'octopyid/sudo/signin',
     ];
 
     /**

diff --git a/src/Sudo.php b/src/Sudo.php
@@ -52,31 +52,7 @@ public function signin(int $userId, int $originalUserId)
 
         return $this->auth->loginUsingId($userId);
     }
-
-    /**
-     * @return bool
-     */
-    public function logout() : bool
-    {
-        if (! $this->hasSudoed()) {
-            return false;
-        }
-
-        $this->auth->logout();
-
-        $originalUserId = $this->app->session->get('octopyid.sudo.original_id');
-
-        if ($originalUserId) {
-            $this->auth->loginUsingId($originalUserId);
-        }
-
-        $this->app->session->forget([
-            'octopyid.sudo.has_sudoed', 'octopyid.sudo.original_id',
-        ]);
-
-        return true;
-    }
-
+
     /**
      * @param  Request   $request
      * @param  Response  $response
@@ -85,6 +61,10 @@ public function logout() : bool
      */
     public function modifyResponse(Request $request, Response $response) : Response
     {
+        if (! $this->auth->check()) {
+            return $response;
+        }
+
         $sudo = view('sudo::selector', [
             'users'        => $this->getUsers(),
             'hasSudoed'    => $this->hasSudoed(),