From b0350035465c1a2f053c82b5c3ba59c414ef5ec5 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 1 Aug 2022 15:59:54 -0700
Subject: [PATCH 1/8] Handled hardware route names

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Assets/BulkAssetsController.php |  6 +++---
 resources/views/hardware/checkin.blade.php           |  4 ++--
 resources/views/hardware/view.blade.php              |  4 ++--
 resources/views/layouts/default.blade.php            |  2 +-
 routes/web/hardware.php                              | 12 ++++++------
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php
index 5053fca0b..270d54cf2 100644
--- a/app/Http/Controllers/Assets/BulkAssetsController.php
+++ b/app/Http/Controllers/Assets/BulkAssetsController.php
@@ -250,7 +250,7 @@ class BulkAssetsController extends Controller
             $target = $this->determineCheckoutTarget();
 
             if (! is_array($request->get('selected_assets'))) {
-                return redirect()->route('hardware/bulkcheckout')->withInput()->with('error', trans('admin/hardware/message.checkout.no_assets_selected'));
+                return redirect()->route('hardware.bulkcheckout.show')->withInput()->with('error', trans('admin/hardware/message.checkout.no_assets_selected'));
             }
 
             $asset_ids = array_filter($request->get('selected_assets'));
@@ -297,9 +297,9 @@ class BulkAssetsController extends Controller
                 return redirect()->to('hardware')->with('success', trans('admin/hardware/message.checkout.success'));
             }
             // Redirect to the asset management page with error
-            return redirect()->to('hardware/bulk-checkout')->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($errors);
+            return redirect()->route('hardware.bulkcheckout.show')->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($errors);
         } catch (ModelNotFoundException $e) {
-            return redirect()->to('hardware/bulk-checkout')->with('error', $e->getErrors());
+            return redirect()->route('hardware.bulkcheckout.show')->with('error', $e->getErrors());
         }
     }
 }
diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php
index ff2d08e52..c39704289 100755
--- a/resources/views/hardware/checkin.blade.php
+++ b/resources/views/hardware/checkin.blade.php
@@ -28,11 +28,11 @@
           <div class="col-md-12">
             @if ($backto=='user')
               <form class="form-horizontal" method="post"
-                    action="{{ route('checkin/hardware', array('assetId'=> $asset->id, 'backto'=>'user')) }}"
+                    action="{{ route('hardware.checkin.store', array('assetId'=> $asset->id, 'backto'=>'user')) }}"
                     autocomplete="off">
                 @else
                   <form class="form-horizontal" method="post"
-                        action="{{ route('checkin/hardware', $asset->id) }}" autocomplete="off">
+                        action="{{ route('hardware.checkin.store', array('assetId'=> $asset->id)) }}" autocomplete="off">
                   @endif
                   {{csrf_field()}}
 
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 4ebdfd7f5..a1452767d 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -22,7 +22,7 @@
                     @if (($asset->assigned_to != '') && ($asset->deleted_at==''))
                         @can('checkin', \App\Models\Asset::class)
                             <li role="menuitem">
-                                <a href="{{ route('checkin/hardware', $asset->id) }}">
+                                <a href="{{ route('hardware.checkin.create', $asset->id) }}">
                                     {{ trans('admin/hardware/general.checkin') }}
                                 </a>
                             </li>
@@ -30,7 +30,7 @@
                     @elseif (($asset->assigned_to == '') && ($asset->deleted_at==''))
                         @can('checkout', \App\Models\Asset::class)
                             <li role="menuitem">
-                                <a href="{{ route('checkout/hardware', $asset->id)  }}">
+                                <a href="{{ route('hardware.checkout.create', $asset->id)  }}">
                                     {{ trans('admin/hardware/general.checkout') }}
                                 </a>
                             </li>
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 2379b1f55..2d53c2aac 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -486,7 +486,7 @@
 
                     @can('checkout', \App\Models\Asset::class)
                     <li{!! (Request::is('hardware/bulkcheckout') ? ' class="active"' : '') !!}>
-                        <a href="{{ route('hardware/bulkcheckout') }}">
+                        <a href="{{ route('hardware.bulkcheckout.show') }}">
                             {{ trans('general.bulk_checkout') }}
                         </a>
                     </li>
