modify client to take key and token auth at request time

Author: eberquist

README.md

@@ -22,12 +22,23 @@ The library needs to be configured with your account's API key which is availabl
 
 ### Setup
 
+When using an API key you can initialize the client to use it for all future
+requests.
+
 ```python
 import emailable
 
 client = emailable.Client('live_...')
 ```
 
+Alternatively, you can pass an OAuth access token to any of the endpoints. See
+[here](https://emailable.com/docs/api/#oauth) for more details.
+
+```python
+client = emailable.Client()
+client.verify('[email protected]', access_token=<access_token>)
+```
+
 ### Verification
 
 ```python
@@ -36,7 +47,7 @@ response = client.verify('[email protected]')
 response.state
 => 'deliverable'
 
-# additional parameters are available. see API docs for additional info.
+# additional parameters are available. see API docs for more info.
 client.verify('[email protected]', smtp=False, accept_all=True, timeout=25)
 ```
 

emailable/client.py

@@ -6,14 +6,22 @@
 
 class Client:
 
-  def __init__(self, api_key):
+  def __init__(self, api_key=None):
     self.api_key = api_key
     self.base_url = 'https://api.emailable.com/v1/'
 
-  def verify(self, email, smtp=True, accept_all=False, timeout=None):
+  def verify(self,
+             email,
+             smtp=True,
+             accept_all=False,
+             timeout=None,
+             api_key=None,
+             access_token=None):
     options = {
+      'headers': { 
+        'Authorization': f'Bearer {self.api_key or api_key or access_token}'
+      },
       'params': {
-        'api_key': self.api_key,
         'email': email,
         'smtp': str(smtp).lower(),
         'accept_all': str(accept_all).lower(),
@@ -24,10 +32,12 @@ def verify(self, email, smtp=True, accept_all=False, timeout=None):
     url = self.base_url + 'verify'
     return self.__request('get', url, options)
 
-  def batch(self, emails, params={}):
+  def batch(self, emails, params={}, api_key=None, access_token=None):
     options = {
+      'headers': { 
+        'Authorization': f'Bearer {self.api_key or api_key or access_token}'
+      },
       'params': {
-        **{'api_key': self.api_key},
         **params
       },
       'json': {
@@ -37,10 +47,16 @@ def batch(self, emails, params={}):
     url = self.base_url + 'batch'
     return self.__request('post', url, options)
 
-  def batch_status(self, batch_id, simulate=None):
+  def batch_status(self,
+                   batch_id,
+                   simulate=None,
+                   api_key=None,
+                   access_token=None):
     options = {
+      'headers': { 
+        'Authorization': f'Bearer {self.api_key or api_key or access_token}'
+      },
       'params': {
-        'api_key': self.api_key,
         'id': batch_id,
         'simulate': simulate
       }
@@ -49,11 +65,11 @@ def batch_status(self, batch_id, simulate=None):
     url = self.base_url + 'batch'
     return self.__request('get', url, options)
 
-  def account(self):
+  def account(self, api_key=None, access_token=None):
     options = {
-      'params': {
-        'api_key': self.api_key
-      }
+      'headers': { 
+        'Authorization': f'Bearer {self.api_key or api_key or access_token}'
+      },
     }
 
     url = self.base_url + 'account'

tests/test_authentication.py

@@ -0,0 +1,42 @@
+from unittest import TestCase
+import emailable
+import time
+
+class TestAuthentication(TestCase):
+
+  def setUp(self):
+    self.api_key = 'test_7aff7fc0142c65f86a00'
+    self.email = '[email protected]'
+    self.emails = ['[email protected]', '[email protected]']
+
+  def test_invalid_api_key_authentication(self):
+    client = emailable.Client('test_7aff7fc0141c65f86a00')
+    self.assertRaises(
+      emailable.AuthError,
+      client.verify,
+      '[email protected]'
+    )
+
+  def test_missing_api_key_authentication(self):
+    client = emailable.Client()
+    self.assertRaises(
+      emailable.AuthError,
+      client.verify,
+      '[email protected]'
+    )
+
+  def test_global_api_key_authentication(self):
+    client = emailable.Client(self.api_key)
+    self.assertIsNotNone(client.verify(self.email).domain)
+    batch_id = client.batch(self.emails).id
+    self.assertIsNotNone(batch_id)
+    self.assertIsNotNone(client.batch_status(batch_id).id)
+    self.assertIsNotNone(client.account().available_credits)
+
+  def test_request_time_api_key_authentication(self):
+    client = emailable.Client()
+    self.assertIsNotNone(client.verify(self.email, api_key=self.api_key).domain)
+    batch_id = client.batch(self.emails, api_key=self.api_key).id
+    self.assertIsNotNone(batch_id)
+    self.assertIsNotNone(client.batch_status(batch_id, api_key=self.api_key).id)
+    self.assertIsNotNone(client.account(api_key=self.api_key).available_credits)

tests/test_client.py

@@ -7,22 +7,6 @@ def setUp(self):
     self.client = emailable.Client('test_7aff7fc0142c65f86a00')
     time.sleep(0.5)
 
-  def test_invalid_api_key(self):
-    client = emailable.Client('test_7aff7fc0141c65f86a00')
-    self.assertRaises(
-      emailable.AuthError,
-      client.verify,
-      '[email protected]'
-    )
-
-  def test_missing_api_key(self):
-    self.client.api_key = None
-    self.assertRaises(
-      emailable.AuthError,
-      self.client.verify,
-      '[email protected]'
-    )
-
   def test_verify_returns_response(self):
     response = self.client.verify('[email protected]')
     self.assertIsInstance(response, emailable.Response)