From 59225701b564a2bda78b57cb313f29913787a75c Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 2 Oct 2017 16:00:42 -0700 Subject: [PATCH 1/3] Redirect to previous after login --- app/Http/Controllers/Auth/LoginController.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 884606716..3b12adf59 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -47,6 +47,7 @@ class LoginController extends Controller public function __construct() { $this->middleware('guest', ['except' => ['logout','postTwoFactorAuth','getTwoFactorAuth','getTwoFactorEnroll']]); + Session::put('backUrl', URL::previous()); } @@ -320,4 +321,9 @@ class LoginController extends Controller return redirect()->route('login'); } + public function redirectTo() + { + return Session::get('backUrl') ? Session::get('backUrl') : $this->redirectTo; + } + } From 9420913d251570bf85d5d97532dbcdfa3eeec8a0 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 2 Oct 2017 16:35:57 -0700 Subject: [PATCH 2/3] Set referrer policy to same origin - should fix a lot of weird validation redirects --- config/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/app.php b/config/app.php index 43f851abd..6c9c471a5 100755 --- a/config/app.php +++ b/config/app.php @@ -167,7 +167,7 @@ return [ | */ - 'referrer_policy' => env('REFERRER_POLICY', 'strict-origin'), + 'referrer_policy' => env('REFERRER_POLICY', 'same-origin'), /* |-------------------------------------------------------------------------- From ff38cdd09b6877711dac0ab739a4d28bfe681484 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 2 Oct 2017 16:36:43 -0700 Subject: [PATCH 3/3] Comment out the nullable middleware until we have a chance to check all model validators --- app/Http/Kernel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index b305ef94e..fb6323815 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -25,7 +25,7 @@ class Kernel extends HttpKernel \App\Http\Middleware\CheckForSetup::class, \Fideloper\Proxy\TrustProxies::class, \App\Http\Middleware\CheckForDebug::class, - \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, + // \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, ]; /**