Intune API support & typings updates

examples/directory/identity/list_provider.py

@@ -4,9 +4,9 @@
 https://learn.microsoft.com/en-us/graph/api/identitycontainer-list-identityproviders?view=graph-rest-1.0&tabs=http
 """
 from office365.graph_client import GraphClient
-from tests.graph_case import acquire_token_by_client_credentials
+from tests import test_client_id, test_client_secret, test_tenant
 
-client = GraphClient(acquire_token_by_client_credentials)
+client = GraphClient.with_client_secret(test_tenant, test_client_id, test_client_secret)
 providers = client.identity.identity_providers.get().execute_query()
 for idp in providers:
     print(idp.display_name)

examples/directory/users/list.py

@@ -5,9 +5,11 @@
 """
 
 from office365.graph_client import GraphClient
-from tests.graph_case import acquire_token_by_username_password
+from tests import test_client_id, test_password, test_tenant, test_username
 
-client = GraphClient(acquire_token_by_username_password)
+client = GraphClient.with_username_and_password(
+    test_tenant, test_client_id, test_username, test_password
+)
 users = client.users.get().top(10).execute_query()
 for u in users:
     print(u.user_principal_name)

examples/onedrive/files/get_details.py

@@ -1,13 +1,15 @@
 """
 Retrieve the metadata for a driveItem in a drive by file system path
 
-https://learn.microsoft.com/en-us/graph/api/driveitem-get?view=graph-rest-1.0&tabs=http
+https://learn.microsoft.com/en-us/graph/api/driveitem-get?view=graph-rest-1.0
 """
 
 from office365.graph_client import GraphClient
-from tests.graph_case import acquire_token_by_username_password
+from tests import test_client_id, test_password, test_tenant, test_username
 
-client = GraphClient(acquire_token_by_username_password)
+client = GraphClient.with_username_and_password(
+    test_tenant, test_client_id, test_username, test_password
+)
 file_path = "Financial Sample.xlsx"
 file_item = client.me.drive.root.get_by_path(file_path).get().execute_query()
 print(file_item.web_url)

examples/onedrive/files/list_versions.py

@@ -4,9 +4,9 @@
 https://learn.microsoft.com/en-us/graph/api/driveitem-list-versions?view=graph-rest-1.0
 """
 from office365.graph_client import GraphClient
-from tests.graph_case import acquire_token_by_client_credentials
+from tests import test_client_id, test_client_secret, test_tenant
 
-client = GraphClient(acquire_token_by_client_credentials)
+client = GraphClient.with_client_secret(test_tenant, test_client_id, test_client_secret)
 file_item = (
     client.sites.root.drive.root.get_by_path("Financial Sample.xlsx")
     .expand(["versions"])

generator/import_metadata.py

@@ -21,13 +21,13 @@ def export_to_file(path, content):
     "--endpoint",
     dest="endpoint",
     help="Import metadata endpoint",
-    default="sharepoint",
+    default="microsoftgraph",
 )
 parser.add_argument(
     "-p",
     "--path",
     dest="path",
-    default="./metadata/SharePoint.xml",
+    default="./metadata/MicrosoftGraph.xml",
     help="Import metadata endpoint",
 )
 

office365/directory/rolemanagement/resource_action.py

@@ -0,0 +1,10 @@
+from office365.runtime.client_value import ClientValue
+from office365.runtime.types.collections import StringCollection
+
+
+class ResourceAction(ClientValue):
+    """ """
+
+    def __init__(self):
+        self.allowedResourceActions = StringCollection()
+        self.notAllowedResourceActions = StringCollection()

office365/directory/rolemanagement/role_permission.py

@@ -0,0 +1,10 @@
+from office365.directory.rolemanagement.resource_action import ResourceAction
+from office365.runtime.client_value import ClientValue
+from office365.runtime.client_value_collection import ClientValueCollection
+
+
+class RolePermission(ClientValue):
+    """ """
+
+    def __init__(self, resourceActions=None):
+        self.resourceActions = ClientValueCollection(ResourceAction, resourceActions)

office365/intune/devices/management/management.py

@@ -1,3 +1,4 @@
+from office365.directory.rolemanagement.role_permission import RolePermission
 from office365.entity import Entity
 from office365.entity_collection import EntityCollection
 from office365.intune.audit.event_collection import AuditEventCollection
@@ -8,7 +9,10 @@
 )
 from office365.intune.devices.managed import ManagedDevice
 from office365.intune.devices.management.reports.reports import DeviceManagementReports
+from office365.runtime.client_result import ClientResult
+from office365.runtime.client_value_collection import ClientValueCollection
 from office365.runtime.paths.resource_path import ResourcePath
+from office365.runtime.queries.function import FunctionQuery
 
 
 class DeviceManagement(Entity):
@@ -18,6 +22,14 @@ class DeviceManagement(Entity):
     configuration.
     """
 
+    def get_effective_permissions(self, scope=None):
+        """Retrieves the effective permissions of the currently authenticated user"""
+        return_type = ClientResult(self.context, ClientValueCollection(RolePermission))
+        # params = {"scope": scope}
+        qry = FunctionQuery(self, "getEffectivePermissions", None, return_type)
+        self.context.add_query(qry)
+        return return_type
+
     @property
     def audit_events(self):
         """"""

office365/sharepoint/features/definitions/definition.py

