Merge remote-tracking branch 'origin/features/lock_logins_to_saml' into features/lock_logins_to_saml

This commit is contained in:
Alex Janes 2021-12-18 11:56:57 -05:00
commit 9d4a6b85ed

View file

@ -76,8 +76,7 @@ class LoginController extends Controller
//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')) {
{
return redirect()->route('saml.login'); return redirect()->route('saml.login');
} }
@ -209,8 +208,7 @@ class LoginController extends Controller
public function login(Request $request) public function login(Request $request)
{ {
//If the environment is set to ALWAYS require SAML, return access denied //If the environment is set to ALWAYS require SAML, return access denied
if(config('app.require_saml')) if(config('app.require_saml')) {
{
return view('errors.403'); return view('errors.403');
} }