From 38ac03be21a01c600750fdfad13226b5072f41b2 Mon Sep 17 00:00:00 2001
From: AshTNA <ashleyaburnett@gmail.com>
Date: Thu, 5 Sep 2019 13:52:54 +0100
Subject: [PATCH] Fix logout routes and remember me

---
 app/helpers.php                       | 15 +++++++++++++++
 composer.json                         |  5 ++++-
 resources/views/layouts/app.blade.php |  6 +++---
 routes/web.php                        |  4 ++--
 4 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 app/helpers.php

diff --git a/app/helpers.php b/app/helpers.php
new file mode 100644
index 0000000..49d2851
--- /dev/null
+++ b/app/helpers.php
@@ -0,0 +1,15 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Str;
+
+function getLogoutRoute() {
+    if(Str::startsWith(Route::currentRouteName(), 'admin')) {
+        return 'admin.logout';
+    }
+    return 'user.logout';
+}
+
+function notLoginPage() {
+    return !Str::endsWith(Route::currentRouteName(), 'login');
+}
diff --git a/composer.json b/composer.json
index 2b1259d..9c9275f 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,10 @@
         ],
         "psr-4": {
             "App\\": "app/"
-        }
+        },
+        "files": [
+            "app/helpers.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 6fec5f6..91798a5 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -52,7 +52,7 @@
                         @if (Auth::guest())
                             <li><a href="{{ route('login') }}">Login</a></li>
                             <li><a href="{{ route('register') }}">Register</a></li>
-                        @else
+                        @elseif (notLoginPage())
                             <li class="dropdown">
                                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
                                     {{ Auth::user()->name }} <span class="caret"></span>
@@ -60,13 +60,13 @@
 
                                 <ul class="dropdown-menu" role="menu">
                                     <li>
-                                        <a href="{{ route('logout') }}"
+                                        <a href="{{ route(getLogoutRoute()) }}"
                                             onclick="event.preventDefault();
                                                      document.getElementById('logout-form').submit();">
                                             Logout
                                         </a>
 
-                                        <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
+                                        <form id="logout-form" action="{{ route(getLogoutRoute()) }}" method="POST" style="display: none;">
                                             {{ csrf_field() }}
                                         </form>
                                     </li>
diff --git a/routes/web.php b/routes/web.php
index 9eae69b..3da05e2 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -18,13 +18,13 @@
 Auth::routes();
 
 Route::get('/home', 'HomeController@index');
-Route::get('/users/logout', 'Auth\LoginController@userLogout')->name('user.logout');
+Route::post('/users/logout', 'Auth\LoginController@userLogout')->name('user.logout');
 
 Route::prefix('admin')->group(function() {
   Route::get('/login', 'Auth\AdminLoginController@showLoginForm')->name('admin.login');
   Route::post('/login', 'Auth\AdminLoginController@login')->name('admin.login.submit');
   Route::get('/', 'AdminController@index')->name('admin.dashboard');
-  Route::get('/logout', 'Auth\AdminLoginController@logout')->name('admin.logout');
+  Route::post('/logout', 'Auth\AdminLoginController@logout')->name('admin.logout');
 
   // Password reset routes
   Route::post('/password/email', 'Auth\AdminForgotPasswordController@sendResetLinkEmail')->name('admin.password.email');