Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/features/lock_logins_to_saml' in…
Browse files Browse the repository at this point in the history
…to features/lock_logins_to_saml
  • Loading branch information
adagioajanes committed Dec 18, 2021
2 parents 227ca61 + a68ec8b commit 9d4a6b8
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions app/Http/Controllers/Auth/LoginController.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ public function showLoginForm(Request $request)

//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.
if(config('app.require_saml'))
{
if(config('app.require_saml')) {
return redirect()->route('saml.login');
}

Expand Down Expand Up @@ -209,8 +208,7 @@ private function loginViaRemoteUser(Request $request)
public function login(Request $request)
{
//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');
}

Expand Down

0 comments on commit 9d4a6b8

Please sign in to comment.