Office365-REST-Python-Client 3.2.0__py3-none-any.whl → 3.3.1__py3-none-any.whl

office365/directory/permissions/grants/oauth2.py

@@ -1,6 +1,7 @@
 from typing import Optional
 
 from office365.entity import Entity
+from office365.runtime.types.odata_property import odata
 
 
 class OAuth2PermissionGrant(Entity):
@@ -13,6 +14,7 @@ class OAuth2PermissionGrant(Entity):
     Delegated permissions are sometimes referred to as "OAuth 2.0 scopes" or "scopes".
     """
 
+    @odata(name="clientId")
     @property
     def client_id(self) -> Optional[str]:
         """
@@ -21,6 +23,7 @@ class OAuth2PermissionGrant(Entity):
         """
         return self.properties.get("clientId", None)
 
+    @odata(name="consentType")
     @property
     def consent_type(self) -> Optional[str]:
         """
@@ -32,6 +35,7 @@ class OAuth2PermissionGrant(Entity):
         """
         return self.properties.get("consentType", None)
 
+    @odata(name="principalId")
     @property
     def principal_id(self) -> Optional[str]:
         """
@@ -41,6 +45,7 @@ class OAuth2PermissionGrant(Entity):
         """
         return self.properties.get("principalId", None)
 
+    @odata(name="resourceId")
     @property
     def resource_id(self) -> Optional[str]:
         """
@@ -49,6 +54,7 @@ class OAuth2PermissionGrant(Entity):
         """
         return self.properties.get("resourceId", None)
 
+    @odata(name="scope")
     @property
     def scope(self) -> Optional[str]:
         """

office365/directory/permissions/grants/resource_specific.py

@@ -1,6 +1,7 @@
 from typing import Optional
 
 from office365.directory.objects.object import DirectoryObject
+from office365.runtime.types.odata_property import odata
 
 
 class ResourceSpecificPermissionGrant(DirectoryObject):
@@ -9,26 +10,31 @@ class ResourceSpecificPermissionGrant(DirectoryObject):
     in Microsoft Graph.
     """
 
+    @odata(name="clientId")
     @property
     def client_id(self) -> Optional[str]:
         """ID of the Azure AD app that has been granted access."""
         return self.properties.get("clientId", None)
 
+    @odata(name="clientAppId")
     @property
     def client_app_id(self) -> Optional[str]:
         """ID of the service principal of the Azure AD app that has been granted access."""
         return self.properties.get("clientAppId", None)
 
+    @odata(name="permission")
     @property
     def permission(self) -> Optional[str]:
         """The name of the resource-specific permission."""
         return self.properties.get("permission", None)
 
+    @odata(name="permissionType")
     @property
     def permission_type(self) -> Optional[str]:
         """The type of permission. Possible values are: Application, Delegated. Read-only."""
         return self.properties.get("permissionType", None)
 
+    @odata(name="resourceAppId")
     @property
     def resource_app_id(self) -> Optional[str]:
         """ID of the Azure AD app that is hosting the resource. Read-only."""

office365/directory/permissions/grants/resourcespecificpermission.py

@@ -1,12 +1,10 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
 from uuid import UUID
 
 from office365.runtime.client_value import ClientValue
 
 
-@dataclass
 class ResourceSpecificPermission(ClientValue):
     description: str | None = None
     displayName: str | None = None

office365/directory/permissions/guard.py

@@ -1,18 +1,24 @@
 """Reusable permission and role check functions for Microsoft Graph and other Entra ID resources.
 
+Every check names the *resource* it asks about, because a permission name is only a grant on the
+API that defines it: ``Sites.ReadWrite.All`` on Graph and ``Sites.ReadWrite.All`` on SharePoint
+are two grants, and ``Mail.Send`` is an application permission on Graph but a delegated one on
+Exchange Online. The default is Microsoft Graph, and the name is resolved to that resource's
+service principal rather than assumed.
+
 Usage:
