From df166d62e6efcd30ed4c0a86bcb33036005d9710 Mon Sep 17 00:00:00 2001
From: Alexis Saettler <alexis@saettler.org>
Date: Wed, 8 Apr 2020 09:28:34 +0200
Subject: [PATCH] fix: fix login route already set by Laravel now (#3802)

---
 CHANGELOG.md                                       | 1 +
 app/Exceptions/Handler.php                         | 2 +-
 app/Http/Controllers/Auth/InvitationController.php | 2 +-
 app/Http/Controllers/SettingsController.php        | 4 ++--
 app/Http/Middleware/Authenticate.php               | 2 +-
 app/Providers/RouteServiceProvider.php             | 2 +-
 routes/web.php                                     | 2 +-
 tests/Feature/Authentication/AuthenticateTest.php  | 2 +-
 8 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b9c1b6ab..206a54b37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 ### Fixes:
 
+* Fix login route already set by Laravel now
 * Fix setMe contact controller
 * Fix carddav sync-collection reporting wrong syncToken
 
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 3577f1d14..fa8132138 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -66,7 +66,7 @@ class Handler extends ExceptionHandler
         // hopefully catches those pesky token expiries
         // and send them back to login.
         if ($e instanceof TokenMismatchException) {
-            return redirect()->route('login');
+            return redirect()->route('loginRedirect');
         }
 
         // Convert all non-http exceptions to a proper 500 http exception
diff --git a/app/Http/Controllers/Auth/InvitationController.php b/app/Http/Controllers/Auth/InvitationController.php
index f27206aef..2908cce30 100644
--- a/app/Http/Controllers/Auth/InvitationController.php
+++ b/app/Http/Controllers/Auth/InvitationController.php
@@ -44,7 +44,7 @@ class InvitationController extends Controller
     public function show($key)
     {
         if (Auth::check()) {
-            return redirect()->route('login');
+            return redirect()->route('loginRedirect');
         }
 
         $invitation = Invitation::where('invitation_key', $key)
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 27724f6f6..a75387141 100644
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -146,7 +146,7 @@ class SettingsController
 
         auth('')->logout();
 
-        return redirect()->route('login');
+        return redirect()->route('loginRedirect');
     }
 
     /**
@@ -365,7 +365,7 @@ class SettingsController
 
         // make sure you don't delete yourself from this screen
         if ($user->id == auth()->user()->id) {
-            return redirect()->route('login');
+            return redirect()->route('loginRedirect');
         }
 
         $user->delete();
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index 05271cd15..16cea19ac 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -15,7 +15,7 @@ class Authenticate extends Middleware
     protected function redirectTo($request)
     {
         if (! $request->expectsJson()) {
-            return route('login');
+            return route('loginRedirect');
         }
 
         return '';
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 2d4f90f49..5f6a74e52 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -40,7 +40,7 @@ class RouteServiceProvider extends ServiceProvider
         Route::bind('contact', function ($value) {
             // In case the user is logged out
             if (! Auth::check()) {
-                redirect()->route('login')->send();
+                redirect()->route('loginRedirect')->send();
 
                 return;
             }
diff --git a/routes/web.php b/routes/web.php
index 2598ecd9e..74d39dc06 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -15,7 +15,7 @@ use Illuminate\Support\Facades\Route;
 |
 */
 
-Route::get('/', 'Auth\LoginController@showLoginOrRegister')->name('login');
+Route::get('/', 'Auth\LoginController@showLoginOrRegister')->name('loginRedirect');
 
 Auth::routes(['verify' => true]);
 
diff --git a/tests/Feature/Authentication/AuthenticateTest.php b/tests/Feature/Authentication/AuthenticateTest.php
index cb49b0838..decb69e7e 100644
--- a/tests/Feature/Authentication/AuthenticateTest.php
+++ b/tests/Feature/Authentication/AuthenticateTest.php
@@ -11,6 +11,6 @@ class AuthenticateTest extends FeatureTestCase
         $response = $this->get('/people');
 
         $response->assertStatus(302);
-        $response->assertRedirect('/login');
+        $response->assertRedirect('/');
     }
 }