diff --git a/routes/web/hardware.php b/routes/web/hardware.php
index 2ef397894..09811d17d 100644
--- a/routes/web/hardware.php
+++ b/routes/web/hardware.php
@@ -108,19 +108,19 @@ Route::group(
 
         Route::get('{assetId}/checkout',
             [AssetCheckoutController::class, 'create']
-        )->name('checkout/hardware');
+        )->name('hardware.checkout.create');
 
         Route::post('{assetId}/checkout',
             [AssetCheckoutController::class, 'store']
-        )->name('checkout/hardware');
+        )->name('hardware.checkout.store');
 
         Route::get('{assetId}/checkin/{backto?}',
             [AssetCheckinController::class, 'create']
-        )->name('checkin/hardware');
+        )->name('hardware.checkin.create');
 
         Route::post('{assetId}/checkin/{backto?}',
             [AssetCheckinController::class, 'store']
-        )->name('checkin/hardware');
+        )->name('hardware.checkin.store');
 
         Route::get('{assetId}/view',
             [AssetsController::class, 'show']
@@ -168,11 +168,11 @@ Route::group(
         // Bulk checkout / checkin
         Route::get('bulkcheckout',
             [BulkAssetsController::class, 'showCheckout']
-        )->name('hardware/bulkcheckout');
+        )->name('hardware.bulkcheckout.show');
 
         Route::post('bulkcheckout',
             [BulkAssetsController::class, 'storeCheckout']
-        )->name('hardware/bulkcheckout');
+        )->name('hardware.bulkcheckout.store');
     });
 
 Route::resource('hardware', 

From 744d0d299e8f2673520d8deda2dab04b6d66b1ab Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 1 Aug 2022 16:03:45 -0700
Subject: [PATCH 2/8] Handle model route names

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/models/view.blade.php | 6 +++---
 routes/web/models.php                 | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index c929aeda8..82bb6cd50 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -16,10 +16,10 @@
             <ul class="dropdown-menu">
                 @if ($model->deleted_at=='')
                     <li><a href="{{ route('models.edit', $model->id) }}">{{ trans('admin/models/table.edit') }}</a></li>
-                    <li><a href="{{ route('clone/model', $model->id) }}">{{ trans('admin/models/table.clone') }}</a></li>
+                    <li><a href="{{ route('models.clone.create', $model->id) }}">{{ trans('admin/models/table.clone') }}</a></li>
                     <li><a href="{{ route('hardware.create', ['model_id' => $model->id]) }}">{{ trans('admin/hardware/form.create') }}</a></li>
                 @else
-                    <li><a href="{{ route('restore/model', $model->id) }}">{{ trans('admin/models/general.restore') }}</a></li>
+                    <li><a href="{{ route('models.restore.store', $model->id) }}">{{ trans('admin/models/general.restore') }}</a></li>
                 @endif
             </ul>
         </div>
@@ -316,7 +316,7 @@
 
             @can('create', \App\Models\AssetModel::class)
             <div class="col-md-12" style="padding-bottom: 5px;">
-                <a href="{{ route('clone/model', $model->id) }}" style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('admin/models/table.clone') }}</a>
+                <a href="{{ route('models.clone.create', $model->id) }}" style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('admin/models/table.clone') }}</a>
             </div>
             @endcan
 
