SharePoint tests: UserProfile tests fixes, README.md updated to reflect migration changes from adal to msal

Author: vvgrem@gmail.com

README.md

@@ -112,13 +112,15 @@ the following clients are available:
 
 #### Authentication
 
-In terms of Microsoft Graph API authentication, there is no any dependency to any particular library implementation, 
-the following libraries are supported at least:
+[The Microsoft Authentication Library (MSAL) for Python](https://pypi.org/project/msal/) which comes as a dependency 
+is used as a default library to obtain token to call Microsoft Graph API. But in terms of Microsoft Graph API 
+authentication, another Microsoft Authentication Client compliant libraries such [adal](https://github.com/AzureAD/azure-activedirectory-library-for-python) 
+as are supported as well.   
 
 > Note: access token is getting acquired  via [Client Credential flow](https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-client-creds-grant-flow)
 > in the provided examples
 
-[Microsoft Authentication Library (MSAL) for Python](https://pypi.org/project/msal/)
+Using [Microsoft Authentication Library (MSAL) for Python](https://pypi.org/project/msal/)
 
 ```python
 import msal
@@ -134,24 +136,24 @@ def acquire_token():
         client_id='{client_id}',
         client_credential='{client_secret}'
     )
-    result = app.acquire_token_for_client(scopes=["https://graph.microsoft.com/.default"])
-    return result
+    token = app.acquire_token_for_client(scopes=["https://graph.microsoft.com/.default"])
+    return token
 
 
 client = GraphClient(acquire_token)
 
 ```
 
 
-[ADAL Python](https://adal-python.readthedocs.io/en/latest/#)
+Using [ADAL Python](https://adal-python.readthedocs.io/en/latest/#)
 
 Usage
 
 ```python
 import adal
 from office365.graph_client import GraphClient
 
-def get_token():
+def acquire_token():
     authority_url = 'https://login.microsoftonline.com/{tenant_id_or_name}'
     auth_ctx = adal.AuthenticationContext(authority_url)
     token = auth_ctx.acquire_token_with_client_credentials(
@@ -160,7 +162,7 @@ def get_token():
         "{client_secret}")
     return token
 
-client = GraphClient(get_token)
+client = GraphClient(acquire_token)
 
 ```
 
@@ -171,19 +173,9 @@ The example demonstrates how to send an email via [Microsoft Graph endpoint](htt
 > Note: access token is getting acquired  via [Client Credential flow](https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-client-creds-grant-flow)
 
 ```python
-import adal
 from office365.graph_client import GraphClient
 
-def get_token():
-    authority_url = 'https://login.microsoftonline.com/{tenant_id_or_name}'
-    auth_ctx = adal.AuthenticationContext(authority_url)
-    token = auth_ctx.acquire_token_with_client_credentials(
-        "https://graph.microsoft.com",
-        "{client_id}",
-        "{client_secret}")
-    return token
-
-client = GraphClient(get_token)
+client = GraphClient(acquire_token)
 
 message_json = {
     "Message": {
@@ -217,8 +209,26 @@ client.execute_query()
 
 #### Authentication
 
-[ADAL Python](https://adal-python.readthedocs.io/en/latest/#) 
-library is utilized to authenticate users to Active Directory (AD) and obtain tokens  
+[The Microsoft Authentication Library (MSAL) for Python](https://pypi.org/project/msal/) which comes as a dependency 
+is used to obtain token
+
+```python
+import msal
+
+def acquire_token():
+    """
+    Acquire token via MSAL
+    """
+    authority_url = 'https://login.microsoftonline.com/{tenant_id_or_name}'
+    app = msal.ConfidentialClientApplication(
+        authority=authority_url,
+        client_id='{client_id}',
+        client_credential='{client_secret}'
+    )
+    token = app.acquire_token_for_client(scopes=["https://graph.microsoft.com/.default"])
+    return token
+``` 
+
 
 #### Examples 
 
@@ -231,17 +241,9 @@ which corresponds to [`list available drives` endpoint](https://docs.microsoft.c
 
 ```python
 from office365.graph_client import GraphClient
-def get_token(auth_ctx):
-    """Acquire token via client credential flow (ADAL Python library is utilized)"""
-    token = auth_ctx.acquire_token_with_client_credentials(
-        "https://graph.microsoft.com",
-        "{client_id}",
-        "{client_secret}")
-    return token
-
 
 tenant_name = "contoso.onmicrosoft.com"
-client = GraphClient(get_token)
+client = GraphClient(acquire_token)
 drives = client.drives
 client.load(drives)
 client.execute_query()
@@ -254,7 +256,7 @@ for drive in drives:
 
 ```python
 from office365.graph_client import GraphClient
-client = GraphClient(get_token)
+client = GraphClient(acquire_token)
 # retrieve drive properties 
 drive = client.users["{user_id_or_principal_name}"].drive
 client.load(drive)
@@ -288,8 +290,8 @@ Refer [OneDrive examples section](examples/onedrive) for a more examples.
 
 #### Authentication
 
-[ADAL Python](https://adal-python.readthedocs.io/en/latest/#) 
-library is utilized to authenticate users to Active Directory (AD) and obtain tokens  
+[The Microsoft Authentication Library (MSAL) for Python](https://pypi.org/project/msal/) which comes as a dependency 
+is used to obtain token  
 
 #### Examples 
 
@@ -301,30 +303,16 @@ which corresponds to [`Create team` endpoint](https://docs.microsoft.com/en-us/g
 ```python
 from office365.graph_client import GraphClient
 tenant_name = "contoso.onmicrosoft.com"
-client = GraphClient(tenant_name, get_token)
+client = GraphClient(tenant_name, acquire_token)
 new_team = client.groups["{group_id}"].add_team()
 client.execute_query()
 ```
 
-where
-
-```python
-def get_token(auth_ctx):
-    """Acquire token via client credential flow (ADAL Python library is utilized)
-    :type auth_ctx: adal.AuthenticationContext
-    """
-    token = auth_ctx.acquire_token_with_client_credentials(
-        "https://graph.microsoft.com",
-        "{client_id}",
-        "{client_secret}")
-    return token
-```
-
 
 # Third Party Libraries and Dependencies
 The following libraries will be installed when you install the client library:
 * [requests](https://github.com/kennethreitz/requests)
-* [adal](https://github.com/AzureAD/azure-activedirectory-library-for-python)
+* [Microsoft Authentication Library (MSAL) for Python](https://pypi.org/project/msal/)
 
 
 

office365/sharepoint/social/socialAttachment.py

@@ -0,0 +1,5 @@
+from office365.sharepoint.base_entity import BaseEntity
+
+
+class SocialAttachment(BaseEntity):
+    pass

office365/sharepoint/userprofiles/peopleManager.py

@@ -0,0 +1,6 @@
+from office365.sharepoint.base_entity import BaseEntity
+
+
+class PeopleManager(BaseEntity):
+    """Provides methods for operations related to people."""
+    pass

office365/sharepoint/userprofiles/userProfilePropertiesForUser.py

@@ -1,5 +1,13 @@
 from office365.runtime.client_object import ClientObject
+from office365.runtime.resource_path_service_operation import ResourcePathServiceOperation
 
 
 class UserProfilePropertiesForUser(ClientObject):
-    pass
+
+    def __init__(self, context, account_name, property_names):
+        params = {
+            "accountName": account_name,
+            "propertyNames": property_names
+        }
+
+        super().__init__(context, ResourcePathServiceOperation("SP.UserProfiles.UserProfilePropertiesForUser", params))

requirements.txt

@@ -1,3 +1,8 @@
 requests~=2.24.0
 requests_ntlm [NTLMAuthentication]
 setuptools~=50.3.0
+
+adal~=1.2.4
+msal~=1.5.0
+Faker~=4.1.2
+astunparse~=1.6.3

tests/sharepoint/test_user_profile.py

@@ -1,13 +1,25 @@
-from tests.sharepoint.sharepoint_case import SPTestCase
+from unittest import TestCase
+
+from office365.runtime.auth.user_credential import UserCredential
+from office365.sharepoint.client_context import ClientContext
+from office365.sharepoint.userprofiles.userProfilePropertiesForUser import UserProfilePropertiesForUser
+from settings import settings
+
 
 from office365.sharepoint.userprofiles.profileLoader import ProfileLoader
 
 
-class TestUserProfile(SPTestCase):
+class TestUserProfile(TestCase):
     profile_loader = None  # type: ProfileLoader
 
+    @classmethod
+    def setUpClass(cls):
+        credentials = UserCredential(settings['user_credentials']['username'],
+                                     settings['user_credentials']['password'])
+        cls.my_client = ClientContext(settings['url']).with_credentials(credentials)
+
     def test1_get_profile_loader(self):
-        profile_loader = ProfileLoader.get_profile_loader(self.client).execute_query()
+        profile_loader = ProfileLoader.get_profile_loader(self.my_client).execute_query()
         self.__class__.profile_loader = profile_loader
 
     def test2_get_profile_loader(self):
@@ -16,4 +28,12 @@ def test2_get_profile_loader(self):
 
     def test3_create_personal_site(self):
         user_profile = self.__class__.profile_loader.get_user_profile()
-        user_profile.create_personal_site_enque(True).execute_query()
+        up = user_profile.create_personal_site_enque(True).execute_query()
+        self.assertIsNotNone(up.properties['PublicUrl'])
+
+    # def test4_get_user_props(self):
+    #    account_name = settings['user_credentials']['username']
+    #    props = UserProfilePropertiesForUser(self.my_client, account_name, ['PublicUrl'])
+    #    self.my_client.load(props)
+    #    self.my_client.execute_query()
+    #    self.assertIsNotNone(props)