OneDrive API enhancements: new types and methods

Author: vgrem

office365/directory/rbac/__init__.py

@@ -0,0 +1,7 @@
+from office365.entity import Entity
+
+
+class RbacApplication(Entity):
+    """Role management container for unified role definitions and role assignments for Microsoft 365 role-based
+    access control (RBAC) providers. The role assignments support only a single principal and a single scope.
+    Currently directory and entitlementManagement are the two RBAC providers supported."""

office365/directory/rbac/application.py

@@ -0,0 +1,17 @@
+from office365.directory.rbac.application import RbacApplication
+from office365.entity import Entity
+from office365.runtime.paths.resource_path import ResourcePath
+
+
+class RoleManagement(Entity):
+    """
+    Represents a Microsoft 365 role-based access control (RBAC) role management entity.
+    This resource provides access to role definitions and role assignments surfaced from RBAC providers.
+    directory (Azure Active Directory), entitlementManagement, and deviceManagement (Intune) providers
+    are currently supported.
+    """
+
+    @property
+    def directory(self):
+        return self.properties.get('directory',
+                                   RbacApplication(self.context, ResourcePath("directory", self.resource_path)))

office365/directory/roles/__init__.py

@@ -14,6 +14,7 @@
 from office365.directory.internal.paths.me import MePath
 from office365.directory.licenses.subscribed_sku import SubscribedSku
 from office365.directory.resource_specific_permission_grant import ResourceSpecificPermissionGrant
+from office365.directory.roles.management import RoleManagement
 from office365.intune.organizations.org_contact import OrgContact
 from office365.intune.organizations.organization import Organization
 from office365.directory.policies.root import PolicyRoot
@@ -235,6 +236,10 @@ def reports(self):
         """
         return ReportRoot(self, ResourcePath("reports"))
 
+    @property
+    def role_management(self):
+        return RoleManagement(self, ResourcePath("roleManagement"))
+
     @property
     def teams_templates(self):
         """

office365/directory/roles/management.py

@@ -0,0 +1,5 @@
+from office365.runtime.client_value import ClientValue
+
+
+class ItemActionStat(ClientValue):
+    """The itemActionStat resource provides aggregate details about an action over a period of time."""

office365/directory/role.py renamed to office365/directory/roles/role.py

@@ -1,9 +1,30 @@
+from office365.directory.identities.identity_set import IdentitySet
 from office365.entity import Entity
+from office365.runtime.paths.resource_path import ResourcePath
 
 
 class ItemActivity(Entity):
     """
     The itemActivity resource provides information about activities that took place on an item or within a container.
     Currently only available on SharePoint and OneDrive for Business.
     """
-    pass
+
+    @property
+    def actor(self):
+        """Identity of who performed the action."""
+        return self.properties.get("actor", IdentitySet())
+
+    @property
+    def drive_item(self):
+        """Exposes the driveItem that was the target of this activity."""
+        from office365.onedrive.driveitems.driveItem import DriveItem
+        return self.properties.get('driveItem',
+                                   DriveItem(self.context, ResourcePath("driveItem", self.resource_path)))
+
+    def get_property(self, name, default_value=None):
+        if default_value is None:
+            property_mapping = {
+                "driveItem": self.drive_item,
+            }
+            default_value = property_mapping.get(name, None)
+        return super(ItemActivity, self).get_property(name, default_value)

office365/directory/role_template.py renamed to office365/directory/roles/template.py

@@ -29,6 +29,7 @@
 from office365.runtime.client_result import ClientResult
 from office365.runtime.http.http_method import HttpMethod
 from office365.runtime.queries.create_entity import CreateEntityQuery
+from office365.runtime.queries.function import FunctionQuery
 from office365.runtime.queries.service_operation import ServiceOperationQuery
 from office365.runtime.paths.resource_path import ResourcePath
 from office365.runtime.queries.upload_session import UploadSessionQuery
@@ -306,15 +307,7 @@ def search(self, query_text):
         :type query_text: str
         """
         return_type = EntityCollection(self.context, DriveItem, ResourcePath("items", self.resource_path))
-        qry = ServiceOperationQuery(self, "search", {"q": query_text}, None, None, return_type)
-
-        def _construct_query(request):
-            """
-            :type request: office365.runtime.http.request_options.RequestOptions
-            """
-            request.method = HttpMethod.Get
-
-        self.context.before_execute(_construct_query)
+        qry = FunctionQuery(self, "search", {"q": query_text}, return_type)
         self.context.add_query(qry)
         return return_type
 
@@ -361,13 +354,8 @@ def get_activities_by_interval(self, start_dt=None, end_dt=None, interval=None):
             "interval": interval
         }
         return_type = EntityCollection(self.context, ItemActivityStat, self.resource_path)
-        qry = ServiceOperationQuery(self, "getActivitiesByInterval", params, None, None, return_type)
+        qry = FunctionQuery(self, "getActivitiesByInterval", params, return_type)
         self.context.add_query(qry)
-
-        def _construct_request(request):
-            request.method = HttpMethod.Get
-
-        self.context.before_execute(_construct_request)
         return return_type
 
     def restore(self, parent_reference, name):