Move login to the AccountStore

This makes it easy to add 2FA support. MemoryAccountStore could be used
as a base class.

Author: mrm

.gitignore

@@ -1,6 +1,5 @@
 .idea/
 vendor/
 atomx.php
-Atomx/MemoryAccountStore.php
 tests/AtomxAccountStore.php
 

Atomx/AccountStore.php

@@ -2,8 +2,6 @@
 
 
 interface AccountStore {
-    public function getUsername();
-    public function getPassword();
     public function getToken();
     public function storeToken($token);
 

Atomx/AtomxClient.php

@@ -2,27 +2,35 @@
 
 use Exception;
 use GuzzleHttp\Message\Response;
-use GuzzleHttp\Stream\Stream;
 
 class AtomxClient extends ApiClient {
+    const API_BASE = 'https://api.atomx.com/v3/';
     protected $apiBase = null;
     protected $id = null;
-    protected $requiresLogin = true;
+    protected $requiresToken = true;
 
     /**
      * @var AccountStore Store the token for the application
      */
-    private $accountStore;
+    protected $accountStore = null;
 
-    function __construct(AccountStore $accountStore, $idOrFields = null)
+    /**
+     * AtomxClient constructor.
+     * @param AccountStore|null $accountStore
+     * @param int|array $idOrFields
+     * @param string $apiBase
+     */
+    function __construct($accountStore = null, $idOrFields = null)
     {
-        $this->apiBase = $accountStore->getApiBase();
+        if ($accountStore) {
+            $this->accountStore = $accountStore;
+            $this->apiBase = $accountStore->getApiBase();
+        } else {
+            $this->apiBase = AtomxClient::API_BASE;
+        }
 
         parent::__construct();
 
-        $this->accountStore = $accountStore;
-
-
         if (is_array($idOrFields))
             $this->fields = $idOrFields;
         else if (is_numeric($idOrFields))
@@ -54,7 +62,7 @@ protected function handleResponse(Response $response)
             return json_decode($response->getBody()->getContents(), true);
         }
 
-        if ($code == 401) {
+        if ($code == 401 && $this->requiresToken) {
             // Unauthorized, invalidate token
             $this->accountStore->storeToken(null);
         }
@@ -67,56 +75,14 @@ protected function getDefaultOptions()
     {
         $options = parent::getDefaultOptions();
 
-        if ($this->requiresLogin)
+        if ($this->requiresToken)
             $options['headers'] = ['Authorization' => 'Bearer ' . $this->getToken()];
 
         return $options;
     }
 
-    public function login()
-    {
-        $this->requiresLogin = false;
-
-        try {
-            $response = $this->postUrl('login', [
-                'json' => [
-                    'email'    => $this->accountStore->getUsername(),
-                    'password' => $this->accountStore->getPassword()
-                ]
-            ]);
-        } catch (ApiException $e) {
-            $message = str_replace($e->getMessage(), $this->accountStore->getPassword(), '[redacted]');
-
-            throw new ApiException('Unable to login to API! Message: ' . $message);
-        }
-
-        $this->requiresLogin = true;
-
-        if ($response instanceof Stream) {
-            $response = json_decode($response->getContents(), true);
-        }
-
-        if ($response['success'] !== true)
-            throw new ApiException('Unable to login to API!');
-
-
-        $token = $response['auth_token'];
-
-        $this->accountStore->storeToken($token);
-
-        return $response['user'];
-    }
-
     private function getToken()
     {
-        $token = $this->accountStore->getToken();
-
-        if ($token !== null) {
-            return $token;
-        }
-
-        $this->login();
-
         return $this->accountStore->getToken();
     }
 

Atomx/MemoryAccountStore.php

@@ -0,0 +1,77 @@
+<?php namespace Atomx;
+
+use Atomx\Resources\Login;
+
+class MemoryAccountStore implements AccountStore {
+    protected $token = null;
+    protected $username, $password, $apiBase;
+
+    /**
+     * @param string $username
+     * @param string $password
+     * @param string $apiBase
+     */
+    public function __construct($username = null, $password = null, $apiBase = null)
+    {
+        $this->username = $username;
+        $this->password = $password;
+        $this->apiBase = $apiBase;
+
+        if ($this->apiBase == null)
+            $this->apiBase = AtomxClient::API_BASE;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getToken()
+    {
+        if (is_null($this->token)) {
+            $response = $this->getLoginClient()->login([
+                'email' => $this->getUsername(),
+                'password' => $this->getPassword(),
+            ]);
+
+            $this->token = $response['auth_token'];
+        }
+
+        return $this->token;
+    }
+
+    protected function getLoginClient()
+    {
+        return new Login($this);
+    }
+
+    /**
+     * @param string|null $token
+     */
+    public function storeToken($token)
+    {
+        $this->token = $token;
+    }
+
+    /**
+     * @return string
+     */
+    public function getUsername()
+    {
+        return $this->username;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPassword()
+    {
+        return $this->password;
+    }
+
+    /**
+     * @return string
+     */
+    public function getApiBase()
+    {
+        return $this->apiBase;
+    }
+}

Atomx/Resources/Browsers.php

@@ -5,5 +5,5 @@
 
 class Browsers extends AtomxClient {
     protected $endpoint = 'browsers';
-    protected $requiresLogin = false;
+    protected $requiresToken = false;
 }

Atomx/Resources/CategoryList.php

@@ -4,5 +4,5 @@
 
 class CategoryList extends AtomxClient {
     protected $endpoint = 'categories';
-    protected $requiresLogin = false;
+    protected $requiresToken = false;
 }

Atomx/Resources/ConnectionTypes.php

@@ -5,5 +5,5 @@
 
 class ConnectionTypes extends AtomxClient {
     protected $endpoint = 'connection-types';
-    protected $requiresLogin = false;
+    protected $requiresToken = false;
 }

Atomx/Resources/DeviceTypes.php

@@ -5,5 +5,5 @@
 
 class DeviceTypes extends AtomxClient {
     protected $endpoint = 'device-types';
-    protected $requiresLogin = false;
+    protected $requiresToken = false;
 }

Atomx/Resources/Domain.php

@@ -1,11 +1,10 @@
 <?php namespace Atomx\Resources;
 
 use Atomx\AtomxClient;
-use InvalidArgumentException;
 
 class Domain extends AtomxClient {
     protected $endpoint = 'domain';
-    protected $requiresLogin = false;
+    protected $requiresToken = false;
 
     public function setLanguage($lan = null)
     {

Atomx/Resources/Login.php

@@ -0,0 +1,33 @@
+<?php namespace Atomx\Resources;
+
+use Atomx\ApiException;
+use Atomx\AtomxClient;
+
+class Login extends AtomxClient {
+    protected $endpoint = 'login';
+    protected $requiresToken = false;
+
+    /**
+     * @param array $fields contains the username/password for the user
+     * @return string
+     * @throws ApiException
+     */
+    public function login(array $fields)
+    {
+        try{
+            $response = $this->post($fields);
+        } catch (ApiException $e) {
+            $message = $e->getMessage();
+
+            if (isset($fields['password']))
+                $message = str_replace($this->accountStore->getPassword(), '[redacted]', $message);
+
+            throw new ApiException('Unable to login to API! Message: ' . $message);
+        }
+
+        if ($response['success'] !== true)
+            throw new ApiException('Unable to login to API. Message: ' . $response['message']);
+
+        return $response;
+    }
+}