mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-13 09:04:09 -08:00
Merge branch 'develop'
This commit is contained in:
commit
50777f5c1d
|
@ -47,6 +47,7 @@ class LoginController extends Controller
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
$this->middleware('guest', ['except' => ['logout','postTwoFactorAuth','getTwoFactorAuth','getTwoFactorEnroll']]);
|
$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');
|
return redirect()->route('login');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function redirectTo()
|
||||||
|
{
|
||||||
|
return Session::get('backUrl') ? Session::get('backUrl') : $this->redirectTo;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,7 +25,7 @@ class Kernel extends HttpKernel
|
||||||
\App\Http\Middleware\CheckForSetup::class,
|
\App\Http\Middleware\CheckForSetup::class,
|
||||||
\Fideloper\Proxy\TrustProxies::class,
|
\Fideloper\Proxy\TrustProxies::class,
|
||||||
\App\Http\Middleware\CheckForDebug::class,
|
\App\Http\Middleware\CheckForDebug::class,
|
||||||
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
|
// \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -167,7 +167,7 @@ return [
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'referrer_policy' => env('REFERRER_POLICY', 'strict-origin'),
|
'referrer_policy' => env('REFERRER_POLICY', 'same-origin'),
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
Loading…
Reference in a new issue