-    from office365.directory.permissions.guard import has_delegated_permission, has_app_permission, has_role
-    from office365.directory.permissions.resource_name import ResourceName
+    from office365.directory.permissions.guard import has_delegated_permission, has_role
+    from office365.permissions import ResourceName
 
     if has_delegated_permission(client, "Mail.Read", client_id):
-        send_mail()
-
-    if has_app_permission(client, "Application.Read.All", client_id):
-        list_apps()
+        read_mail()
 
-    if has_app_permission(client, "Sites.Read.All", client_id, ResourceName.SharePoint):
+    if has_delegated_permission(client, "Sites.Read.All", client_id, ResourceName.SharePoint):
         download_file()
 
+    if has_application_permission(client, "Application.Read.All", client_id):
+        list_apps()
+
     if has_role(client, "Global Administrator"):
         do_admin_stuff()
 """
@@ -23,10 +29,11 @@ from dataclasses import dataclass, field
 from functools import lru_cache
 
 from office365.directory.applications.roles.collection import AppRoleCollection
-from office365.directory.permissions.resource_name import ResourceName
 from office365.directory.rolemanagement.roles.role import DirectoryRole
+from office365.directory.serviceprincipals.service_principal import ServicePrincipal
 from office365.entity_collection import EntityCollection
 from office365.graph_client import GraphClient
+from office365.permissions import ResourceName
 from office365.runtime.types.collections import StringCollection
 
 
@@ -39,20 +46,25 @@ class ResourcePermissions:
     delegated: list[str] = field(default_factory=list)
 
 
+def _resource_principal(client: GraphClient, resource: str) -> ServicePrincipal:
+    """The service principal that owns ``resource``'s permission definitions and grants."""
+    return client.service_principals.find_by_name(resource, required=True)
+
+
 @lru_cache(maxsize=None)
 def _cached_app_permissions(
     client: GraphClient, client_id: str, resource: str = ResourceName.Graph
 ) -> AppRoleCollection:
-    """Get and cache application permissions for a client on a given resource."""
-    return client.get_application_permissions(client_id).execute_query().value
+    """Get and cache the application permissions granted to ``client_id`` on ``resource``."""
+    return _resource_principal(client, resource).get_application_permissions(client_id).execute_query().value
 
 
 @lru_cache(maxsize=None)
 def _cached_delegated_permissions(
     client: GraphClient, client_id: str, resource: str = ResourceName.Graph
 ) -> StringCollection:
-    """Get and cache delegated permissions for a client on a given resource."""
-    return client.get_delegated_permissions(client_id).execute_query().value
+    """Get and cache the delegated permissions granted to ``client_id`` on ``resource``."""
+    return _resource_principal(client, resource).get_delegated_permissions(client_id).execute_query().value
 
 
 @lru_cache(maxsize=1)
