Add token auth support (#44)

* Add token auth support

* Remove nose-setenv

* Update readme

---------

Co-authored-by: Laurynas Butkus <[email protected]>

Author: laurynas-convertapi

README.md

@@ -34,6 +34,17 @@ import convertapi
 convertapi.api_secret = 'your-api-secret'
 ```
 
+If you prefer to use [token and API key](https://www.convertapi.com/doc/auth#token), you can configure like this:
+
+```python
+import convertapi
+
+convertapi.api_token = 'your-api-token'
+convertapi.api_key = 000000 # your api key
+```
+
+If both API secret and token are configured, token will be used.
+
 #### Proxy configuration
 
 If you need to use a proxy, you can specify it using `HTTPS_PROXY` environment variable when running your script.

convertapi/__init__.py

@@ -8,6 +8,8 @@
 # configuration
 
 api_secret = None
+api_key = None
+api_token = None
 base_uri = 'https://v2.convertapi.com/'
 user_agent = 'ConvertAPI-Python/' + __version__
 timeout = 1800

convertapi/client.py

@@ -54,6 +54,12 @@ def __handle_response(self, r):
 		return r.json()
 
 	def __url(self, path):
+		if convertapi.api_token != None and convertapi.api_key != None:
+			return "%s%s?Token=%s&ApiKey=%d" % (convertapi.base_uri, path, convertapi.api_token, convertapi.api_key)
+
+		if convertapi.api_token != None:
+			return "%s%s?Token=%s" % (convertapi.base_uri, path, convertapi.api_token)
+
 		return "%s%s?Secret=%s" % (convertapi.base_uri, path, convertapi.api_secret)
 
 	def __session(self):

test-requirements.txt

@@ -1,3 +1,3 @@
 nose
-nose-setenv
 mock
+responses

tests/test_convertapi.py

@@ -3,13 +3,16 @@
 import io
 import tempfile
 import requests
+import responses
 
 from . import utils
 from nose.tools import *
 
 class TestConvertapi(utils.TestCase):
 	def setUp(self):
 		convertapi.api_secret = os.environ['CONVERT_API_SECRET']
+		convertapi.api_key = None
+		convertapi.api_token = None
 		convertapi.max_parallel_uploads = 10
 
 	def test_defaults(self):
@@ -79,3 +82,18 @@ def test_api_error(self):
 	def test_user_info(self):
 		user_info = convertapi.user()
 		assert user_info['Active']
+
+	@responses.activate
+	def test_with_token(self):
+		convertapi.api_token = 'TEST'
+		responses.add(responses.POST, 'https://v2.convertapi.com/convert/web/to/pdf?Token=TEST', json = { 'ConversionCost': 123 })
+		result = convertapi.convert('pdf', { 'Url': 'dummyurl' })
+		assert result.conversion_cost == 123
+
+	@responses.activate
+	def test_with_token_and_api_key(self):
+		convertapi.api_token = 'TEST'
+		convertapi.api_key = 1
+		responses.add(responses.POST, 'https://v2.convertapi.com/convert/web/to/pdf?Token=TEST&ApiKey=1', json = { 'ConversionCost': 123 })
+		result = convertapi.convert('pdf', { 'Url': 'dummyurl' })
+		assert result.conversion_cost == 123