@@ -1,12 +1,15 @@
+from typing import Optional
+
 from office365.sharepoint.entity import Entity
 
 
 class FeatureDefinition(Entity):
     """Contains the base definition of a feature, including its name, ID, scope, and version."""
 
+    def __str__(self):
+        return self.display_name or self.entity_type_name
+
     @property
     def display_name(self):
-        """
-        :rtype: str or None
-        """
+        # type: () -> Optional[str]
         return self.properties.get("DisplayName", None)

office365/sharepoint/publishing/primary_city_time.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 from office365.sharepoint.entity import Entity
 
 
@@ -6,21 +8,18 @@ class PrimaryCityTime(Entity):
 
     @property
     def location(self):
-        """
-        :rtype: str or None
-        """
+        # type: () -> Optional[str]
+        """ """
         return self.properties.get("Location", None)
 
     @property
     def time(self):
-        """
-        :rtype: str or None
-        """
+        # type: () -> Optional[str]
+        """"""
         return self.properties.get("Time", None)
 
     @property
     def utc_offset(self):
-        """
-        :rtype: str or None
-        """
+        # type: () -> Optional[str]
+        """"""
         return self.properties.get("UtcOffset", None)

office365/sharepoint/sharing/object_sharing_settings.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 from office365.runtime.paths.resource_path import ResourcePath
 from office365.sharepoint.entity import Entity
 from office365.sharepoint.sharing.object_sharing_information import (
@@ -18,84 +20,64 @@ class ObjectSharingSettings(Entity):
 
     @property
     def web_url(self):
-        """
-        The URL pointing to the containing SP.Web object.
-        :rtype: str
-        """
+        # type: () -> Optional[str]
+        """The URL pointing to the containing SP.Web object."""
         return self.properties.get("WebUrl", None)
 
     @property
     def access_request_mode(self):
-        """
-        Boolean indicating whether the sharing context operates under the access request mode.
-        :rtype: bool
-        """
+        # type: () -> Optional[bool]
+        """Boolean indicating whether the sharing context operates under the access request mode."""
         return self.properties.get("AccessRequestMode", None)
 
     @property
     def block_people_picker_and_sharing(self):
-        """
-        Boolean indicating whether the current user can use the People Picker to do any sharing.
-        :rtype: bool
-        """
+        # type: () -> Optional[bool]
+        """Boolean indicating whether the current user can use the People Picker to do any sharing."""
         return self.properties.get("BlockPeoplePickerAndSharing", None)
 
     @property
     def can_current_user_manage_organization_readonly_link(self):
-        """
-        Boolean indicating whether the current user can create or disable an organization View link.
-        :rtype: bool
-        """
+        # type: () -> Optional[bool]
+        """Boolean indicating whether the current user can create or disable an organization View link."""
         return self.properties.get("CanCurrentUserManageOrganizationReadonlyLink", None)
 
     @property
     def can_current_user_manage_organization_read_write_link(self):
-        """
-        Boolean indicating whether the current user can create or disable an organization Edit link.
-        :rtype: bool
-        """
+        # type: () -> Optional[bool]
+        """Boolean indicating whether the current user can create or disable an organization Edit link."""
         return self.properties.get(
             "CanCurrentUserManageOrganizationReadWriteLink", None
         )
 
     @property
     def can_current_user_manage_readonly_link(self):
-        """
-        Boolean indicating whether the current user can create or disable an anonymous View link.
-        :rtype: bool
-        """
+        # type: () -> Optional[bool]
+        """Boolean indicating whether the current user can create or disable an anonymous View link."""
         return self.properties.get("CanCurrentUserManageReadonlyLink", None)
 
     @property
     def can_send_email(self):
-        """
-        Boolean indicating whether email invitations can be sent.
-        :rtype: bool
-        """
+        # type: () -> Optional[bool]
+        """Boolean indicating whether email invitations can be sent."""
         return self.properties.get("CanSendEmail", None)
 
     @property
     def can_send_link(self):
-        """
-        Boolean indicating whether the current user can make use of Share-By-Link.
-        :rtype: bool
-        """
+        # type: () -> Optional[bool]
+        """Boolean indicating whether the current user can make use of Share-By-Link."""
         return self.properties.get("CanSendLink", None)
 
     @property
     def is_user_site_admin(self):
-        """
-        Boolean that indicates whether or not the current user is a site collection administrator.
-        :return: bool
-        """
+        # type: () -> Optional[bool]
+        """Boolean that indicates whether or not the current user is a site collection administrator"""
         return self.properties.get("IsUserSiteAdmin", None)
 
     @property
     def list_id(self):
-        """
-        The unique ID of the parent list (if applicable).
-        :rtype: str
-        """
+        # type: () -> Optional[str]
+        """The unique ID of the parent list (if applicable)."""
         return self.properties.get("ListId", None)
 
     @property
@@ -120,9 +102,7 @@ def object_sharing_information(self):
 
     @property
     def sharepoint_settings(self):
-        """
-        An object that contains the SharePoint UI specific sharing settings.
-        """
+        """An object that contains the SharePoint UI specific sharing settings."""
         return self.properties.get(
             "SharePointSettings",
             SharePointSharingSettings(
@@ -132,9 +112,7 @@ def sharepoint_settings(self):
 
     @property
     def sharing_permissions(self):
-        """
-        A list of SharingPermissionInformation objects that can be used to share.
-        """
+        """A list of SharingPermissionInformation objects that can be used to share."""
         return self.properties.get(
             "SharingPermissions",
             SharingPermissionInformation(