Add support for API Tokens

API Tokens (currently in beta) allow more secure usage as they can limit
scope.

Fixes #74

Author: nijel

CloudFlare/cloudflare.py

@@ -49,6 +49,14 @@ def call_with_no_auth(self, method, parts,
                               identifier1, identifier2, identifier3,
                               params, data, files)
 
+        def _add_auth_headers(self, headers):
+            """ Add authentication headers """
+            if self.email:
+                headers['X-Auth-Email'] = self.email
+                headers['X-Auth-Key'] = self.token
+            else:
+                headers['Authorization'] = 'Bearer {}'.format(self.token)
+
         def call_with_auth(self, method, parts,
                            identifier1=None, identifier2=None, identifier3=None,
                            params=None, data=None, files=None):
@@ -58,10 +66,9 @@ def call_with_auth(self, method, parts,
                 raise CloudFlareAPIError(0, 'no email and/or token defined')
             headers = {
                 'User-Agent': self.user_agent,
-                'X-Auth-Email': self.email,
-                'X-Auth-Key': self.token,
                 'Content-Type': 'application/json'
             }
+            self._add_auth_headers(headers)
             if type(data) == str:
                 # passing javascript vs JSON
                 headers['Content-Type'] = 'application/javascript'
@@ -83,10 +90,9 @@ def call_with_auth_unwrapped(self, method, parts,
                 raise CloudFlareAPIError(0, 'no email and/or token defined')
             headers = {
                 'User-Agent': self.user_agent,
-                'X-Auth-Email': self.email,
-                'X-Auth-Key': self.token,
                 'Content-Type': 'application/json'
             }
+            self._add_auth_headers(headers)
             if type(data) == str:
                 # passing javascript vs JSON
                 headers['Content-Type'] = 'application/javascript'

README.rst

@@ -211,6 +211,9 @@ parameters.
         # A minimal call with debug enabled
         cf = CloudFlare.CloudFlare(debug=True))
 
+        # Using API Token (note missing email)
+        cf = CloudFlare.CloudFlare(token='00000000000000000000000000000000')
+
         # A full blown call with passed basic account information
         cf = CloudFlare.CloudFlare(email='user@example.com', token='00000000000000000000000000000000')