lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Do not saml login automatically after normal logout

Browse source
This commit is contained in:
Johnson Yi 2022-04-29 15:35:08 +00:00
parent c8d5445178
commit 92fe1287ea
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/Http/Controllers/Auth/LoginController.php
View file

@ -68,15 +68,17 @@ class LoginController extends Controller
return redirect()->intended('/'); return redirect()->intended('/');
} }
// If the environment is set to ALWAYS require SAML, go straight to the SAML route. if (!$request->session()->has('loggedout')) {
// We don't need to check other settings, as this should override those. // If the environment is set to ALWAYS require SAML, go straight to the SAML route.
if (config('app.require_saml')) { // We don't need to check other settings, as this should override those.
return redirect()->route('saml.login'); if (config('app.require_saml')) {
} return redirect()->route('saml.login');
}
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') {