X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/1cc7c649dc3a5e1adc0c1bbcee1e7adb61bbd968..refs/pull/3918/head:/app/Auth/Access/Oidc/OidcService.php diff --git a/app/Auth/Access/Oidc/OidcService.php b/app/Auth/Access/Oidc/OidcService.php index c4d847804..a9323d423 100644 --- a/app/Auth/Access/Oidc/OidcService.php +++ b/app/Auth/Access/Oidc/OidcService.php @@ -2,7 +2,6 @@ namespace BookStack\Auth\Access\Oidc; -use function auth; use BookStack\Auth\Access\GroupSyncService; use BookStack\Auth\Access\LoginService; use BookStack\Auth\Access\RegistrationService; @@ -10,14 +9,11 @@ use BookStack\Auth\User; use BookStack\Exceptions\JsonDebugException; use BookStack\Exceptions\StoppedAuthenticationException; use BookStack\Exceptions\UserRegistrationException; -use function config; use Illuminate\Support\Arr; 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 trans; -use function url; /** * Class OpenIdConnectService @@ -56,7 +52,6 @@ class OidcService { $settings = $this->getProviderSettings(); $provider = $this->getProvider($settings); - return [ 'url' => $provider->getAuthorizationUrl(), 'state' => $provider->getState(), @@ -181,7 +176,7 @@ class OidcService */ protected function getUserGroups(OidcIdToken $token): array { - $groupsAttr = $this->config()['group_attribute']; + $groupsAttr = $this->config()['groups_claim']; if (empty($groupsAttr)) { return []; }