@@ -65,10 +77,21 @@ def _cached_directory_roles(client: GraphClient) -> EntityCollection[DirectoryRo
 def has_delegated_permission(
     client: GraphClient, scope: str, client_id: str, resource: str = ResourceName.Graph
 ) -> bool:
-    """True if the app has the delegated permission (OAuth scope) assigned on the resource."""
+    """True if the app has the delegated permission (OAuth scope) granted tenant-wide on ``resource``.
+
+    Tenant-wide (``AllPrincipals``) on purpose: a per-user consent makes the call work for that
+    user alone, so answering it here would be a silent yes for everyone else.
+    """
     return scope in _cached_delegated_permissions(client, client_id, resource)
 
 
+def has_application_permission(
+    client: GraphClient, app_role: str, client_id: str, resource: str = ResourceName.Graph
+) -> bool:
+    """True if the app has the application permission (app role) assigned on the resource."""
+    return app_role in {role.value for role in _cached_app_permissions(client, client_id, resource)}
+
+
 def has_role(client: GraphClient, *role_names: str) -> bool:
     """True if the signed-in user has at least one of the specified directory roles."""
     granted = {r.display_name for r in _cached_directory_roles(client)}

office365/directory/permissions/identity.py

@@ -1,11 +1,8 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
-
 from office365.runtime.client_value import ClientValue
 
 
-@dataclass
 class Identity(ClientValue):
     """The Identity resource represents an identity of an actor. For example, an actor can be a user, device,
     or application."""
@@ -13,6 +10,10 @@ class Identity(ClientValue):
     displayName: str | None = None
     id: str | None = None
 
+    def __str__(self) -> str:
+        """Best-effort human-readable label (display name or object id)."""
+        return self.displayName or self.id or ""
+
     def __repr__(self):
         return repr(self.to_json())
 

office365/directory/permissions/identity_set.py

@@ -1,29 +1,11 @@
-from __future__ import annotations
-
-from dataclasses import dataclass, field
-
-from office365.directory.permissions.identity import Identity
-from office365.runtime.client_value import ClientValue
+"""Compatibility import for :class:`office365.directory.identity_set.IdentitySet`.
 
+The class used to be duplicated here with the same members; the canonical model
+lives next to the rest of the ``microsoft.graph.IdentitySet`` graph.
+"""
 
-@dataclass
-class IdentitySet(ClientValue):
-    """
-        The IdentitySet resource is a keyed collection of identity resources. It is used to represent a set of
-    identities associated with various events for an item, such as created by or last modified by.
-        Fields:
-            application (Identity): The application associated with this action.
-            device (Identity): The device associated with this action.
-            user (Identity): The user associated with this action.
-    """
-
-    application: Identity = field(default_factory=Identity)
-    device: Identity = field(default_factory=Identity)
-    user: Identity = field(default_factory=Identity)
+from __future__ import annotations
 
-    def __repr__(self):
-        return repr({n: v.to_json() for n, v in self if v.to_json()})
+from office365.directory.identity_set import IdentitySet
 
-    @property
-    def entity_type_name(self) -> str:
-        return "microsoft.graph.search.IdentitySet"
+__all__ = ["IdentitySet"]

office365/directory/permissions/scope.py

@@ -1,11 +1,8 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
-
 from office365.runtime.client_value import ClientValue
 
 
-@dataclass
 class PermissionScope(ClientValue):
     """Represents the definition of a delegated permission.
 

office365/directory/permissions/scoped_role_membership.py

@@ -2,6 +2,7 @@ from typing import Optional
 
 from office365.directory.permissions.identity import Identity
 from office365.entity import Entity
+from office365.runtime.types.odata_property import odata
 
 
 class ScopedRoleMembership(Entity):
@@ -10,16 +11,19 @@ class ScopedRoleMembership(Entity):
     administrator to delegate administrative privileges to a user, to manage users and groups in a subset
     of the organization."""
 
+    @odata(name="administrativeUnitId")
     @property
     def administrative_unit_id(self) -> Optional[str]:
         """Gets the administrativeUnitId property"""
         return self.properties.get("administrativeUnitId", None)
 
+    @odata(name="roleId")
     @property
     def role_id(self) -> Optional[str]:
         """Gets the roleId property"""
         return self.properties.get("roleId", None)
 
+    @odata(name="roleMemberInfo")
     @property
     def role_member_info(self) -> Identity:
         """Gets the roleMemberInfo property"""

office365/directory/policies/activity_based_timeout_policy.py

@@ -0,0 +1,7 @@
+from __future__ import annotations
+
+from office365.entity import Entity
+
+
+class ActivityBasedTimeoutPolicy(Entity):
+    pass

office365/directory/policies/admin_consent_request.py

@@ -1,4 +1,11 @@
+from __future__ import annotations
+
+from typing import Optional
+
+from office365.directory.identitygovernance.accessreview.reviewer_scope import AccessReviewReviewerScope
 from office365.entity import Entity
+from office365.runtime.client_value_collection import ClientValueCollection
+from office365.runtime.types.odata_property import odata
 
 
 class AdminConsentRequestPolicy(Entity):
@@ -8,3 +15,45 @@ class AdminConsentRequestPolicy(Entity):
     authorization before users can use the apps to access organizational data.
     There is a single adminConsentRequestPolicy per tenant.
     """
+
+    @odata(name="isEnabled")
+    @property
+    def is_enabled(self) -> Optional[bool]:
+        """Gets the isEnabled property"""
+        return self.properties.get("isEnabled", None)
+
+    @odata(name="notifyReviewers")
+    @property
+    def notify_reviewers(self) -> Optional[bool]:
+        """Gets the notifyReviewers property"""
+        return self.properties.get("notifyReviewers", None)
+
+    @odata(name="remindersEnabled")
+    @property
+    def reminders_enabled(self) -> Optional[bool]:
+        """Gets the remindersEnabled property"""
+        return self.properties.get("remindersEnabled", None)
+
+    @odata(name="requestDurationInDays")
+    @property
+    def request_duration_in_days(self) -> Optional[int]:
+        """Gets the requestDurationInDays property"""
+        return self.properties.get("requestDurationInDays", None)
+
+    @odata(name="reviewers")
+    @property
+    def reviewers(self) -> ClientValueCollection[AccessReviewReviewerScope]:
+        """Gets the reviewers property"""
+        return self.properties.get(
+            "reviewers", ClientValueCollection[AccessReviewReviewerScope](AccessReviewReviewerScope)
+        )
+
+    @odata(name="version")
+    @property
+    def version(self) -> Optional[int]:
+        """Gets the version property"""
+        return self.properties.get("version", None)
+
+    @property
+    def entity_type_name(self) -> str:
+        return "microsoft.graph.AdminConsentRequestPolicy"

office365/directory/policies/all_devices_assignment_target.py

@@ -1,12 +1,9 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
-
 from office365.directory.policies.conditionalaccess.device_and_app_management_assignment_target import (
     DeviceAndAppManagementAssignmentTarget,
 )
 
 
-@dataclass
 class AllDevicesAssignmentTarget(DeviceAndAppManagementAssignmentTarget):
     pass

office365/directory/policies/all_domains.py

@@ -1,10 +1,7 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
-
 from office365.runtime.client_value import ClientValue
 
 
-@dataclass
 class AllDomains(ClientValue):
     pass

office365/directory/policies/all_licensed_users_assignment_target.py

@@ -1,10 +1,7 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
-
 from office365.runtime.client_value import ClientValue
 
 
-@dataclass
 class AllLicensedUsersAssignmentTarget(ClientValue):
     pass

office365/directory/policies/app_management.py

@@ -1,7 +1,10 @@
+from __future__ import annotations
+
 from typing import Optional
 
 from office365.directory.objects.collection import DirectoryObjectCollection
 from office365.directory.policies.base import PolicyBase
+from office365.directory.policies.custom_app_management_configuration import CustomAppManagementConfiguration
 from office365.runtime.paths.resource_path import ResourcePath
 from office365.runtime.types.odata_property import odata
 
@@ -13,7 +16,7 @@ class AppManagementPolicy(PolicyBase):
     to the settings in the tenantAppManagementPolicy object.
     """
 
-    @odata(name="appliesTo")
+    @odata(name="appliesTo", navigation=True)
     @property
     def applies_to(self) -> DirectoryObjectCollection:
         """Collection of applications and service principals to which the policy is applied."""
@@ -21,6 +24,7 @@ class AppManagementPolicy(PolicyBase):
             "appliesTo", DirectoryObjectCollection(self.context, ResourcePath("appliesTo", self.resource_path))
         )
 
