2 Commits
v1.4 ... v1.4.2

Author SHA1 Message Date
ddf2d1b6e4 API BC fix 2022-10-27 17:07:43 +03:00
eb43f28d61 PHP 8.1 support (more strict function param) 2022-04-13 12:28:01 +03:00
2 changed files with 31 additions and 12 deletions

View File

@@ -28,18 +28,38 @@ class SeptemberFirstProvider extends GenericProvider
const API_BASE = 'https://api.1sept.ru';
/**
* @var string Версия API
* @var array Разрешения (scopes) по умолчанию
*/
const API_VERSION = '2.0';
const SCOPES_DEFAULT = ['profile'];
/**
* @var string Разделитель перечня запрашиваемых разрешений
*/
const SCOPES_SEPARATOR = ' ';
/**
* @var string Путь авторизации
*/
const AUTHORIZE_PATH = '/oauth/authorize';
/**
* @var string Путь получения токена
*/
const ACCESS_TOKEN_PATH = '/oauth/access_token';
/**
* @var string Путь получения данных пользователя
*/
const USERINFO_PATH = '/2.0/userinfo';
public function __construct(array $options = [], array $collaborators = [])
{
$defaultOptions = [
'urlAuthorize' => static::AUTH_BASE.'/oauth/authorize',
'urlAccessToken' => static::API_BASE.'/oauth/access_token',
'urlResourceOwnerDetails' => static::API_BASE.'/'.static::API_VERSION.'/userinfo',
'scopes' => ['profile'],
'scopeSeparator' => ' ',
'urlAuthorize' => static::AUTH_BASE.static::AUTHORIZE_PATH,
'urlAccessToken' => static::API_BASE.static::ACCESS_TOKEN_PATH,
'urlResourceOwnerDetails' => static::API_BASE.static::USERINFO_PATH,
'scopes' => static::SCOPES_DEFAULT,
'scopeSeparator' => static::SCOPES_SEPARATOR,
];
parent::__construct(array_merge($defaultOptions, $options), $collaborators);
@@ -51,7 +71,7 @@ class SeptemberFirstProvider extends GenericProvider
protected function checkResponse(ResponseInterface $response, $data): void
{
if (! empty($data['error'])) {
throw new IdentityProviderException($data['error'].': '.$data['message'], null, $response);
throw new IdentityProviderException($data['error'].': '.$data['message'], 0, $response);
}
}

View File

@@ -158,14 +158,13 @@ class SeptemberFirstUser implements ResourceOwnerInterface
/**
* URL аватарки (150x150)
*
* @param bool $addVersion Использовать версию аватарки для улучшенного кэширования
* @return string|null
*
* @example https://avatar.1sept.ru/12121212-3456-7243-2134-432432144221.jpeg?v=12345
*/
public function getAvatarUrl(bool $addVersion = true): ?string
public function getAvatarUrl(): ?string
{
return $this->getField('avatar') . ($addVersion ? $this->getAvatarVersionQuery() : '');
return $this->getField('avatar');
}
/**