a few fixes

Author: vgrem

README.md

@@ -1,4 +1,3 @@
-from office365.azure_env import AzureEnvironment
 
 # About
 Microsoft 365 & Microsoft Graph library for Python
@@ -185,7 +184,7 @@ Refer [examples section](examples/sharepoint) for another scenarios
    from office365.sharepoint.client_context import ClientContext
    from office365.runtime.auth.client_credential import ClientCredential
    client_credentials = ClientCredential('{client_id}','{client_secret}')
-   ctx = ClientContext('{url}', environment=AzureEnvironment.USGovernmentHigh).with_credentials(client_credentials)
+   ctx = ClientContext('{site-url}', environment=AzureEnvironment.USGovernmentHigh).with_credentials(client_credentials)
    ```
 
 # Working with Outlook API
@@ -335,7 +334,7 @@ for drive in drives:
 
 ```python
 from office365.graph_client import GraphClient
-client = GraphClient(acquire_token_func)
+client = GraphClient(tenant="contoso.onmicrosoft.com")
 # retrieve drive properties 
 drive = client.users["{user_id_or_principal_name}"].drive.get().execute_query()
 # download files from OneDrive into local folder 

examples/sharepoint/auth_user_credential.py

@@ -5,8 +5,8 @@
 """
 
 from office365.sharepoint.client_context import ClientContext
-from tests import test_password, test_site_url, test_username
+from tests import test_password, test_site_url, test_username, test_team_site_url
 
-ctx = ClientContext(test_site_url).with_user_credentials(test_username, test_password)
+ctx = ClientContext(test_team_site_url).with_user_credentials(test_username, test_password)
 web = ctx.web.get().execute_query()
 print(web.url)

office365/runtime/auth/providers/saml_token_provider.py

@@ -17,12 +17,6 @@
 office365.logger.ensure_debug_secrets()
 
 
-def resolve_base_url(url):
-    parts = url.split("://")
-    host_name = parts[1].split("/")[0]
-    return parts[0] + "://" + host_name
-
-
 def string_escape(value):
     value = value.replace("&", "&")
     value = value.replace("<", "&lt;")
@@ -37,7 +31,7 @@ def datetime_escape(value):
 
 
 class SamlTokenProvider(AuthenticationProvider, office365.logger.LoggerContext):
-    def __init__(self, url, username, password, browser_mode, environment="commercial"):
+    def __init__(self, url, username, password, browser_mode, environment=None):
         """
         SAML Security Token Service provider (claims-based authentication)
 
