directory,calendar, onedrive namespaces improvements (new types & methods)

Author: [email protected]

examples/directory/delete_groups.py

@@ -13,7 +13,7 @@
     print("Group deleted.")
     index += 1
 
-deleted_groups = client.directory.deleted_groups.get().execute_query()
+deleted_groups = client.directory.deletedGroups.get().execute_query()
 groups_count = len(deleted_groups)
 index = 0
 while len(deleted_groups) > 0:

examples/teams/send_message.py

@@ -2,11 +2,11 @@
 from tests.graph_case import acquire_token_by_username_password
 
 client = GraphClient(acquire_token_by_username_password)
-teams_result = client.me.joinedTeams.get().execute_query()
+teams_result = client.me.joined_teams.get().execute_query()
 if len(teams_result) > 0:
     target_team = teams_result[1]
 
-    messages = target_team.primaryChannel.messages.get().execute_query()
+    messages = target_team.primary_channel.messages.get().execute_query()
     print(messages)
 
     # item_body = ItemBody("Hello world!")

office365/calendar/calendar.py

@@ -37,6 +37,17 @@ def get_schedule(self, schedules, startTime=None, endTime=None, availabilityView
         self.context.add_query(qry)
         return result
 
+    @property
+    def can_edit(self):
+        """
+        true if the user can write to the calendar, false otherwise.
+        This property is true for the user who created the calendar.
+        This property is also true for a user who has been shared a calendar and granted write access.
+
+        :rtype: bool or None
+        """
+        return self.properties.get('canEdit', None)
+
     @property
     def name(self):
         """
@@ -59,7 +70,7 @@ def events(self):
                                    EventCollection(self.context, ResourcePath("events", self.resource_path)))
 
     @property
-    def calendarView(self):
+    def calendar_view(self):
         """The calendar view for the calendar. Navigation property. Read-only."""
         return self.properties.get('calendarView',
                                    EventCollection(self.context, ResourcePath("calendarView", self.resource_path)))

office365/calendar/event.py

@@ -1,4 +1,5 @@
 from office365.calendar.attendee import Attendee
+from office365.directory.extension import ExtensionCollection
 from office365.mail.attachment_collection import AttachmentCollection
 from office365.mail.item import Item
 from office365.mail.location import Location
@@ -64,3 +65,16 @@ def attachments(self):
         """The collection of fileAttachment and itemAttachment attachments for the event. """
         return self.properties.get('attachments',
                                    AttachmentCollection(self.context, ResourcePath("attachments", self.resource_path)))
+
+    @property
+    def extensions(self):
+        """The collection of open extensions defined for the event. Nullable."""
+        return self.properties.get('extensions',
+                                   ExtensionCollection(self.context, ResourcePath("extensions", self.resource_path)))
+
+    @property
+    def instances(self):
+        """The collection of open extensions defined for the event. Nullable."""
+        from office365.calendar.event_collection import EventCollection
+        return self.properties.get('instances',
+                                   EventCollection(self.context, ResourcePath("instances", self.resource_path)))

office365/calendar/onlineMeetingProviderType.py

@@ -0,0 +1,10 @@
+class OnlineMeetingProviderType:
+    """Specifies the type of a principal."""
+
+    def __init__(self):
+        pass
+
+    unknown = 0
+    skypeForBusiness = 1
+    skypeForConsumer = 2
+    teamsForBusiness = 3

office365/directory/application.py

@@ -37,7 +37,7 @@ def delete_object(self, permanent_delete=False):
         """
         super(Application, self).delete_object()
         if permanent_delete:
-            deleted_item = self.context.directory.deleted_applications[self.id]
+            deleted_item = self.context.directory.deletedApplications[self.id]
             deleted_item.delete_object()
         return self
 

office365/directory/assignedLicense.py

@@ -2,4 +2,8 @@
 
 
 class AssignedLicense(ClientValue):
-    pass
+
+    def __init__(self, skuId=None, disabledPlans=None):
+        super().__init__()
+        self.skuId = skuId
+        self.disabledPlans = disabledPlans

office365/directory/directory.py

@@ -8,7 +8,7 @@ class Directory(Entity):
     "container". Deleted items will remain available to restore for up to 30 days. After 30 days, the items are
     permanently deleted. """
 
-    def deleted_items(self, entity_type=None):
+    def deletedItems(self, entity_type=None):
         """Recently deleted items. Read-only. Nullable."""
         if entity_type:
             return DirectoryObjectCollection(self.context, ResourcePath(entity_type,
@@ -20,16 +20,16 @@ def deleted_items(self, entity_type=None):
                                                                  ResourcePath("deletedItems", self.resource_path)))
 
     @property
-    def deleted_groups(self):
+    def deletedGroups(self):
         """Recently deleted groups"""
-        return self.deleted_items("microsoft.graph.group")
+        return self.deletedItems("microsoft.graph.group")
 
     @property
-    def deleted_users(self):
+    def deletedUsers(self):
         """Recently deleted users"""
-        return self.deleted_items("microsoft.graph.user")
+        return self.deletedItems("microsoft.graph.user")
 
     @property
-    def deleted_applications(self):
+    def deletedApplications(self):
         """Recently deleted applications"""
-        return self.deleted_items("microsoft.graph.application")
+        return self.deletedItems("microsoft.graph.application")

office365/directory/directoryObjectCollection.py

@@ -3,7 +3,6 @@
 from office365.runtime.client_result import ClientResult
 from office365.runtime.http.http_method import HttpMethod
 from office365.runtime.queries.service_operation_query import ServiceOperationQuery
-from office365.runtime.resource_path import ResourcePath
 
 
 class DirectoryObjectCollection(EntityCollection):

office365/directory/group.py

@@ -2,11 +2,13 @@
 
 from office365.calendar.event_collection import EventCollection
 from office365.directory.appRoleAssignment import AppRoleAssignmentCollection
+from office365.directory.assignedLicense import AssignedLicense
 from office365.directory.directoryObject import DirectoryObject
 from office365.directory.directoryObjectCollection import DirectoryObjectCollection
 from office365.onedrive.driveCollection import DriveCollection
 from office365.onedrive.siteCollection import SiteCollection
 from office365.runtime.client_result import ClientResult
+from office365.runtime.client_value_collection import ClientValueCollection
 from office365.runtime.http.http_method import HttpMethod
 from office365.runtime.queries.service_operation_query import ServiceOperationQuery
 from office365.runtime.resource_path import ResourcePath
@@ -70,7 +72,7 @@ def delete_object(self, permanent_delete=False):
         """
         super(Group, self).delete_object()
         if permanent_delete:
-            deleted_item = self.context.directory.deleted_groups[self.id]
+            deleted_item = self.context.directory.deletedGroups[self.id]
             deleted_item.delete_object()
         return self
 
@@ -109,3 +111,8 @@ def appRoleAssignments(self):
         return self.properties.get('appRoleAssignments',
                                    AppRoleAssignmentCollection(self.context,
                                                                ResourcePath("appRoleAssignments", self.resource_path)))
+
+    @property
+    def assigned_licenses(self):
+        return self.properties.get('assignedLicenses',
+                                   ClientValueCollection(AssignedLicense))

office365/directory/organization.py

@@ -0,0 +1,5 @@
+from office365.directory.directoryObject import DirectoryObject
+
+
+class Organization(DirectoryObject):
+    pass

office365/directory/servicePlanInfo.py

@@ -0,0 +1,29 @@
+from office365.runtime.client_value import ClientValue
+
+
+class ServicePlanInfo(ClientValue):
+    """Contains information about a service plan associated with a subscribed SKU. The servicePlans property of
+    the subscribedSku entity is a collection of servicePlanInfo."""
+
+    def __init__(self, servicePlanId=None, servicePlanName=None, provisioningStatus=None, appliesTo=None):
+        """
+
+        :param str appliesTo: The object the service plan can be assigned to. Possible values:
+               "User" - service plan can be assigned to individual users.
+               "Company" - service plan can be assigned to the entire tenant.
+        :param str provisioningStatus: The provisioning status of the service plan. Possible values:
+               "Success" - Service is fully provisioned.
+               "Disabled" - Service has been disabled.
+               "PendingInput" - Service is not yet provisioned; awaiting service confirmation.
+               "PendingActivation" - Service is provisioned but requires explicit activation by administrator
+               (for example, Intune_O365 service plan)
+               "PendingProvisioning" - Microsoft has added a new service to the product SKU and it has not been
+               activated in the tenant, yet.
+        :param str servicePlanName: The name of the service plan.
+        :param str servicePlanId: The unique identifier of the service plan.
+        """
+        super().__init__()
+        self.servicePlanId = servicePlanId
+        self.servicePlanName = servicePlanName
+        self.provisioningStatus = provisioningStatus
+        self.appliesTo = appliesTo

office365/directory/subscribedSku.py

@@ -0,0 +1,20 @@
+from office365.directory.servicePlanInfo import ServicePlanInfo
+from office365.entity import Entity
+from office365.entity_collection import EntityCollection
+from office365.runtime.client_value_collection import ClientValueCollection
+
+
+class SubscribedSku(Entity):
+    """Contains information about a service SKU that a company is subscribed to."""
+
+    @property
+    def servicePlans(self):
+        """Information about the service plans that are available with the SKU. Not nullable"""
+        return self.properties.get('servicePlans',
+                                   ClientValueCollection(ServicePlanInfo))
+
+
+class SubscribedSkuCollection(EntityCollection):
+
+    def __init__(self, context, resource_path=None):
+        super(SubscribedSkuCollection, self).__init__(context, SubscribedSku, resource_path)

office365/directory/user.py

@@ -13,6 +13,7 @@
 from office365.mail.contact_collection import ContactCollection
 from office365.calendar.event_collection import EventCollection
 from office365.mail.message_collection import MessageCollection
+from office365.onedrive.siteCollection import SiteCollection
 from office365.runtime.client_value_collection import ClientValueCollection
 from office365.runtime.http.http_method import HttpMethod
 from office365.runtime.queries.service_operation_query import ServiceOperationQuery
@@ -23,6 +24,32 @@
 class User(DirectoryObject):
     """Represents an Azure AD user account. Inherits from directoryObject."""
 
+    def assign_license(self, addLicenses, removeLicenses):
+        """
+        Add or remove licenses on the user.
+        :param list[str] removeLicenses: A collection of skuIds that identify the licenses to remove.
+        :param ClientValueCollection addLicenses: A collection of assignedLicense objects that specify
+             the licenses to add.
+        """
+        params = {
+            "addLicenses": addLicenses,
+            "removeLicenses": removeLicenses
+        }
+        qry = ServiceOperationQuery(self, "assignLicense", None, params, None, self)
+        self.context.add_query(qry)
+        return self
+
+    def change_password(self, currentPassword, newPassword):
+        """
+
+        :param str currentPassword:
+        :param str newPassword:
+        """
+        qry = ServiceOperationQuery(self, "changePassword", None,
+                                    {"currentPassword": currentPassword, "newPassword": newPassword})
+        self.context.add_query(qry)
+        return self
+
     def send_mail(self, message):
         """Send a new message on the fly"""
         qry = ServiceOperationQuery(self, "sendmail", None, message)
@@ -80,6 +107,7 @@ def get_calendar_view(self, start_dt, end_dt):
         def _construct_request(request):
             request.method = HttpMethod.Get
             request.url += "?startDateTime={0}&endDateTime={1}".format(start_dt.isoformat(), end_dt.isoformat())
+
         self.context.before_execute(_construct_request)
         return result
 
@@ -102,6 +130,7 @@ def get_reminder_view(self, start_dt, end_dt):
 
         def _construct_request(request):
             request.method = HttpMethod.Get
+
         self.context.before_execute(_construct_request)
         return result
 
@@ -113,7 +142,7 @@ def delete_object(self, permanent_delete=False):
         """
         super(User, self).delete_object()
         if permanent_delete:
-            deleted_user = self.context.directory.deleted_users[self.id]
+            deleted_user = self.context.directory.deletedUsers[self.id]
             deleted_user.delete_object()
         return self
 
@@ -122,7 +151,7 @@ def account_enabled(self):
         return self.properties.get('accountEnabled', None)
 
     @property
-    def creationType(self):
+    def creation_type(self):
         """Indicates whether the user account was created as a regular school or work account (null),
         an external account (Invitation), a local account for an Azure Active Directory B2C tenant (LocalAccount)
         or self-service sign-up using email verification (EmailVerified). Read-only.
@@ -137,7 +166,7 @@ def mail(self):
         return self.properties.get('mail', None)
 
     @property
-    def otherMails(self):
+    def other_mails(self):
         """A list of additional email addresses for the user;
         for example: ["[email protected]", "[email protected]"]. Supports $filter.
         """
@@ -159,6 +188,11 @@ def assigned_licenses(self):
         return self.properties.get('assignedLicenses',
                                    ClientValueCollection(AssignedLicense))
 
+    @property
+    def followed_sites(self):
+        return self.properties.get('followedSites',
+                                   SiteCollection(self.context, ResourcePath("followedSites", self.resource_path)))
+
     @property
     def photo(self):
         """
@@ -188,14 +222,14 @@ def calendars(self):
                                    CalendarCollection(self.context, ResourcePath("calendars", self.resource_path)))
 
     @property
-    def calendarGroups(self):
+    def calendar_groups(self):
         """The user's calendar groups. Read-only. Nullable."""
         return self.properties.get('calendarGroups',
                                    CalendarGroupCollection(self.context,
                                                            ResourcePath("calendarGroups", self.resource_path)))
 
     @property
-    def licenseDetails(self):
+    def license_details(self):
         """Retrieve the properties and relationships of a Drive resource."""
         return self.properties.get('licenseDetails',
                                    LicenseDetailsCollection(self.context,
@@ -226,26 +260,36 @@ def messages(self):
                                    MessageCollection(self.context, ResourcePath("messages", self.resource_path)))
 
     @property
-    def joinedTeams(self):
+    def joined_teams(self):
         """Get the teams in Microsoft Teams that the user is a direct member of."""
         return self.properties.get('joinedTeams',
                                    TeamCollection(self.context, ResourcePath("joinedTeams", self.resource_path)))
 
     @property
-    def memberOf(self):
+    def member_of(self):
         """Get groups and directory roles that the user is a direct member of."""
         return self.properties.get('memberOf',
                                    DirectoryObjectCollection(self.context,
                                                              ResourcePath("memberOf", self.resource_path)))
 
     @property
-    def transitiveMemberOf(self):
+    def transitive_member_of(self):
         """Get groups, directory roles that the user is a member of. This API request is transitive, and will also
         return all groups the user is a nested member of. """
         return self.properties.get('transitiveMemberOf',
                                    DirectoryObjectCollection(self.context,
                                                              ResourcePath("transitiveMemberOf", self.resource_path)))
 
+    def get_property(self, name):
+        if name == "transitiveMemberOf":
+            return self.transitive_member_of
+        elif name == "joinedTeams":
+            return self.joined_teams
+        elif name == "assignedLicenses":
+            return self.assigned_licenses
+        else:
+            return super(User, self).get_property(name)
+
     def set_property(self, name, value, persist_changes=True):
         super(User, self).set_property(name, value, persist_changes)
         # fallback: create a new resource path

office365/directory/userCollection.py

@@ -11,7 +11,6 @@ def __init__(self, context, resource_path=None):
 
     def __getitem__(self, key):
         """
-
         :rtype: User
         """
         return super(UserCollection, self).__getitem__(key)