ElyBy-Mirror/accounts
1
0
Fork 0
mirror of https://github.com/elyby/accounts.git synced 2025-05-31 14:11:46 +05:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into oauth_jwt_tokens

Browse Source 
# Conflicts:
#	api/components/OAuth2/Entities/AccessTokenEntity.php
#	api/components/OAuth2/Entities/RefreshTokenEntity.php
#	api/components/OAuth2/Grants/RefreshTokenGrant.php
#	api/components/OAuth2/Storage/SessionStorage.php
#	api/components/User/OAuth2Identity.php
This commit is contained in:
ErickSkrauch
2019-12-04 01:17:12 +03:00
parent e52dbdbf19 8dad8a3eeb
commit 72cbf16c97
8 changed files with 99 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/models/Textures.php
View File

@@ -65,12 +65,22 @@ class Textures {
public function getTextures(): array {
/** @var SkinSystemApi $api */
$api = Yii::$container->get(SkinSystemApi::class);
if (YII_ENV_PROD) {
$api->setClient(new \GuzzleHttp\Client([
'connect_timeout' => 2,
'decode_content' => false,
'read_timeout' => 5,
'stream' => true,
'timeout' => 5,
]));
}
try {
$textures = $api->textures($this->account->username);
} catch (RequestException $e) {
Yii::warning('Cannot get textures from skinsystem.ely.by. Exception message is ' . $e->getMessage());
} catch (GuzzleException $e) {
Yii::error($e);
Yii::warning($e);
}
return $textures ?? [];