diff --git a/app/Auth/Access/Oidc/OidcException.php b/app/Auth/Access/Oidc/OidcException.php index d65661d63..e39f2c224 100644 --- a/app/Auth/Access/Oidc/OidcException.php +++ b/app/Auth/Access/Oidc/OidcException.php @@ -4,4 +4,6 @@ namespace BookStack\Auth\Access\Oidc; use Exception; -class OidcException extends Exception {} +class OidcException extends Exception +{ +} diff --git a/app/Auth/Access/Oidc/OidcIssuerDiscoveryException.php b/app/Auth/Access/Oidc/OidcIssuerDiscoveryException.php index c14be6892..1ca1ed44a 100644 --- a/app/Auth/Access/Oidc/OidcIssuerDiscoveryException.php +++ b/app/Auth/Access/Oidc/OidcIssuerDiscoveryException.php @@ -4,4 +4,6 @@ namespace BookStack\Auth\Access\Oidc; use Exception; -class OidcIssuerDiscoveryException extends Exception {} +class OidcIssuerDiscoveryException extends Exception +{ +} diff --git a/app/Auth/Access/Oidc/OidcService.php b/app/Auth/Access/Oidc/OidcService.php index b4a6a0f08..eeacdb732 100644 --- a/app/Auth/Access/Oidc/OidcService.php +++ b/app/Auth/Access/Oidc/OidcService.php @@ -2,18 +2,18 @@ namespace BookStack\Auth\Access\Oidc; +use function auth; use BookStack\Auth\Access\LoginService; use BookStack\Auth\Access\RegistrationService; use BookStack\Auth\User; use BookStack\Exceptions\JsonDebugException; use BookStack\Exceptions\StoppedAuthenticationException; use BookStack\Exceptions\UserRegistrationException; +use function config; use Illuminate\Support\Facades\Cache; use League\OAuth2\Client\OptionProvider\HttpBasicAuthOptionProvider; use League\OAuth2\Client\Provider\Exception\IdentityProviderException; use Psr\Http\Client\ClientInterface as HttpClient; -use function auth; -use function config; use function trans; use function url; @@ -40,8 +40,9 @@ class OidcService /** * Initiate an authorization flow. * - * @return array{url: string, state: string} * @throws OidcException + * + * @return array{url: string, state: string} */ public function login(): array { @@ -77,7 +78,6 @@ class OidcService return $this->processAccessTokenCallback($accessToken, $settings); } - /** * @throws OidcException */ diff --git a/app/Http/Controllers/Auth/OidcController.php b/app/Http/Controllers/Auth/OidcController.php index 571caa3c7..78a47e488 100644 --- a/app/Http/Controllers/Auth/OidcController.php +++ b/app/Http/Controllers/Auth/OidcController.php @@ -2,8 +2,8 @@ namespace BookStack\Http\Controllers\Auth; -use BookStack\Auth\Access\Oidc\OidcService; use BookStack\Auth\Access\Oidc\OidcException; +use BookStack\Auth\Access\Oidc\OidcService; use BookStack\Http\Controllers\Controller; use Illuminate\Http\Request; @@ -29,6 +29,7 @@ class OidcController extends Controller $loginDetails = $this->oidcService->login(); } catch (OidcException $exception) { $this->showErrorNotification($exception->getMessage()); + return redirect('/login'); } @@ -56,6 +57,7 @@ class OidcController extends Controller $this->oidcService->processAuthorizeResponse($request->query('code')); } catch (OidcException $oidcException) { $this->showErrorNotification($oidcException->getMessage()); + return redirect('/login'); }