+    @odata(name="isEnabled")
     @property
     def is_enabled(self) -> Optional[bool]:
         """Gets the isEnabled property"""
@@ -29,3 +33,9 @@ class AppManagementPolicy(PolicyBase):
     @property
     def entity_type_name(self) -> str:
         return "microsoft.graph.AppManagementPolicy"
+
+    @odata(name="restrictions")
+    @property
+    def restrictions(self) -> CustomAppManagementConfiguration:
+        """Gets the restrictions property"""
+        return self.properties.get("restrictions", CustomAppManagementConfiguration())

office365/directory/policies/app_management_application_configuration.py

@@ -1,12 +1,11 @@
 from __future__ import annotations
 
-from dataclasses import dataclass, field
+from dataclasses import field
 
 from office365.directory.policies.identifier_uri_configuration import IdentifierUriConfiguration
 from office365.runtime.client_value import ClientValue
 
 
-@dataclass
 class AppManagementApplicationConfiguration(ClientValue):
     identifierUris: IdentifierUriConfiguration = field(default_factory=IdentifierUriConfiguration)
 

office365/directory/policies/app_management_configuration.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from dataclasses import dataclass, field
+from dataclasses import field
 
 from office365.directory.applications.key_credential_configuration import KeyCredentialConfiguration
 from office365.directory.applications.password_credential_configuration import PasswordCredentialConfiguration