@@ -46,13 +40,11 @@ def __init__(self, url, username, password, browser_mode, environment="commercia
         :param str password: The password
         :param bool browser_mode:
         :param str environment: The Office 365 Cloud Environment endpoint used for authentication.
-        By default, this will be set to commercial ('commercial', 'GCCH')
         """
         # Security Token Service info
-        self._sts_profile = STSProfile(resolve_base_url(url), environment)
+        self._sts_profile = STSProfile(url, environment)
         # Obtain authentication cookies, using the browser mode
         self._browser_mode = browser_mode
-        self._environment = environment
         # Last occurred error
         self.error = ""
         self._username = username
@@ -137,7 +129,7 @@ def _acquire_service_token_from_adfs(self, adfs_url):
                 "password": string_escape(self._password),
                 "created": datetime_escape(self._sts_profile.created),
                 "expires": datetime_escape(self._sts_profile.expires),
-                "issuer": self._sts_profile.tokenIssuer,
+                "issuer": self._sts_profile.token_issuer,
             },
         )
 
@@ -184,13 +176,13 @@ def _acquire_service_token(self):
         payload = self._prepare_request_from_template(
             "SAML.xml",
             {
-                "auth_url": self._sts_profile.authorityUrl,
+                "auth_url": self._sts_profile.site_url,
                 "username": string_escape(self._username),
                 "password": string_escape(self._password),
                 "message_id": str(uuid.uuid4()),
                 "created": datetime_escape(self._sts_profile.created),
                 "expires": datetime_escape(self._sts_profile.expires),
-                "issuer": self._sts_profile.tokenIssuer,
+                "issuer": self._sts_profile.token_issuer,
             },
         )
         logger.debug_secrets("options: %s", payload)

office365/runtime/auth/sts_profile.py

@@ -1,40 +1,55 @@
 from datetime import datetime, timedelta
 
+from office365.azure_env import AzureEnvironment
 from office365.runtime.compat import timezone, urlparse
 
 
 class STSProfile(object):
-    def __init__(self, authority_url, environment):
+    def __init__(self, site_url, environment=None):
         # type: (str, str) -> None
-        self.authorityUrl = authority_url
-        if environment == "GCCH":
-            self.serviceUrl = "https://login.microsoftonline.us"
-        else:
-            self.serviceUrl = "https://login.microsoftonline.com"
-        self.securityTokenServicePath = "extSTS.srf"
-        self.userRealmServicePath = "GetUserRealm.srf"
-        self.tokenIssuer = "urn:federation:MicrosoftOnline"
-        self.created = datetime.now(tz=timezone.utc)
-        self.expires = self.created + timedelta(minutes=30)
-        self.signInPage = "_forms/default.aspx?wa=wsignin1.0"
+        self._site_url = site_url
+        self._environment = environment
+        self._created = datetime.now(tz=timezone.utc)
+        self._expires = self._created + timedelta(minutes=30)
 
     def reset(self):
         """Renew the expiration time."""
-        self.created = datetime.now(tz=timezone.utc)
-        self.expires = self.created + timedelta(minutes=30)
+        self._created = datetime.now(tz=timezone.utc)
+        self._expires = self._created + timedelta(minutes=30)
 
     @property
     def tenant(self):
-        return urlparse(self.authorityUrl).netloc
+        return urlparse(self._site_url).netloc
 
     @property
     def security_token_service_url(self):
-        return "/".join([self.serviceUrl, self.securityTokenServicePath])
+        return "{0}/extSTS.srf".format(
+            AzureEnvironment.get_login_authority(self._environment),
+        )
 
     @property
     def signin_page_url(self):
-        return "/".join([self.authorityUrl, self.signInPage])
+        site_info = urlparse(self._site_url)
+        return "{0}://{1}/_forms/default.aspx?wa=wsignin1.0".format(site_info.scheme, site_info.netloc)
 
     @property
     def user_realm_service_url(self):
-        return "/".join([self.serviceUrl, self.userRealmServicePath])
+        return "{0}/GetUserRealm.srf".format(
+            AzureEnvironment.get_login_authority(self._environment),
+        )
+
+    @property
+    def token_issuer(self):
+        return "urn:federation:MicrosoftOnline"
+
+    @property
+    def created(self):
+        return self._created
+
+    @property
+    def expires(self):
+        return self._expires
+
+    @property
+    def site_url(self):
+        return self._site_url

office365/sharepoint/request.py

@@ -3,6 +3,7 @@
 from requests import Response
 from typing_extensions import Self
 
+from office365.azure_env import AzureEnvironment
 from office365.runtime.auth.authentication_context import AuthenticationContext
 from office365.runtime.auth.client_credential import ClientCredential
 from office365.runtime.auth.token_response import TokenResponse
@@ -14,12 +15,11 @@
 
 class SharePointRequest(ODataRequest):
     def __init__(
-        self, base_url, environment="commercial", allow_ntlm=False, browser_mode=False
+        self, base_url, environment=AzureEnvironment.Global, allow_ntlm=False, browser_mode=False
     ):
         """
         :param str base_url: Absolute Web or Site Url
         :param str environment: The Office 365 Cloud Environment endpoint used for authentication
-            defaults to 'commercial'.
         :param bool allow_ntlm: Flag indicates whether NTLM scheme is enabled. Disabled by default
         :param bool browser_mode: Allow browser authentication
         """