From af7ccf3beb238522d7930004d9f926cb6ea6149a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 1 Aug 2022 16:17:40 -0700
Subject: [PATCH] Handle logout route names

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Auth/SamlController.php | 2 +-
 resources/views/auth/two_factor.blade.php    | 4 ++--
 resources/views/layouts/default.blade.php    | 4 ++--
 routes/web.php                               | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/Auth/SamlController.php b/app/Http/Controllers/Auth/SamlController.php
index 3d5cf75ecf..b6218988ea 100644
--- a/app/Http/Controllers/Auth/SamlController.php
+++ b/app/Http/Controllers/Auth/SamlController.php
@@ -142,6 +142,6 @@ class SamlController extends Controller
             return view('errors.403');
         }
 
-        return redirect()->route('logout')->with(['saml_logout' => true,'saml_slo_redirect_url' => $sloUrl]);
+        return redirect()->route('logout.get')->with(['saml_logout' => true,'saml_slo_redirect_url' => $sloUrl]);
     }
 }
diff --git a/resources/views/auth/two_factor.blade.php b/resources/views/auth/two_factor.blade.php
index c61b4e064c..d6c9d986e6 100644
--- a/resources/views/auth/two_factor.blade.php
+++ b/resources/views/auth/two_factor.blade.php
@@ -42,13 +42,13 @@
                             <button class="btn btn-lg btn-primary btn-block">{{ trans('general.submit')  }}</button>
                         </div>
                         <div class="col-md-12 col-sm-12 col-xs-12 text-right" style="padding-top: 10px;">
-                            <a href="{{ route('logout') }}" onclick="document.getElementById('logout-form').submit(); return false;">
+                            <a href="{{ route('logout.get') }}" onclick="document.getElementById('logout-form').submit(); return false;">
                                 {{ trans('general.cancel')  }}
                             </a>
                         </div>
             </div>
             </form>
-            <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
+            <form id="logout-form" action="{{ route('logout.post') }}" method="POST" style="display: none;">
             {{ csrf_field() }}
             </form>
 
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 2d53c2aac6..85ec627a2b 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -354,11 +354,11 @@
                      <li class="divider"></li>
                      <li>
 
-                        <a href="{{ route('logout') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
+                        <a href="{{ route('logout.get') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
                             <i class="fa fa-sign-out fa-fw"></i> {{ trans('general.logout') }}
                         </a>
                         
-                        <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
+                        <form id="logout-form" action="{{ route('logout.post') }}" method="POST" style="display: none;">
                             {{ csrf_field() }}
                         </form>
 
diff --git a/routes/web.php b/routes/web.php
index b783c341f7..249e02a367 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -467,12 +467,12 @@ Route::group(['middleware' => 'web'], function () {
     Route::get(
         'logout',
         [LoginController::class, 'logout']
-    )->name('logout');
+    )->name('logout.get');
 
     Route::post(
         'logout',
         [LoginController::class, 'logout']
-    )->name('logout');
+    )->name('logout.post');
 });
 
 //Auth::routes();