From bb58f605f765d97c8024efaa6bb33cf61b28f306 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 16 Sep 2016 09:21:36 +0200
Subject: [PATCH] Some new login / logout routes

---
 resources/lang/en_US/auth.php                 | 19 +++++++++++++++++++
 .../{password.twig => passwords/email.twig}   |  0
 .../views/auth/{ => passwords}/reset.twig     |  0
 routes/web.php                                | 12 +++++-------
 4 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100755 resources/lang/en_US/auth.php
 rename resources/views/auth/{password.twig => passwords/email.twig} (100%)
 rename resources/views/auth/{ => passwords}/reset.twig (100%)

diff --git a/resources/lang/en_US/auth.php b/resources/lang/en_US/auth.php
new file mode 100755
index 0000000000..6ef1a73308
--- /dev/null
+++ b/resources/lang/en_US/auth.php
@@ -0,0 +1,19 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used during authentication for various
+    | messages that we need to display to the user. You are free to modify
+    | these language lines according to your application's requirements.
+    |
+    */
+
+    'failed'   => 'These credentials do not match our records.',
+    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+
+];
diff --git a/resources/views/auth/password.twig b/resources/views/auth/passwords/email.twig
similarity index 100%
rename from resources/views/auth/password.twig
rename to resources/views/auth/passwords/email.twig
diff --git a/resources/views/auth/reset.twig b/resources/views/auth/passwords/reset.twig
similarity index 100%
rename from resources/views/auth/reset.twig
rename to resources/views/auth/passwords/reset.twig
diff --git a/routes/web.php b/routes/web.php
index c7b01dbd91..b02db29f73 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -24,13 +24,11 @@ Route::group(
     Route::get('/register', ['uses' => 'Auth\RegisterController@showRegistrationForm', 'as' => 'register']); #
     Route::post('/register', 'Auth\RegisterController@register'); #
 
-    Route::get('/password/reset', 'Auth\PasswordController@getReset');
-
     // Password Reset Routes...
-    Route::get('password/reset/{token}', 'Auth\ResetPasswordController@showResetForm');
-    Route::post('/password/email', 'Auth\ForgotPasswordController@sendResetLinkEmail');
-    Route::post('/password/reset', 'Auth\ResetPasswordController@reset');
-    Route::get('password/reset', 'Auth\ForgotPasswordController@showLinkRequestForm');
+    Route::get('password/reset/{token}', 'Auth\ResetPasswordController@showResetForm'); #
+    Route::post('/password/email', 'Auth\ForgotPasswordController@sendResetLinkEmail'); #
+    Route::post('/password/reset', 'Auth\ResetPasswordController@reset'); #
+    Route::get('password/reset', 'Auth\ForgotPasswordController@showLinkRequestForm'); #
 
 
 }
@@ -42,7 +40,7 @@ Route::group(
 Route::group(
     ['middleware' => 'user-simple-auth'], function () {
     Route::get('/error', 'HomeController@displayError');
-    Route::post('logout', ['uses' => 'Auth\LoginController@logout','as' => 'logout']);
+    Route::any('logout', ['uses' => 'Auth\LoginController@logout','as' => 'logout']);
     Route::get('/flush', ['uses' => 'HomeController@flush']);
 }
 );