GraphClient: support for generic auth provider (adal, msal are supported), 3.5 excluded from Travis unittest build

Author: vvgrem@gmail.com

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 os: linux
 python:
-- '3.5'
 - '3.6'
 - '3.7'
 - '3.8'

examples/teams/connect_with_client_secret.py

@@ -0,0 +1,25 @@
+import msal
+
+from settings import settings
+from office365.graph_client import GraphClient
+
+
+def acquire_token_msal():
+    """
+    Acquire token via MSAL
+
+    """
+    authority_url = 'https://login.microsoftonline.com/{0}'.format(settings['tenant'])
+    app = msal.ConfidentialClientApplication(
+        authority=authority_url,
+        client_id=settings['client_credentials']['client_id'],
+        client_credential=settings['client_credentials']['client_secret']
+    )
+    result = app.acquire_token_for_client(scopes=["https://graph.microsoft.com/.default"])
+    return result
+
+
+client = GraphClient(settings['tenant'], acquire_token_msal)
+teams = client.teams.get_all().execute_query()
+for team in teams:
+    print(team.id)

examples/teams/list_teams.py

@@ -11,6 +11,7 @@
 from office365.onedrive.sharedDriveItemCollection import SharedDriveItemCollection
 from office365.onedrive.siteCollection import SiteCollection
 from office365.outlookservices.contact_collection import ContactCollection
+from office365.runtime.auth.token_response import TokenResponse
 from office365.runtime.client_runtime_context import ClientRuntimeContext
 from office365.runtime.http.http_method import HttpMethod
 from office365.runtime.http.request_options import RequestOptions
@@ -68,10 +69,9 @@ def authenticate_request(self, request):
 
         :type request: RequestOptions
         """
-        # authority_url = self._authority_host_url + '/' + self._tenant
-        # auth_ctx = adal.AuthenticationContext(authority_url)
-        token = self._acquire_token_callback()
-        request.set_header('Authorization', 'Bearer {0}'.format(token["accessToken"]))
+        token_json = self._acquire_token_callback()
+        token = TokenResponse.from_json(token_json)
+        request.set_header('Authorization', 'Bearer {0}'.format(token.accessToken))
 
     def execute_request(self, url_or_options):
         """

office365/graph_client.py

@@ -20,5 +20,5 @@ def _normalize_key(name):
                 return key_parts[0] + "".join(names)
             return name
 
-        token_json = {_normalize_key(k): v for k, v in value.items()}
-        return TokenResponse(**token_json)
+        json = {_normalize_key(k): v for k, v in value.items()}
+        return TokenResponse(**json)