Refactor getting vendor data from token and drop code that used only in tests (not business logic, not internal)

This commit is contained in:
trogwar
2016-06-30 07:14:54 +03:00
parent f82c3645e7
commit 9d8576fba2

View File

@@ -211,29 +211,12 @@ class Vkontakte extends AbstractProvider
protected function createResourceOwner(array $response, AccessToken $token) protected function createResourceOwner(array $response, AccessToken $token)
{ {
$response = $response->response[0]; $response = reset($response['response']);
$response['email'] = property_exists($token, 'email') ? $token->email : null; $additional = $token->getValues();
$response['location'] = property_exists($response, 'country') ? $response->country : null; $response['email'] = !empty($additional['email']) ? $additional['email'] : null;
$response['description'] = property_exists($response, 'status') ? $response->status : null; $response['id'] = !empty($additional['user_id']) ? $additional['user_id'] : null;
return new User($response, $token->uid); return new User($response, $response['id']);
}
public function userUid($response, AccessToken $token)
{
$response = $response->response[0];
return $response->uid;
}
public function userEmail($response, AccessToken $token)
{
return (isset($token->email)) ? $token->email : null;
}
public function userScreenName($response, AccessToken $token)
{
$response = $response->response[0];
return [$response->first_name, $response->last_name];
} }
protected function getDefaultScopes() protected function getDefaultScopes()