Update examples, extend response by units_used_login

gladyshev · Jan 6, 2021 · b0ef3f5 · b0ef3f5
1 parent 4a29b82
commit b0ef3f5
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -20,8 +20,7 @@ $ composer require gladyshev/yandex-direct-client
 
 ```php
 $credentials = \Gladyshev\Yandex\Direct\Credentials::client(
-    getenv('__LOGIN__'),
-    getenv('__TOKEN__')
+    getenv('_TOKEN_')
 ); 
 
 $httpClient = new \GuzzleHttp\Client();
@@ -37,13 +36,14 @@ $response = $client->campaigns->get(
 );
 
 print_r($response);
-  
+
 // [
-//     'request_id' => 1234567890,
+//     'request_id' => 8695244274068608439,
+//     'units_used_login' => 'ttt-agency',
 //     'units' => [
 //         'debit' => 10, 
-//         'limit' => 50,
-//         'rest' => 100500
+//         'rest' => 20828,
+//         'limit' => 64000
 //     ],
 //     'result' => [...]
 // ]

diff --git a/examples/agency_clients.php b/examples/agency_clients.php
@@ -3,8 +3,7 @@
 require '../vendor/autoload.php';
 
 $credentials = \Gladyshev\Yandex\Direct\Credentials::agencySandbox(
-    getenv('_TOKEN_'),
-    getenv('_MASTER_TOKEN_')
+    getenv('_TOKEN_')
 );
 
 $client = new \Gladyshev\Yandex\Direct\Client(

diff --git a/examples/reports.php b/examples/reports.php
@@ -3,8 +3,7 @@
 require '../vendor/autoload.php';
 
 $credentials = \Gladyshev\Yandex\Direct\Credentials::clientSandbox(
-    getenv('_TOKEN_'),
-    getenv('_MASTER_TOKEN_')
+    getenv('_TOKEN_')
 );
 
 $httpClient = new \GuzzleHttp\Client;

diff --git a/examples/simple.php b/examples/simple.php
@@ -3,8 +3,7 @@
 require '../vendor/autoload.php';
 
 $credentials = \Gladyshev\Yandex\Direct\Credentials::clientSandbox(
-    getenv('_TOKEN_'),
-    getenv('_MASTER_TOKEN_')
+    getenv('_TOKEN_')
 );
 
 $client = new \Gladyshev\Yandex\Direct\Client(

diff --git a/src/AbstractService.php b/src/AbstractService.php
@@ -132,6 +132,8 @@ protected function handleResponse(
             );
         }
 
+        $unitsUsedLogin = current($response->getHeader('Units-Used-Login'));
+
         $requestId = current($response->getHeader('RequestId'));
 
         [$debit, $rest, $limit] = explode('/', current($response->getHeader('Units')));
@@ -143,6 +145,7 @@ protected function handleResponse(
                 'rest' => $rest,
                 'limit' => $limit
             ],
+            'units_used_login' => $unitsUsedLogin,
             'result' => $parsedBody
         ];
     }

diff --git a/src/Credentials.php b/src/Credentials.php
@@ -8,7 +8,7 @@ final class Credentials implements \Gladyshev\Yandex\Direct\CredentialsInterface
 {
     private $token;
     private $masterToken;
-    private $login;
+    private $clientLogin;
     private $useOperatorUnits;
     private $isAgency;
     private $language;
@@ -36,7 +36,7 @@ public function __construct(
     ) {
         $this->token = $token;
         $this->masterToken = $masterToken;
-        $this->login = $clientLogin;
+        $this->clientLogin = $clientLogin;
         $this->useOperatorUnits = $useOperatorUnits;
         $this->language = $language;
         $this->baseUrl = $baseUrl;
@@ -46,14 +46,14 @@ public function __construct(
     public static function agency(
         string $token,
         ?string $masterToken = null,
-        ?string $login = null,
+        ?string $clientLogin = null,
         bool $useOperatorUnits = true,
         string $language = self::LANGUAGE_RU
     ): self {
         return new self(
             $token,
             $masterToken,
-            $login,
+            $clientLogin,
             $useOperatorUnits,
             true,
             $language,
@@ -132,7 +132,7 @@ public function getMasterToken(): ?string
      */
     public function getClientLogin(): ?string
     {
-        return $this->login;
+        return $this->clientLogin;
     }
 
     /**