vitalif
/
oauth2-client
mirror of https://github.com/vitalif/oauth2-client
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #225 from shadowhand/clean-up-providers 

Clean out custom provider code from AccessToken
oauth1test
Ben Ramsey 2015-02-24 10:32:36 -06:00
parent e18c99c999 6373453f78
commit ee69b69923
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Provider/Vkontakte.php
View File

@ -7,8 +7,7 @@ use League\OAuth2\Client\Token\AccessToken;
class Vkontakte extends AbstractProvider class Vkontakte extends AbstractProvider
{ {
public $scopes = []; public $uidKey = 'user_id';
public $responseType = 'json';
public function urlAuthorize() public function urlAuthorize()
{ {

19
src/Token/AccessToken.php
View File

@ -43,17 +43,13 @@ class AccessToken
$this->accessToken = $options['access_token']; $this->accessToken = $options['access_token'];
// Some providers (not many) give the uid here, so lets take it if (!empty($options['uid'])) {
isset($options['uid']) and $this->uid = $options['uid']; $this->uid = $options['uid'];
}
// Vkontakte uses user_id instead of uid if (!empty($options['refresh_token'])) {
isset($options['user_id']) and $this->uid = $options['user_id']; $this->refreshToken = $options['refresh_token'];
}
// Mailru uses x_mailru_vid instead of uid
isset($options['x_mailru_vid']) and $this->uid = $options['x_mailru_vid'];
//Battle.net uses accountId instead of uid
isset($options['accountId']) and $this->uid = $options['accountId'];
// We need to know when the token expires. Show preference to // We need to know when the token expires. Show preference to
// 'expires_in' since it is defined in RFC6749 Section 5.1. // 'expires_in' since it is defined in RFC6749 Section 5.1.
@ -67,9 +63,6 @@ class AccessToken
$expiresInFuture = $expires > time(); $expiresInFuture = $expires > time();
$this->expires = $expiresInFuture ? $expires : time() + ((int) $expires); $this->expires = $expiresInFuture ? $expires : time() + ((int) $expires);
} }
// Grab a refresh token so we can update access tokens when they expires
isset($options['refresh_token']) and $this->refreshToken = $options['refresh_token'];
} }
/** /**