FEATURE: redirect to last page when session has expired
This commit is contained in:
@@ -3,13 +3,10 @@
|
||||
namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests;
|
||||
use App\Http\Requests\LoginRequest;
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Session;
|
||||
|
||||
/**
|
||||
* Class Login
|
||||
@@ -45,7 +42,9 @@ class Login extends Controller
|
||||
if (Hash::check($request->password, $user->password)) {
|
||||
Auth::login($user);
|
||||
|
||||
return redirect()->intended(route('admin.dashboard'));
|
||||
$redirect = $request->redirectTo ? $request->redirectTo : route('admin.dashboard');
|
||||
|
||||
return redirect()->intended($redirect);
|
||||
}
|
||||
|
||||
// login invalid, redirect and inform the user
|
||||
|
||||
@@ -23,7 +23,9 @@ class Authenticate
|
||||
return response('Unauthorized.', 401);
|
||||
}
|
||||
|
||||
return redirect()->route('login');
|
||||
return redirect()
|
||||
->route('login')
|
||||
->with('redirectTo', $request->fullUrl());
|
||||
}
|
||||
|
||||
return $next($request);
|
||||
|
||||
@@ -21,6 +21,8 @@
|
||||
<div class="auth-content">
|
||||
<p class="text-xs-center">@lang('admin/loginForm.loginToContinue')</p>
|
||||
<form method="POST" action="{{ route('login') }}">
|
||||
<input type="hidden" name="redirectTo" value="{{session('redirectTo')}}">
|
||||
|
||||
{!! csrf_field() !!}
|
||||
<div class="form-group">
|
||||
<label for="email">@lang('admin/loginForm.email')</label>
|
||||
|
||||
Reference in New Issue
Block a user