From 9d8576fba2e8165213150c70d73a27cbe96e8e50 Mon Sep 17 00:00:00 2001
From: trogwar <hroftt@gmail.com>
Date: Thu, 30 Jun 2016 07:14:54 +0300
Subject: [PATCH] Refactor getting vendor data from token and drop code that
 used only in tests (not business logic, not internal)

---
 src/Vkontakte.php | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/src/Vkontakte.php b/src/Vkontakte.php
index 876d47c..dab8a19 100644
--- a/src/Vkontakte.php
+++ b/src/Vkontakte.php
@@ -211,29 +211,12 @@ class Vkontakte extends AbstractProvider
 
     protected function createResourceOwner(array $response, AccessToken $token)
     {
-        $response                = $response->response[0];
-        $response['email']       = property_exists($token, 'email') ? $token->email : null;
-        $response['location']    = property_exists($response, 'country') ? $response->country : null;
-        $response['description'] = property_exists($response, 'status') ? $response->status : null;
+        $response          = reset($response['response']);
+        $additional        = $token->getValues();
+        $response['email'] = !empty($additional['email']) ? $additional['email'] : null;
+        $response['id']    = !empty($additional['user_id']) ? $additional['user_id'] : null;
 
-        return new User($response, $token->uid);
-    }
-
-    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];
+        return new User($response, $response['id']);
     }
 
     protected function getDefaultScopes()