Totp support

Author: mrm

Atomx/Exceptions/TotpRequiredException.php

@@ -0,0 +1,15 @@
+<?php namespace Atomx\Exceptions;
+
+class TotpRequiredException extends ApiException {
+    protected $response = null;
+
+    public function __construct($response)
+    {
+        $this->response = $response;
+    }
+
+    public function getResponse()
+    {
+        return $this->response;
+    }
+}

Atomx/MemoryAccountStore.php

@@ -1,28 +1,31 @@
 <?php namespace Atomx;
 
+use Atomx\Exceptions\TotpRequiredException;
 use Atomx\Resources\Login;
 
 class MemoryAccountStore implements AccountStore {
     protected $token = null;
-    protected $username, $password, $apiBase;
+    protected $username, $password, $totp, $apiBase;
 
     /**
-     * @param string $username
-     * @param string $password
-     * @param string $apiBase
+     * @param string|null $username
+     * @param string|null $password
+     * @param string|null $totp
+     * @param string|null $apiBase
      */
-    public function __construct($username = null, $password = null, $apiBase = null)
+    public function __construct($username = null, $password = null, $totp = null, $apiBase = null)
     {
         $this->username = $username;
         $this->password = $password;
+        $this->totp = $totp;
         $this->apiBase = $apiBase;
 
         if ($this->apiBase == null)
             $this->apiBase = AtomxClient::API_BASE;
     }
 
     /**
-     * @return string|null
+     * @return null|string
      */
     public function getToken()
     {
@@ -43,8 +46,12 @@ protected function getTokenFromLogin()
         $response = $this->getLoginClient()->login([
             'email' => $this->getUsername(),
             'password' => $this->getPassword(),
+            'totp' => $this->getTotp()
         ]);
 
+        if ($response['totp_required'])
+            throw new TotpRequiredException($response);
+
         return $response['auth_token'];
     }
 
@@ -72,6 +79,11 @@ public function getPassword()
         return $this->password;
     }
 
+    public function getTotp()
+    {
+        return $this->totp;
+    }
+
     /**
      * @return string
      */

Atomx/Resources/Login.php

@@ -20,7 +20,7 @@ public function login(array $fields)
             $message = $e->getMessage();
 
             if (isset($fields['password']))
-                $message = str_replace($this->accountStore->getPassword(), '[redacted]', $message);
+                $message = str_replace($fields['password'], '[redacted]', $message);
 
             throw new ApiException('Unable to login to API! Message: ' . $message);
         }

Atomx/Resources/Totp.php

@@ -0,0 +1,13 @@
+<?php namespace Atomx\Resources;
+
+use Atomx\AtomxClient;
+
+class Totp extends AtomxClient {
+    protected $endpoint      = 'totp';
+    protected $requiresToken = true;
+
+    public function send($totp)
+    {
+        return $this->post(compact('totp'));
+    }
+}

tests/ClientTest.php

@@ -7,6 +7,7 @@
 use Atomx\Resources\Advertiser;
 use Atomx\Resources\Domain;
 use Atomx\Resources\Login;
+use Atomx\Resources\Totp;
 use GuzzleHttp\Message\Response;
 use GuzzleHttp\Stream\Stream;
 use GuzzleHttp\Subscriber\History;
@@ -110,7 +111,7 @@ public function testLogin()
         $this->assertArraySubset(['Authorization' => ['Bearer LOGIN_TOKEN']], $history->getLastRequest()->getHeaders());
     }
 
-    public function testTotp()
+    public function testTotpAccountStore()
     {
         $login = new Login(new TestAccountStore);
 
@@ -132,15 +133,17 @@ public function testTotp()
         $advertiser->getClient()->getEmitter()->attach($history);
 
         $totpException = false;
+        $token = '';
 
         try {
             $advertiser->get(['limit' => 1, 'depth' => 0]);
         } catch (TotpRequiredException $e) {
             $totpException = true;
+            $token = $e->getResponse()['auth_token'];
         }
 
         $this->assertTrue($totpException);
-        $this->assertEquals('TOTP_TOKEN', $store->getToken());
+        $this->assertEquals('TOTP_TOKEN', $token);
     }
 
     private function getValidEmptyResponse()