Merge pull request #194 from kostou/kt_oaoth2_allow_access_token_authentication

Add new auth_method 'oauth2-existingaccesstoken'

Author: lknox-mm

README.md

@@ -96,6 +96,11 @@ client ID and secret alongside your credentials:
 >>> t1 = T1(auth_method='oauth2-resourceowner', client_id="my_client_id", client_secret="my_secret", username="my@user", password="mypass")
 ```
 
+If you already have a valid access token (e.g. by following the authorization code flow - outside this library), you can also pass it in order to get authenticated:
+``` {.python}
+>>> t1 = t1 = terminalone.T1(access_token=token, environment=environment, auth_method='oauth2-existingaccesstoken', json=True)
+```
+
 If you have a specific API base (for instance, if you are testing
 against a sandbox deployment) (*Note*: sandbox environments are not yet
 useable), you can use the `api_base` keyword with the *domain*. For

terminalone/connection.py

@@ -71,7 +71,8 @@ def _create_session(self):
         method = self.auth_params['method']
         session = Session()
         session.headers['User-Agent'] = self.user_agent
-        if method != 'oauth2-resourceowner':
+        if method not in ['oauth2-resourceowner',
+                          'oauth2-existingaccesstoken']:
             session.params = {'api_key': self.auth_params['api_key']}
         if self.json:
             session.headers['Accept'] = ACCEPT_HEADERS['json']

terminalone/service.py

@@ -125,20 +125,23 @@ def authenticate(self, auth_method, **kwargs):
         session_id = kwargs.get('session_id')
         access_token = kwargs.get('access_token')
         if session_id is not None and auth_method in ['cookie',
-                                                      'oauth2-resourceowner']:
+                                                      'oauth2-resourceowner',
+                                                      'oauth2-existingaccesstoken']:
             return super(T1, self)._auth_session_id(
                 session_id,
                 self.auth_params['api_key']
             )
 
-        if access_token is not None and auth_method in ['oauth2-resourceowner']:
+        if access_token is not None and auth_method in ['oauth2-resourceowner',
+                                                        'oauth2-existingaccesstoken']:
             return super(T1, self)._auth_access_token(access_token)
 
         if auth_method == 'cookie':
             return super(T1, self)._auth_cookie(self.auth_params['username'],
                                                 self.auth_params['password'],
                                                 self.auth_params['api_key'])
-        elif auth_method == 'oauth2-resourceowner':
+        elif auth_method in ['oauth2-resourceowner',
+                             'oauth2-existingaccesstoken']:
             return super(T1, self).fetch_resource_owner_password_token(
                 self.auth_params['username'],
                 self.auth_params['password'],