Merge pull request #76 and #80 from CiscoDevNet/pr/76

Pr/76

Author: cmlccie

webexteamssdk/api/__init__.py

@@ -35,6 +35,7 @@
 from webexteamssdk.utils import check_type
 from .access_tokens import AccessTokensAPI
 from .events import EventsAPI
+from .guest_issuer import GuestIssuerAPI
 from .licenses import LicensesAPI
 from .memberships import MembershipsAPI
 from .messages import MessagesAPI
@@ -45,7 +46,6 @@
 from .team_memberships import TeamMembershipsAPI
 from .teams import TeamsAPI
 from .webhooks import WebhooksAPI
-from .guest_issuer import GuestIssuerAPI
 
 
 class WebexTeamsAPI(object):
@@ -62,18 +62,26 @@ class WebexTeamsAPI(object):
     def __init__(self, access_token=None, base_url=DEFAULT_BASE_URL,
                  single_request_timeout=DEFAULT_SINGLE_REQUEST_TIMEOUT,
                  wait_on_rate_limit=DEFAULT_WAIT_ON_RATE_LIMIT,
-                 object_factory=immutable_data_factory):
+                 object_factory=immutable_data_factory,
+                 client_id=None,
+                 client_secret=None,
+                 oauth_code=None,
+                 redirect_uri=None):
         """Create a new WebexTeamsAPI object.
 
         An access token must be used when interacting with the Webex Teams API.
-        This package supports two methods for you to provide that access token:
+        This package supports three methods for you to provide that access
+        token:
 
           1. You may manually specify the access token via the `access_token`
              argument, when creating a new WebexTeamsAPI object.
 
           2. If an access_token argument is not supplied, the package checks
              for a WEBEX_TEAMS_ACCESS_TOKEN environment variable.
 
+          3. Provide the parameters (client_id, client_secret, oauth_code and
+             oauth_redirect_uri) from your oauth flow.
+
         An AccessTokenError is raised if an access token is not provided
         via one of these two methods.
 
@@ -92,6 +100,14 @@ def __init__(self, access_token=None, base_url=DEFAULT_BASE_URL,
                 webexteamssdk.config.DEFAULT_WAIT_ON_RATE_LIMIT.
             object_factory(callable): The factory function to use to create
                 Python objects from the returned Webex Teams JSON data objects.
+            client_id(basestring): The client id of your integration. Provided
+                upon creation in the portal.
+            client_secret(basestring): The client secret of your integration.
+                Provided upon creation in the portal.
+            oauth_code(basestring): The oauth authorization code provided by
+                the user oauth process.
+            oauth_redirect_uri(basestring): The redirect URI used in the user
+                OAuth process.
 
         Returns:
             WebexTeamsAPI: A new WebexTeamsAPI object.
@@ -106,8 +122,31 @@ def __init__(self, access_token=None, base_url=DEFAULT_BASE_URL,
         check_type(base_url, basestring)
         check_type(single_request_timeout, int)
         check_type(wait_on_rate_limit, bool)
+        check_type(client_id, basestring, may_be_none=True)
+        check_type(client_secret, basestring, may_be_none=True)
+        check_type(oauth_code, basestring, may_be_none=True)
+        check_type(redirect_uri, basestring, may_be_none=True)
 
         access_token = access_token or WEBEX_TEAMS_ACCESS_TOKEN
+
+        # Init AccessTokensAPI wrapper early to use for oauth requests
+        self.access_tokens = AccessTokensAPI(
+            base_url, object_factory,
+            single_request_timeout=single_request_timeout,
+        )
+
+        # Check if the user has provided the required oauth parameters
+        oauth_param_list = [client_id, client_secret, oauth_code, redirect_uri]
+        if not access_token and all(oauth_param_list):
+            access_token = self.access_tokens.get(
+                client_id=client_id,
+                client_secret=client_secret,
+                code=oauth_code,
+                redirect_uri=redirect_uri
+            ).access_token
+
+        # If an access token hasn't been provided as a parameter, environment
+        # variable, or obtained via an OAuth exchange raise an error.
         if not access_token:
             raise AccessTokenError(
                 "You must provide a Webex Teams access token to interact with "
@@ -139,10 +178,6 @@ def __init__(self, access_token=None, base_url=DEFAULT_BASE_URL,
         self.organizations = OrganizationsAPI(self._session, object_factory)
         self.licenses = LicensesAPI(self._session, object_factory)
         self.roles = RolesAPI(self._session, object_factory)
-        self.access_tokens = AccessTokensAPI(
-            self.base_url, object_factory,
-            single_request_timeout=single_request_timeout
-        )
         self.events = EventsAPI(self._session, object_factory)
         self.guest_issuer = GuestIssuerAPI(self._session, object_factory)