Fully support auth server customization

Author: cdmayer

src/onedrivesdk/auth_provider.py

@@ -39,7 +39,8 @@ class AuthProvider(AuthProviderBase):
     AUTH_SERVER_URL = "https://login.live.com/oauth20_authorize.srf"
     AUTH_TOKEN_URL = "https://login.live.com/oauth20_token.srf"
 
-    def __init__(self, http_provider, client_id=None, scopes=None, access_token=None, session_type=None, loop=None):
+    def __init__(self, http_provider, client_id=None, scopes=None, access_token=None, session_type=None, loop=None,
+                 auth_server_url=None, auth_token_url=None):
         """Initialize the authentication provider for authenticating
         requests sent to OneDrive
 
@@ -63,13 +64,19 @@ def __init__(self, http_provider, client_id=None, scopes=None, access_token=None
                 loop to use for all async requests. If none is provided,
                 asyncio.get_event_loop() will be called. If using Python
                 3.3 or below this does not need to be specified
+            auth_server_url (str): URL where OAuth authentication can be performed. If
+                None, defaults to OAuth for Microsoft Account.
+            auth_token_url (str): URL where OAuth token can be redeemed. If None,
+                defaults to OAuth for Microsoft Account.
         """
         self._http_provider = http_provider
         self._client_id = client_id
         self._scopes = scopes
         self._access_token = access_token
         self._session_type = Session if session_type is None else session_type
         self._session = None
+        self._auth_server_url = self.AUTH_SERVER_URL if auth_server_url is None else auth_server_url
+        self._auth_token_url = self.AUTH_TOKEN_URL if auth_token_url is None else auth_token_url
 
         if sys.version_info >= (3, 4, 0):
             import asyncio
@@ -117,6 +124,34 @@ def access_token(self):
     def access_token(self, value):
         self._access_token = value
 
+    @property
+    def auth_server_url(self):
+        """Gets and sets the authorization server url for the
+        AuthProvider
+
+        Returns:
+            str: Auth server url
+        """
+        return self._auth_server_url
+
+    @auth_server_url.setter
+    def auth_server_url(self, value):
+        self._auth_server_url = value
+
+    @property
+    def auth_token_url(self):
+        """Gets and sets the authorization token url for the
+        AuthProvider
+
+        Returns:
+            str: The auth token url
+        """
+        return self._auth_token_url
+
+    @auth_token_url.setter
+    def auth_token_url(self, value):
+        self._auth_token_url = value
+
     def get_auth_url(self, redirect_uri):
         """Build the auth url using the params provided
         and the auth_provider
@@ -132,7 +167,7 @@ def get_auth_url(self, redirect_uri):
             "response_type": "code",
             "redirect_uri": redirect_uri
             }
-        return "{}?{}".format(self.AUTH_SERVER_URL, urlencode(params))
+        return "{}?{}".format(self._auth_server_url, urlencode(params))
 
     def authenticate(self, code, redirect_uri, client_secret=None, resource=None):
         """Takes in a code string, gets the access token,
@@ -165,7 +200,7 @@ def authenticate(self, code, redirect_uri, client_secret=None, resource=None):
         headers = {"Content-Type": "application/x-www-form-urlencoded"}
         response = self._http_provider.send(method="POST",
                                             headers=headers,
-                                            url=self.AUTH_TOKEN_URL,
+                                            url=self._auth_token_url,
                                             data=params)
 
         rcont = json.loads(response.content)
@@ -174,7 +209,7 @@ def authenticate(self, code, redirect_uri, client_secret=None, resource=None):
                                 rcont["scope"],
                                 rcont["access_token"],
                                 self.client_id,
-                                self.AUTH_TOKEN_URL,
+                                self._auth_token_url,
                                 redirect_uri,
                                 rcont["refresh_token"] if "refresh_token" in rcont else None,
                                 client_secret)

src/onedrivesdk/extensions/onedrivesdk_helper.py

@@ -4,6 +4,22 @@
 
 
 def get_default_client(client_id, scopes):
+    """Deprecated. Proxy of :method:`get_consumer_client()`.
+    Get a client using the default HttpProvider and
+    AuthProvider classes.
+
+    Args:
+        client_id (str): The client id for your application
+        scopes (list of str): The scopes required for your
+            application
+
+    Returns:
+        :class:`OneDriveClient<onedrivesdk.requests.one_drive_client.OneDriveClient>`:
+            A OneDriveClient for making OneDrive requests.
+    """
+    return get_consumer_client(client_id, scopes)
+
+def get_consumer_client(client_id, scopes):
     """Get a client using the default HttpProvider and
     AuthProvider classes
 
@@ -23,3 +39,28 @@ def get_default_client(client_id, scopes):
     return OneDriveClient("https://api.onedrive.com/v1.0/",
                           auth_provider,
                           http_provider)
+
+
+def get_business_client(client_id, scopes, base_url):
+    """Get a client using the default HttpProvider and
+    AuthProvider classes
+
+    Args:
+        client_id (str): The client id for your application
+        scopes (list of str): The scopes required for your
+            application
+        base_url (str): Base URL of OneDrive for Business tenant.
+        For example, "https://my-sharepoint.contoso.com/v1.0/"
+
+    Returns:
+        :class:`OneDriveClient<onedrivesdk.requests.one_drive_client.OneDriveClient>`:
+            A OneDriveClient for making OneDrive requests.
+    """
+    http_provider = HttpProvider()
+    auth_provider = AuthProvider(http_provider=http_provider,
+                                 client_id=client_id,
+                                 scopes=scopes)
+    return OneDriveClient(base_url,
+                          auth_provider,
+                          http_provider)
+