Move ApiException to separate dir

Author: mrm

Atomx/ApiClient.php

@@ -1,5 +1,6 @@
 <?php namespace Atomx;
 
+use Atomx\Exceptions\ApiException;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Message\Response;

Atomx/ApiException.php

@@ -1,5 +1,6 @@
 <?php namespace Atomx;
 
+use Atomx\Exceptions\ApiException;
 use Exception;
 use GuzzleHttp\Message\Response;
 

Atomx/AtomxClient.php

@@ -0,0 +1,5 @@
+<?php namespace Atomx\Exceptions;
+
+use Exception;
+
+class ApiException extends Exception { }

Atomx/Exceptions/ApiException.php

@@ -1,6 +1,6 @@
 <?php namespace Atomx\Resources;
 
-use Atomx\ApiException;
+use Atomx\Exceptions\ApiException;
 use Atomx\AtomxClient;
 
 class Login extends AtomxClient {

Atomx/Resources/Login.php

@@ -1,10 +1,9 @@
 <?php namespace Atomx\Resources;
 
-use Atomx\ApiException;
+use Atomx\Exceptions\ApiException;
 use Atomx\AtomxClient;
 use Atomx\ReportStreamer;
 use GuzzleHttp\Message\Response;
-use GuzzleHttp\Stream\Stream;
 
 class Report extends AtomxClient {
     private $returnStream = false;

Atomx/Resources/Report.php

@@ -1,7 +1,8 @@
 <?php namespace tests;
 
 use Atomx\AccountStore;
-use Atomx\ApiException;
+use Atomx\Exceptions\ApiException;
+use Atomx\Exceptions\TotpRequiredException;
 use Atomx\MemoryAccountStore;
 use Atomx\Resources\Advertiser;
 use Atomx\Resources\Domain;
@@ -26,6 +27,7 @@ class TestLoginAccountStore extends MemoryAccountStore {
     public function setLoginClient($client) { $this->loginClient = $client; }
     protected function getLoginClient() { return $this->loginClient; }
 }
+
 class ClientTest extends \PHPUnit_Framework_TestCase {
     public function testDiscardInvalidToken()
     {
@@ -106,18 +108,51 @@ public function testLogin()
         $loginRequest = $history->getIterator()[0]['request'];
         $this->assertArrayNotHasKey('Authorization', $loginRequest->getHeaders());
         $this->assertArraySubset(['Authorization' => ['Bearer LOGIN_TOKEN']], $history->getLastRequest()->getHeaders());
+    }
+
+    public function testTotp()
+    {
+        $login = new Login(new TestAccountStore);
+
+        $store = new TestLoginAccountStore();
+        $store->setLoginClient($login);
+
+        $advertiser = new Advertiser($store);
+
+        $history = new History();
+        $mock = new Mock([
+            $this->getValidLoginResponse(true),
+            $this->getValidEmptyResponse()
+        ]);
+
+        $login->getClient()->getEmitter()->attach($mock);
+        $login->getClient()->getEmitter()->attach($history);
+
+        $advertiser->getClient()->getEmitter()->attach($mock);
+        $advertiser->getClient()->getEmitter()->attach($history);
+
+        $totpException = false;
+
+        try {
+            $advertiser->get(['limit' => 1, 'depth' => 0]);
+        } catch (TotpRequiredException $e) {
+            $totpException = true;
+        }
 
+        $this->assertTrue($totpException);
+        $this->assertEquals('TOTP_TOKEN', $store->getToken());
     }
 
     private function getValidEmptyResponse()
     {
       return new Response(200, [], Stream::factory("[]"));
     }
 
-    private function getValidLoginResponse()
+    private function getValidLoginResponse($totp = false)
     {
-        $loginBody = '{"user":{"id":1},"resource":"auth_token","totp_required":false,' .
-            '"message":"atomx (user id 1) logged in","success":true,"auth_token":"LOGIN_TOKEN"}';
+        $token = $totp ? 'TOTP_TOKEN' : 'LOGIN_TOKEN';
+        $loginBody = '{"user":{"id":1},"resource":"auth_token","totp_required":' . var_export($totp, true) . ',' .
+            '"message":"atomx (user id 1) logged in","success":true,"auth_token":"' . $token . '"}';
 
         return new Response(200,
             ['Content-Type' => 'application/json; charset=UTF-8'],