github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-01-31 22:42:06 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Applied latest StyleCI changes

Browse Source
This commit is contained in:
Dan Brown 2022-02-24 15:04:09 +00:00
parent 1e112f78d8
commit 83082c32ef
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Auth/Access/Oidc/OidcException.php
View File

@ -4,4 +4,6 @@ namespace BookStack\Auth\Access\Oidc;
use Exception;
class OidcException extends Exception {}
class OidcException extends Exception
{
}

4
app/Auth/Access/Oidc/OidcIssuerDiscoveryException.php
View File

@ -4,4 +4,6 @@ namespace BookStack\Auth\Access\Oidc;
use Exception;
class OidcIssuerDiscoveryException extends Exception {}
class OidcIssuerDiscoveryException extends Exception
{
}

8
app/Auth/Access/Oidc/OidcService.php
View File

@ -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
*/

4
app/Http/Controllers/Auth/OidcController.php
View File

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