@@ -8,7 +8,6 @@ from office365.runtime.client_value import ClientValue
 from office365.runtime.client_value_collection import ClientValueCollection
 
 
-@dataclass
 class AppManagementConfiguration(ClientValue):
     keyCredentials: ClientValueCollection[KeyCredentialConfiguration] = field(
         default_factory=lambda: ClientValueCollection(KeyCredentialConfiguration)

office365/directory/policies/app_management_policy_actor_exemptions.py

@@ -1,13 +1,12 @@
 from __future__ import annotations
 
-from dataclasses import dataclass, field
+from dataclasses import field
 
 from office365.directory.applications.custom_security_attribute_exemption import CustomSecurityAttributeExemption
 from office365.runtime.client_value import ClientValue
 from office365.runtime.client_value_collection import ClientValueCollection
 
 
-@dataclass
 class AppManagementPolicyActorExemptions(ClientValue):
     customSecurityAttributes: ClientValueCollection[CustomSecurityAttributeExemption] = field(
         default_factory=lambda: ClientValueCollection(CustomSecurityAttributeExemption)

office365/directory/policies/app_management_service_principal_configuration.py

@@ -1,10 +1,7 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
-
 from office365.runtime.client_value import ClientValue
 
 
-@dataclass
 class AppManagementServicePrincipalConfiguration(ClientValue):
     pass

office365/directory/policies/applied_conditional_access.py

@@ -1,12 +1,11 @@
 from __future__ import annotations
 
-from dataclasses import dataclass, field
+from dataclasses import field
 
 from office365.runtime.client_value import ClientValue
 from office365.runtime.types.collections import StringCollection
 
 
-@dataclass
 class AppliedConditionalAccessPolicy(ClientValue):
     """Indicates the attributes related to applied conditional access policy or policies that are triggered
     by a sign-in activity.

office365/directory/policies/authentication_combination_configuration.py

@@ -3,9 +3,11 @@ from __future__ import annotations
 from office365.directory.authentication.methods.modes import AuthenticationMethodModes
 from office365.entity import Entity
 from office365.runtime.client_value_collection import ClientValueCollection
+from office365.runtime.types.odata_property import odata
 
 
 class AuthenticationCombinationConfiguration(Entity):
+    @odata(name="appliesToCombinations")
     @property
     def applies_to_combinations(self) -> ClientValueCollection[AuthenticationMethodModes]:
         """Gets the appliesToCombinations property"""

office365/directory/policies/authentication_context_class_reference.py

@@ -3,19 +3,23 @@ from __future__ import annotations
 from typing import Optional
 
 from office365.entity import Entity
+from office365.runtime.types.odata_property import odata
 
 
 class AuthenticationContextClassReference(Entity):
+    @odata(name="description")
     @property
     def description(self) -> Optional[str]:
         """Gets the description property"""
         return self.properties.get("description", None)
 
+    @odata(name="displayName")
     @property
     def display_name(self) -> Optional[str]:
         """Gets the displayName property"""
         return self.properties.get("displayName", None)
 
+    @odata(name="isAvailable")
     @property
     def is_available(self) -> Optional[bool]:
         """Gets the isAvailable property"""

office365/directory/policies/authentication_flows.py

@@ -1,6 +1,12 @@
+from __future__ import annotations
+
 from typing import Optional
 
+from office365.directory.policies.self_service_sign_up_authentication_flow_configuration import (  # noqa: E501
+    SelfServiceSignUpAuthenticationFlowConfiguration,
+)
 from office365.entity import Entity
+from office365.runtime.types.odata_property import odata
 
 
 class AuthenticationFlowsPolicy(Entity):
@@ -10,7 +16,24 @@ class AuthenticationFlowsPolicy(Entity):
     description, and indicates whether self-service sign-up is enabled for the policy.
     """
 
+    @odata(name="displayName")
     @property
     def display_name(self) -> Optional[str]:
         """The human-readable name of the policy."""
         return self.properties.get("displayName", None)
+
+    @odata(name="description")
+    @property
+    def description(self) -> Optional[str]:
+        """Gets the description property"""
+        return self.properties.get("description", None)
+
+    @odata(name="selfServiceSignUp")
+    @property
+    def self_service_sign_up(self) -> SelfServiceSignUpAuthenticationFlowConfiguration:
+        """Gets the selfServiceSignUp property"""
+        return self.properties.get("selfServiceSignUp", SelfServiceSignUpAuthenticationFlowConfiguration())
+
+    @property
+    def entity_type_name(self) -> str:
+        return "microsoft.graph.AuthenticationFlowsPolicy"

office365/directory/policies/authentication_methods.py

@@ -7,6 +7,7 @@ from office365.directory.authentication.methods.registrationenforcement import R
 from office365.entity import Entity
 from office365.entity_collection import EntityCollection
 from office365.runtime.paths.resource_path import ResourcePath
+from office365.runtime.types.odata_property import odata
 
 
 class AuthenticationMethodsPolicy(Entity):
@@ -14,41 +15,49 @@ class AuthenticationMethodsPolicy(Entity):
     authentication (MFA) in Azure Active Directory (Azure AD).
     """
 
+    @odata(name="description")
     @property
     def description(self) -> Optional[str]:
         """Gets the description property"""
         return self.properties.get("description", None)
 
+    @odata(name="displayName")
     @property
     def display_name(self) -> Optional[str]:
         """Gets the displayName property"""
         return self.properties.get("displayName", None)
 
+    @odata(name="lastModifiedDateTime")
     @property
     def last_modified_date_time(self) -> Optional[datetime]:
         """Gets the lastModifiedDateTime property"""
         return self.properties.get("lastModifiedDateTime", datetime.min)
 
+    @odata(name="policyMigrationState")
     @property
     def policy_migration_state(self) -> AuthenticationMethodsPolicyMigrationState:
         """Gets the policyMigrationState property"""
         return self.properties.get("policyMigrationState", AuthenticationMethodsPolicyMigrationState.preMigration)
 
+    @odata(name="policyVersion")
     @property
     def policy_version(self) -> Optional[str]:
         """Gets the policyVersion property"""
         return self.properties.get("policyVersion", None)
 
+    @odata(name="reconfirmationInDays")
     @property
     def reconfirmation_in_days(self) -> Optional[int]:
         """Gets the reconfirmationInDays property"""
         return self.properties.get("reconfirmationInDays", None)
 
+    @odata(name="registrationEnforcement")
     @property
     def registration_enforcement(self) -> RegistrationEnforcement:
         """Gets the registrationEnforcement property"""
         return self.properties.get("registrationEnforcement", RegistrationEnforcement())
 
+    @odata(name="authenticationMethodConfigurations", navigation=True)
     @property
     def authentication_method_configurations(self) -> EntityCollection[AuthenticationMethodConfiguration]:
         """Gets the authenticationMethodConfigurations property"""