DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

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

@ -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');