Merge pull request #110 from alpacahq/feature/oauth-support

Add OAuth authentication method

Author: ttt733

alpaca_trade_api/common.py

@@ -11,23 +11,25 @@ def get_data_url():
         'APCA_API_DATA_URL', 'https://data.alpaca.markets').rstrip('/')
 
 
-def get_credentials(key_id=None, secret_key=None):
+def get_credentials(key_id=None, secret_key=None, oauth=None):
+    oauth = oauth or os.environ.get('APCA_API_OAUTH_TOKEN')
+
     key_id = key_id or os.environ.get('APCA_API_KEY_ID')
-    if key_id is None:
+    if key_id is None and oauth is None:
         raise ValueError('Key ID must be given to access Alpaca trade API',
                          ' (env: APCA_API_KEY_ID)')
 
     secret_key = secret_key or os.environ.get('APCA_API_SECRET_KEY')
-    if secret_key is None:
+    if secret_key is None and oauth is None:
         raise ValueError('Secret key must be given to access Alpaca trade API'
                          ' (env: APCA_API_SECRET_KEY')
 
-    return key_id, secret_key
+    return key_id, secret_key, oauth
 
 
 def get_polygon_credentials(alpaca_key=None):
     try:
-        alpaca_key, _ = get_credentials(alpaca_key, 'ignored')
+        alpaca_key, _, _ = get_credentials(alpaca_key, 'ignored')
     except ValueError:
         pass
     key_id = os.environ.get('POLYGON_KEY_ID') or alpaca_key

alpaca_trade_api/rest.py

@@ -59,9 +59,11 @@ def __init__(
         key_id=None,
         secret_key=None,
         base_url=None,
-        api_version=None
+        api_version=None,
+        oauth=None
     ):
-        self._key_id, self._secret_key = get_credentials(key_id, secret_key)
+        self._key_id, self._secret_key, self._oauth = get_credentials(
+            key_id, secret_key, oauth)
         self._base_url = base_url or get_base_url()
         self._api_version = get_api_version(api_version)
         self._session = requests.Session()
@@ -83,10 +85,12 @@ def _request(
         base_url = base_url or self._base_url
         version = api_version if api_version else self._api_version
         url = base_url + '/' + version + path
-        headers = {
-            'APCA-API-KEY-ID': self._key_id,
-            'APCA-API-SECRET-KEY': self._secret_key,
-        }
+        headers = {}
+        if self._oauth:
+            headers['Authorization'] = 'Bearer ' + self._oauth
+        else:
+            headers['APCA-API-KEY-ID'] = self._key_id
+            headers['APCA-API-SECRET-KEY'] = self._secret_key
         opts = {
             'headers': headers,
             # Since we allow users to set endpoint URL via env var,

alpaca_trade_api/stream.py

@@ -9,7 +9,7 @@ class StreamConn(object):
     '''Deprecated. Use stream2.StreamConn'''
 
     def __init__(self, key_id=None, secret_key=None, base_url=None):
-        self._key_id, self._secret_key = get_credentials(key_id, secret_key)
+        self._key_id, self._secret_key, _ = get_credentials(key_id, secret_key)
         base_url = re.sub(r'^http', 'ws', base_url or get_base_url())
         self._endpoint = base_url + '/stream'
         self._handlers = {}

alpaca_trade_api/stream2.py

@@ -10,7 +10,7 @@
 
 class StreamConn(object):
     def __init__(self, key_id=None, secret_key=None, base_url=None):
-        self._key_id, self._secret_key = get_credentials(key_id, secret_key)
+        self._key_id, self._secret_key, _ = get_credentials(key_id, secret_key)
         base_url = re.sub(r'^http', 'ws', base_url or get_base_url())
         self._endpoint = base_url + '/stream'
         self._handlers = {}