diff --git a/routes/web/models.php b/routes/web/models.php
index 2643f02d2..37e54995b 100644
--- a/routes/web/models.php
+++ b/routes/web/models.php
@@ -28,7 +28,7 @@ Route::group(['prefix' => 'models', 'middleware' => ['auth']], function () {
             AssetModelsController::class, 
             'getClone'
         ]
-    )->name('clone/model');
+    )->name('models.clone.create');
 
     Route::post(
         '{modelId}/clone',
@@ -36,7 +36,7 @@ Route::group(['prefix' => 'models', 'middleware' => ['auth']], function () {
             AssetModelsController::class, 
             'postCreate'
         ]
-    )->name('clone/model');
+    )->name('models.clone.store');
 
     Route::get(
         '{modelId}/view',
@@ -52,7 +52,7 @@ Route::group(['prefix' => 'models', 'middleware' => ['auth']], function () {
             AssetModelsController::class, 
             'getRestore'
         ]
-    )->name('restore/model');
+    )->name('models.restore.store');
 
     Route::get(
         '{modelId}/custom_fields',

From 4a4636bd03337415f54779719d3b87e99f3caecc Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 1 Aug 2022 16:06:28 -0700
Subject: [PATCH 3/8] Handle accessories route names

Signed-off-by: snipe <snipe@snipe.net>
---
 .../Accessories/AccessoryCheckoutController.php           | 2 +-
 resources/views/accessories/view.blade.php                | 6 +++---
 routes/web/accessories.php                                | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php
index 7eb9b39a4..6144bb6f9 100644
--- a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php
+++ b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php
@@ -63,7 +63,7 @@ class AccessoryCheckoutController extends Controller
         $this->authorize('checkout', $accessory);
 
         if (! $user = User::find($request->input('assigned_to'))) {
-            return redirect()->route('checkout/accessory', $accessory->id)->with('error', trans('admin/accessories/message.checkout.user_does_not_exist'));
+            return redirect()->route('accessories.checkout.show', $accessory->id)->with('error', trans('admin/accessories/message.checkout.user_does_not_exist'));
         }
 
         // Update the accessory data
diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
index 7132e7ede..f00bee3e6 100644
--- a/resources/views/accessories/view.blade.php
+++ b/resources/views/accessories/view.blade.php
@@ -24,13 +24,13 @@
             @if ($accessory->assigned_to != '')
               @can('checkin', \App\Models\Accessory::class)
               <li role="menuitem">
-                <a href="{{ route('checkin/accessory', $accessory->id) }}">{{ trans('admin/accessories/general.checkin') }}</a>
+                <a href="{{ route('accessories.checkin.show', $accessory->id) }}">{{ trans('admin/accessories/general.checkin') }}</a>
               </li>
               @endcan
             @else
               @can('checkout', \App\Models\Accessory::class)
               <li role="menuitem">
-                <a href="{{ route('checkout/accessory', $accessory->id)  }}">{{ trans('admin/accessories/general.checkout') }}</a>
+                <a href="{{ route('accessories.checkout.show', $accessory->id)  }}">{{ trans('admin/accessories/general.checkout') }}</a>
               </li>
               @endcan
             @endif
@@ -171,7 +171,7 @@
           @can('checkout', \App\Models\Accessory::class)
               <div class="row">
                   <div class="col-md-12 text-center">
-                      <a href="{{ route('checkout/accessory', $accessory->id) }}" style="margin-right:5px;" class="btn btn-primary btn-sm" {{ (($accessory->numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }}</a>
+                      <a href="{{ route('accessories.checkout.show', $accessory->id) }}" style="margin-right:5px;" class="btn btn-primary btn-sm" {{ (($accessory->numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }}</a>
                   </div>
               </div>
           @endcan
diff --git a/routes/web/accessories.php b/routes/web/accessories.php
index c0df30598..c250c122d 100644
--- a/routes/web/accessories.php
+++ b/routes/web/accessories.php
@@ -10,22 +10,22 @@ Route::group(['prefix' => 'accessories', 'middleware' => ['auth']], function ()
     Route::get(
         '{accessoryID}/checkout',
         [Accessories\AccessoryCheckoutController::class, 'create']
-    )->name('checkout/accessory');
+    )->name('accessories.checkout.show');
 
     Route::post(
         '{accessoryID}/checkout',
         [Accessories\AccessoryCheckoutController::class, 'store']
-    )->name('checkout/accessory');
+    )->name('accessories.checkout.store');
 
     Route::get(
         '{accessoryID}/checkin/{backto?}',
         [Accessories\AccessoryCheckinController::class, 'create']
-    )->name('checkin/accessory');
+    )->name('accessories.checkin.show');
 
     Route::post(
         '{accessoryID}/checkin/{backto?}',
         [Accessories\AccessoryCheckinController::class, 'store']
-    )->name('checkin/accessory');
+    )->name('accessories.checkin.store');
 
 });
 

From 53ff28d2b0d03a91c85ceb1c978a9095619dd2f2 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 1 Aug 2022 16:07:56 -0700
Subject: [PATCH 4/8] Handle consumables route names

Signed-off-by: snipe <snipe@snipe.net>
---
 .../Controllers/Consumables/ConsumableCheckoutController.php  | 2 +-
 resources/views/consumables/view.blade.php                    | 2 +-
 routes/web/consumables.php                                    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php b/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
index 03ca2f205..48cb6ac76 100644
--- a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
+++ b/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
@@ -56,7 +56,7 @@ class ConsumableCheckoutController extends Controller
         // Check if the user exists
         if (is_null($user = User::find($assigned_to))) {
             // Redirect to the consumable management page with error
-            return redirect()->route('checkout/consumable', $consumable)->with('error', trans('admin/consumables/message.checkout.user_does_not_exist'));
+            return redirect()->route('consumables.checkout.show', $consumable)->with('error', trans('admin/consumables/message.checkout.user_does_not_exist'));
         }
 
         // Update the consumable data
diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php
index 958c0e1ee..cacab8b26 100644
--- a/resources/views/consumables/view.blade.php
+++ b/resources/views/consumables/view.blade.php
@@ -127,7 +127,7 @@
 
     @can('checkout', \App\Models\Consumable::class)
     <div class="col-md-12">
-                    <a href="{{ route('checkout/consumable', $consumable->id) }}" style="padding-bottom:5px;" class="btn btn-primary btn-sm" {{ (($consumable->numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }}</a>
+                    <a href="{{ route('consumables.checkout.show', $consumable->id) }}" style="padding-bottom:5px;" class="btn btn-primary btn-sm" {{ (($consumable->numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }}</a>
                 </div>
                 @endcan
 
diff --git a/routes/web/consumables.php b/routes/web/consumables.php
index 17e59df8a..9f930a968 100644
--- a/routes/web/consumables.php
+++ b/routes/web/consumables.php
@@ -9,12 +9,12 @@ Route::group(['prefix' => 'consumables', 'middleware' => ['auth']], function ()
     Route::get(
         '{consumablesID}/checkout',
         [Consumables\ConsumableCheckoutController::class, 'create']
-    )->name('checkout/consumable');
+    )->name('consumables.checkout.show');
 
     Route::post(
         '{consumablesID}/checkout',
         [Consumables\ConsumableCheckoutController::class, 'store']
-    )->name('checkout/consumable');
+    )->name('consumables.checkout.store');
 
 
 });

From 5e488bd81f8da2df03800ed7d96656ba4e070dbf Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 1 Aug 2022 16:10:39 -0700
Subject: [PATCH 5/8] Handle components route names

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/components/checkin.blade.php | 2 +-
 resources/views/components/view.blade.php    | 2 +-
 routes/web/components.php                    | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/views/components/checkin.blade.php b/resources/views/components/checkin.blade.php
index 9b8624c24..8dca26044 100644
--- a/resources/views/components/checkin.blade.php
+++ b/resources/views/components/checkin.blade.php
@@ -17,7 +17,7 @@
     <div class="row">
         <!-- left column -->
         <div class="col-md-7">
-            <form class="form-horizontal" method="post" action="{{ route('component.checkin.save', $component_assets->id) }}" autocomplete="off">
+            <form class="form-horizontal" method="post" action="{{ route('components.checkin.store', $component_assets->id) }}" autocomplete="off">
                 {{csrf_field()}}
 
                 <div class="box box-default">
diff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.php
index cf1cd66bd..2ffb6bdce 100644
--- a/resources/views/components/view.blade.php
+++ b/resources/views/components/view.blade.php
@@ -29,7 +29,7 @@
         @else
           @can('checkout', $component)
           <li role="menuitem">
-            <a href="{{ route('checkout/component', $component->id)  }}">
+            <a href="{{ route('component.checkout.show', $component->id)  }}">
               {{ trans('admin/components/general.checkout') }}
             </a>
           </li>
diff --git a/routes/web/components.php b/routes/web/components.php
index aec4cb91b..6735c1abd 100644
--- a/routes/web/components.php
+++ b/routes/web/components.php
@@ -8,22 +8,22 @@ Route::group(['prefix' => 'components', 'middleware' => ['auth']], function () {
     Route::get(
         '{componentID}/checkout',
         [Components\ComponentCheckoutController::class, 'create']
-    )->name('checkout/component');
+    )->name('component.checkout.show');
 
     Route::post(
         '{componentID}/checkout',
         [Components\ComponentCheckoutController::class, 'store']
-    )->name('checkout/component');
+    )->name('component.checkout.store');
 
     Route::get(
         '{componentID}/checkin/{backto?}',
         [Components\ComponentCheckinController::class, 'create']
-    )->name('checkin/component');
+    )->name('component.checkin.show');
 
     Route::post(
         '{componentID}/checkin/{backto?}',
         [Components\ComponentCheckinController::class, 'store']
-    )->name('component.checkin.save');
+    )->name('components.checkin.store');
 
 });
 

From 3e48f436af24d259860f89dcd6d3ec5141f19d28 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 1 Aug 2022 16:13:30 -0700
Subject: [PATCH 6/8] Handled user route names

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/users/view.blade.php | 6 +++---
 routes/web/users.php                 | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 8763c5718..7795c5dbc 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -113,7 +113,7 @@
             </a>
             <ul class="dropdown-menu">
               <li><a href="{{ route('users.edit', $user->id) }}">{{ trans('admin/users/general.edit') }}</a></li>
