mirror of
https://github.com/snipe/snipe-it.git
synced 2025-02-21 03:15:45 -08:00
Do not saml login automatically after normal logout
This commit is contained in:
parent
c8d5445178
commit
92fe1287ea
|
@ -68,6 +68,7 @@ class LoginController extends Controller
|
||||||
return redirect()->intended('/');
|
return redirect()->intended('/');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!$request->session()->has('loggedout')) {
|
||||||
// If the environment is set to ALWAYS require SAML, go straight to the SAML route.
|
// If the environment is set to ALWAYS require SAML, go straight to the SAML route.
|
||||||
// We don't need to check other settings, as this should override those.
|
// We don't need to check other settings, as this should override those.
|
||||||
if (config('app.require_saml')) {
|
if (config('app.require_saml')) {
|
||||||
|
@ -78,6 +79,7 @@ class LoginController extends Controller
|
||||||
if ($this->saml->isEnabled() && Setting::getSettings()->saml_forcelogin == '1' && ! ($request->has('nosaml') || $request->session()->has('error'))) {
|
if ($this->saml->isEnabled() && Setting::getSettings()->saml_forcelogin == '1' && ! ($request->has('nosaml') || $request->session()->has('error'))) {
|
||||||
return redirect()->route('saml.login');
|
return redirect()->route('saml.login');
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (Setting::getSettings()->login_common_disabled == '1') {
|
if (Setting::getSettings()->login_common_disabled == '1') {
|
||||||
return view('errors.403');
|
return view('errors.403');
|
||||||
|
|
Loading…
Reference in a new issue