Removed adal dependency from ClientContext, removed SP2010 Interface client, OutlookServices namespace migrated into Outlook (MS Graph protocol), auth subsystem refactorings

Author: vvgrem@gmail.com

examples/onedrive/export_files.py

@@ -43,7 +43,7 @@ def download_files(remote_folder, local_path):
 client = GraphClient(get_token)
 
 # load drive properties
-target_user_name = settings.get('test_account_name')
+target_user_name = settings.get('first_account_name')
 drive = client.users[target_user_name].drive
 # download files from OneDrive
 with tempfile.TemporaryDirectory() as path:

examples/onedrive/upload_file.py

@@ -21,7 +21,7 @@ def acquire_token():
 
 
 client = GraphClient(acquire_token)
-user_name = settings.get('test_account_name')
+user_name = settings.get('first_account_name')
 target_drive = client.users[user_name].drive
 
 local_path = "../../tests/data/SharePoint User Guide.docx"

examples/outlook/send_message.py

@@ -26,14 +26,14 @@ def get_token():
         "ToRecipients": [
             {
                 "EmailAddress": {
-                    "Address": settings.get('test_account_name')
+                    "Address": settings.get('first_account_name')
                 }
             }
         ]
     },
     "SaveToSentItems": "false"
 }
 
-user_name = settings.get('test_account_name')
+user_name = settings.get('first_account_name')
 client.users[user_name].send_mail(message_json)
 client.execute_query()

examples/sharepoint/connect_with_proxy.py renamed to examples/sharepoint/connect_and_set_proxy.py

@@ -9,9 +9,8 @@ def set_proxy(request):
     request.proxies = proxies
 
 
-ctx = ClientContext.connect_with_credentials(settings['url'],
-                                             ClientCredential(settings['client_credentials']['client_id'],
-                                                              settings['client_credentials']['client_secret']))
+ctx = ClientContext(settings['url']).with_credentials(ClientCredential(settings['client_credentials']['client_id'],
+                                                                       settings['client_credentials']['client_secret']))
 
 ctx.pending_request().beforeExecute += set_proxy
 

examples/sharepoint/connect_with_app.py renamed to examples/sharepoint/connect_with_app_principal.py

@@ -6,11 +6,5 @@
 credentials = ClientCredential(settings.get('client_credentials').get('client_id'),
                                settings.get('client_credentials').get('client_secret'))
 ctx = ClientContext(settings['url']).with_credentials(credentials)
-if not ctx.authentication_context.acquire_token_func():
-    print("Acquire token failed")
-
-
-target_web = ctx.web
-ctx.load(target_web)
-ctx.execute_query()
+target_web = ctx.web.get().execute_query()
 print(target_web.url)

examples/sharepoint/connect_with_azure_app.py

@@ -0,0 +1,30 @@
+import os
+import adal
+
+from office365.runtime.auth.token_response import TokenResponse
+from office365.sharepoint.client_context import ClientContext
+from settings import settings
+
+cert_settings = {
+    'client_id': '51d03106-4726-442c-86db-70b32fa7547f',
+    'thumbprint': "6B36FBFC86FB1C019EB6496494B9195E6D179DDB",
+    'certificate_path': '{0}/selfsigncert.pem'.format(os.path.dirname(__file__))
+}
+
+
+def acquire_token():
+    authority_url = 'https://login.microsoftonline.com/{0}'.format(settings.get('tenant'))
+    auth_ctx = adal.AuthenticationContext(authority_url)
+    with open(cert_settings['certificate_path'], 'r') as file:
+        key = file.read()
+    json_token = auth_ctx.acquire_token_with_client_certificate(
+        settings.get('url'),
+        cert_settings['client_id'],
+        key,
+        cert_settings['thumbprint'])
+    return TokenResponse(**json_token)
+
+
+ctx = ClientContext(settings['url']).with_access_token(acquire_token)
+current_web = ctx.web.get().execute_query()
+print("{0}".format(current_web.url))

examples/sharepoint/connect_with_client_certificate_adal.py

@@ -7,7 +7,5 @@
                                              UserCredential(settings.get('user_credentials').get('username'),
                                                             settings.get('user_credentials').get('password')))
 
-web = ctx.web
-ctx.load(web)
-ctx.execute_query()
+web = ctx.web.get().execute_query()
 print(web.properties["Url"])

examples/sharepoint/connect_with_user_creds.py renamed to examples/sharepoint/connect_with_user_credential.py

@@ -8,9 +8,8 @@
 
 if __name__ == '__main__':
     """Demonstrates how to construct and submit requests without model involved"""
-    ctx = ClientContext.connect_with_credentials(settings['url'],
-                                                 UserCredential(settings['user_credentials']['username'],
-                                                                settings['user_credentials']['password']))
+    ctx = ClientContext(settings['url']).with_credentials(UserCredential(settings['user_credentials']['username'],
+                                                                         settings['user_credentials']['password']))
 
     request = RequestOptions("{0}/_api/web/".format(settings['url']))
     response = ctx.execute_request_direct(request)