-              <li><a href="{{ route('clone/user', $user->id) }}">{{ trans('admin/users/general.clone') }}</a></li>
+              <li><a href="{{ route('users.clone.show', $user->id) }}">{{ trans('admin/users/general.clone') }}</a></li>
               @if ((Auth::user()->id !== $user->id) && (!config('app.lock_passwords')) && ($user->deleted_at==''))
                 <li><a href="{{ route('users.destroy', $user->id) }}">{{ trans('button.delete') }}</a></li>
               @endif
@@ -173,7 +173,7 @@
 
               @can('create', $user)
                 <div class="col-md-12" style="padding-top: 5px;">
-                  <a href="{{ route('clone/user', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('admin/users/general.clone') }}</a>
+                  <a href="{{ route('users.clone.show', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('admin/users/general.clone') }}</a>
                 </div>
                @endcan
 
@@ -228,7 +228,7 @@
                     </div>
                   @else
                     <div class="col-md-12" style="padding-top: 5px;">
-                        <form method="POST" action="{{ route('restore/user', $user->id) }}">
+                        <form method="POST" action="{{ route('users.restore.store', $user->id) }}">
                             @csrf
                             <button style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('button.restore') }}</button>
                         </form>
diff --git a/routes/web/users.php b/routes/web/users.php
index 320ed2534..0183d48dc 100644
--- a/routes/web/users.php
+++ b/routes/web/users.php
@@ -38,7 +38,7 @@ Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () {
             Users\UsersController::class, 
             'getClone'
         ]
-    )->name('clone/user');
+    )->name('users.clone.show');
 
     Route::post(
         '{userId}/clone',
@@ -46,7 +46,7 @@ Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () {
             Users\UsersController::class, 
             'postCreate'
         ]
-    )->name('clone/user');
+    )->name('users.clone.store');
 
     Route::post(
         '{userId}/restore',
@@ -54,7 +54,7 @@ Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () {
             Users\UsersController::class, 
             'getRestore'
         ]
-    )->name('restore/user');
+    )->name('users.restore.store');
 
     Route::get(
         '{userId}/unsuspend',

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 7/8] 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 3d5cf75ec..b6218988e 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 c61b4e064..d6c9d986e 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 2d53c2aac..85ec627a2 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 b783c341f..249e02a36 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();

From e79a81972459bb89f3b53b372fc0c2a84521648d Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 1 Aug 2022 17:45:39 -0700
Subject: [PATCH 8/8] Fixed inconsistency in naming

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/components/view.blade.php | 4 ++--
 routes/web/components.php                 | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.php
index 2ffb6bdce..46ae20af0 100644
--- a/resources/views/components/view.blade.php
+++ b/resources/views/components/view.blade.php
@@ -21,7 +21,7 @@
         @if ($component->assigned_to != '')
           @can('checkin', $component)
           <li role="menuitem">
-            <a href="{{ route('checkin/component', $component->id) }}">
+            <a href="{{ route('components.checkin.show', $component->id) }}">
               {{ trans('admin/components/general.checkin') }}
             </a>
           </li>
@@ -29,7 +29,7 @@
         @else
           @can('checkout', $component)
           <li role="menuitem">
-            <a href="{{ route('component.checkout.show', $component->id)  }}">
+            <a href="{{ route('components.checkout.show', $component->id)  }}">
               {{ trans('admin/components/general.checkout') }}
             </a>
           </li>
diff --git a/routes/web/components.php b/routes/web/components.php
index 6735c1abd..81302df15 100644
--- a/routes/web/components.php
+++ b/routes/web/components.php
@@ -8,17 +8,17 @@ Route::group(['prefix' => 'components', 'middleware' => ['auth']], function () {
     Route::get(
         '{componentID}/checkout',
         [Components\ComponentCheckoutController::class, 'create']
-    )->name('component.checkout.show');
+    )->name('components.checkout.show');
 
     Route::post(
         '{componentID}/checkout',
         [Components\ComponentCheckoutController::class, 'store']
-    )->name('component.checkout.store');
+    )->name('components.checkout.store');
 
     Route::get(
         '{componentID}/checkin/{backto?}',
         [Components\ComponentCheckinController::class, 'create']
-    )->name('component.checkin.show');
+    )->name('components.checkin.show');
 
     Route::post(
         '{componentID}/checkin/{backto?}',