Skip to content

Commit 8f49845

Browse files
vgremvgrem
committed
#682: fixes the bug with loosing event handlers
1 parent ab02fa9 commit 8f49845

File tree

13 files changed

+591
-101
lines changed

13 files changed

+591
-101
lines changed

‎examples/sharepoint/connect_and_set_proxy.py

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
from office365.runtime.auth.client_credential import ClientCredential
21
from office365.sharepoint.client_context import ClientContext
32
from office365.sharepoint.webs.web import Web
4-
from tests import load_settings
5-
6-
settings = load_settings()
3+
from tests import test_site_url, test_client_id, test_client_secret
74

85

96
def set_proxy(request):
@@ -12,14 +9,9 @@ def set_proxy(request):
129
#request.proxies = proxies
1310

1411

15-
ctx = ClientContext(settings.get('default', 'site_url'))\
16-
.with_credentials(ClientCredential(settings.get('client_credentials', 'client_id'),
17-
settings.get('client_credentials', 'client_secret')))
12+
ctx = ClientContext(test_site_url).with_client_credentials(test_client_id, test_client_secret)
1813

1914
ctx.pending_request().beforeExecute += set_proxy
2015

21-
# web = ctx.web.get().execute_query()
22-
# print(web.url)
23-
2416
result = Web.get_context_web_information(ctx).execute_query()
2517
print(result.value.LibraryVersion)

‎generator/import_metadata.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ def export_to_file(path, content):
1515

1616
parser = ArgumentParser()
1717
parser.add_argument("-e", "--endpoint", dest="endpoint",
18-
help="Import metadata endpoint", default="microsoftgraph")
18+
help="Import metadata endpoint", default="sharepoint")
1919
parser.add_argument("-p", "--path",
20-
dest="path", default="./metadata/MicrosoftGraph.xml",
20+
dest="path", default="./metadata/SharePoint.xml",
2121
help="Import metadata endpoint")
2222

2323
args = parser.parse_args()

‎generator/metadata/MicrosoftGraph.xml

+44-30
Original file line numberDiff line numberDiff line change
@@ -22640,6 +22640,12 @@
2264022640
<Property Name="certificateUpdateResult" Type="Edm.String"/>
2264122641
<Property Name="lastRunDateTime" Type="Edm.DateTimeOffset"/>
2264222642
</ComplexType>
22643+
<ComplexType Name="tenantInformation">
22644+
<Property Name="defaultDomainName" Type="Edm.String"/>
22645+
<Property Name="displayName" Type="Edm.String"/>
22646+
<Property Name="federationBrandName" Type="Edm.String"/>
22647+
<Property Name="tenantId" Type="Edm.String" Nullable="false"/>
22648+
</ComplexType>
2264322649
<ComplexType Name="unifiedRolePermission">
2264422650
<Property Name="allowedResourceActions" Type="Collection(Edm.String)" Nullable="false"/>
2264522651
<Property Name="condition" Type="Edm.String"/>
@@ -23121,6 +23127,29 @@
2312123127
<Property Name="skuPartNumber" Type="Edm.String"/>
2312223128
<Property Name="subscriptionIds" Type="Collection(Edm.String)"/>
2312323129
</EntityType>
23130+
<EntityType Name="tenantRelationship">
23131+
<NavigationProperty Name="delegatedAdminCustomers" Type="Collection(graph.delegatedAdminCustomer)" ContainsTarget="true"/>
23132+
<NavigationProperty Name="delegatedAdminRelationships" Type="Collection(graph.delegatedAdminRelationship)" ContainsTarget="true"/>
23133+
</EntityType>
23134+
<EntityType Name="delegatedAdminCustomer" BaseType="graph.entity">
23135+
<Property Name="displayName" Type="Edm.String"/>
23136+
<Property Name="tenantId" Type="Edm.String" Nullable="false"/>
23137+
<NavigationProperty Name="serviceManagementDetails" Type="Collection(graph.delegatedAdminServiceManagementDetail)" ContainsTarget="true"/>
23138+
</EntityType>
23139+
<EntityType Name="delegatedAdminRelationship" BaseType="graph.entity">
23140+
<Property Name="accessDetails" Type="graph.delegatedAdminAccessDetails" Nullable="false"/>
23141+
<Property Name="activatedDateTime" Type="Edm.DateTimeOffset"/>
23142+
<Property Name="createdDateTime" Type="Edm.DateTimeOffset"/>
23143+
<Property Name="customer" Type="graph.delegatedAdminRelationshipCustomerParticipant"/>
23144+
<Property Name="displayName" Type="Edm.String" Nullable="false"/>
23145+
<Property Name="duration" Type="Edm.Duration" Nullable="false"/>
23146+
<Property Name="endDateTime" Type="Edm.DateTimeOffset"/>
23147+
<Property Name="lastModifiedDateTime" Type="Edm.DateTimeOffset"/>
23148+
<Property Name="status" Type="graph.delegatedAdminRelationshipStatus"/>
23149+
<NavigationProperty Name="accessAssignments" Type="Collection(graph.delegatedAdminAccessAssignment)" ContainsTarget="true"/>
23150+
<NavigationProperty Name="operations" Type="Collection(graph.delegatedAdminRelationshipOperation)" ContainsTarget="true"/>
23151+
<NavigationProperty Name="requests" Type="Collection(graph.delegatedAdminRelationshipRequest)" ContainsTarget="true"/>
23152+
</EntityType>
2312423153
<EntityType Name="unifiedRbacResourceAction" BaseType="graph.entity">
2312523154
<Property Name="actionVerb" Type="Edm.String"/>
2312623155
<Property Name="authenticationContextId" Type="Edm.String"/>
@@ -29188,29 +29217,10 @@
2918829217
<Property Name="lastModifiedDateTime" Type="Edm.DateTimeOffset"/>
2918929218
<Property Name="status" Type="graph.delegatedAdminAccessAssignmentStatus"/>
2919029219
</EntityType>
29191-
<EntityType Name="delegatedAdminCustomer" BaseType="graph.entity">
29192-
<Property Name="displayName" Type="Edm.String"/>
29193-
<Property Name="tenantId" Type="Edm.String" Nullable="false"/>
29194-
<NavigationProperty Name="serviceManagementDetails" Type="Collection(graph.delegatedAdminServiceManagementDetail)" ContainsTarget="true"/>
29195-
</EntityType>
2919629220
<EntityType Name="delegatedAdminServiceManagementDetail" BaseType="graph.entity">
2919729221
<Property Name="serviceManagementUrl" Type="Edm.String" Nullable="false"/>
2919829222
<Property Name="serviceName" Type="Edm.String" Nullable="false"/>
2919929223
</EntityType>
29200-
<EntityType Name="delegatedAdminRelationship" BaseType="graph.entity">
29201-
<Property Name="accessDetails" Type="graph.delegatedAdminAccessDetails" Nullable="false"/>
29202-
<Property Name="activatedDateTime" Type="Edm.DateTimeOffset"/>
29203-
<Property Name="createdDateTime" Type="Edm.DateTimeOffset"/>
29204-
<Property Name="customer" Type="graph.delegatedAdminRelationshipCustomerParticipant"/>
29205-
<Property Name="displayName" Type="Edm.String" Nullable="false"/>
29206-
<Property Name="duration" Type="Edm.Duration" Nullable="false"/>
29207-
<Property Name="endDateTime" Type="Edm.DateTimeOffset"/>
29208-
<Property Name="lastModifiedDateTime" Type="Edm.DateTimeOffset"/>
29209-
<Property Name="status" Type="graph.delegatedAdminRelationshipStatus"/>
29210-
<NavigationProperty Name="accessAssignments" Type="Collection(graph.delegatedAdminAccessAssignment)" ContainsTarget="true"/>
29211-
<NavigationProperty Name="operations" Type="Collection(graph.delegatedAdminRelationshipOperation)" ContainsTarget="true"/>
29212-
<NavigationProperty Name="requests" Type="Collection(graph.delegatedAdminRelationshipRequest)" ContainsTarget="true"/>
29213-
</EntityType>
2921429224
<EntityType Name="delegatedAdminRelationshipOperation" BaseType="graph.entity">
2921529225
<Property Name="createdDateTime" Type="Edm.DateTimeOffset" Nullable="false"/>
2921629226
<Property Name="data" Type="Edm.String" Nullable="false"/>
@@ -29224,10 +29234,6 @@
2922429234
<Property Name="lastModifiedDateTime" Type="Edm.DateTimeOffset"/>
2922529235
<Property Name="status" Type="graph.delegatedAdminRelationshipRequestStatus"/>
2922629236
</EntityType>
29227-
<EntityType Name="tenantRelationship">
29228-
<NavigationProperty Name="delegatedAdminCustomers" Type="Collection(graph.delegatedAdminCustomer)" ContainsTarget="true"/>
29229-
<NavigationProperty Name="delegatedAdminRelationships" Type="Collection(graph.delegatedAdminRelationship)" ContainsTarget="true"/>
29230-
</EntityType>
2923129237
<ComplexType Name="approvalSettings">
2923229238
<Property Name="approvalMode" Type="Edm.String"/>
2923329239
<Property Name="approvalStages" Type="Collection(graph.unifiedApprovalStage)"/>
@@ -31257,6 +31263,16 @@
3125731263
<Action Name="resetToSystemDefault" IsBound="true">
3125831264
<Parameter Name="bindingParameter" Type="graph.crossTenantAccessPolicyConfigurationDefault" Nullable="false"/>
3125931265
</Action>
31266+
<Function Name="findTenantInformationByDomainName" IsBound="true">
31267+
<Parameter Name="bindingParameter" Type="graph.tenantRelationship" Nullable="false"/>
31268+
<Parameter Name="domainName" Type="Edm.String" Unicode="false"/>
31269+
<ReturnType Type="graph.tenantInformation"/>
31270+
</Function>
31271+
<Function Name="findTenantInformationByTenantId" IsBound="true">
31272+
<Parameter Name="bindingParameter" Type="graph.tenantRelationship" Nullable="false"/>
31273+
<Parameter Name="tenantId" Type="Edm.String" Unicode="false"/>
31274+
<ReturnType Type="graph.tenantInformation"/>
31275+
</Function>
3126031276
<Action Name="setUpFeedbackResourcesFolder" IsBound="true">
3126131277
<Parameter Name="bindingParameter" Type="graph.educationAssignment"/>
3126231278
<ReturnType Type="graph.educationAssignment"/>
@@ -34283,6 +34299,9 @@
3428334299
<Parameter Name="clientContext" Type="Edm.String" Unicode="false"/>
3428434300
<ReturnType Type="graph.inviteParticipantsOperation"/>
3428534301
</Action>
34302+
<Action Name="permanentDelete" IsBound="true">
34303+
<Parameter Name="bindingParameter" Type="graph.driveItem"/>
34304+
</Action>
3428634305
<Action Name="preview" IsBound="true">
3428734306
<Parameter Name="bindingParameter" Type="graph.driveItem"/>
3428834307
<Parameter Name="page" Type="Edm.String" Unicode="false"/>
@@ -36066,12 +36085,7 @@
3606636085
<EntitySet Name="places" EntityType="microsoft.graph.place"/>
3606736086
<EntitySet Name="drives" EntityType="microsoft.graph.drive"/>
3606836087
<EntitySet Name="shares" EntityType="microsoft.graph.sharedDriveItem"/>
36069-
<EntitySet Name="sites" EntityType="microsoft.graph.site">
36070-
<NavigationPropertyBinding Path="sites/contentTypes/columns/term/parentTerm" Target="sites/microsoft.graph.termStore.set/termStore/sets/terms"/>
36071-
<NavigationPropertyBinding Path="sites/contentTypes/columns/term/termSet" Target="sites/microsoft.graph.termStore.store/termStore/sets"/>
36072-
<NavigationPropertyBinding Path="sites/contentTypes/documentSet/sharedColumns" Target="sites/microsoft.graph.contentType/contentTypes/columns"/>
36073-
<NavigationPropertyBinding Path="sites/contentTypes/documentSet/welcomePageColumns" Target="sites/microsoft.graph.contentType/contentTypes/columns"/>
36074-
</EntitySet>
36088+
<EntitySet Name="sites" EntityType="microsoft.graph.site"/>
3607536089
<EntitySet Name="schemaExtensions" EntityType="microsoft.graph.schemaExtension"/>
3607636090
<EntitySet Name="groupLifecyclePolicies" EntityType="microsoft.graph.groupLifecyclePolicy"/>
3607736091
<EntitySet Name="filterOperators" EntityType="microsoft.graph.filterOperatorSchema"/>
@@ -36110,6 +36124,7 @@
3611036124
<NavigationPropertyBinding Path="transitiveMemberOf" Target="directoryObjects"/>
3611136125
</Singleton>
3611236126
<Singleton Name="policies" Type="microsoft.graph.policyRoot"/>
36127+
<Singleton Name="tenantRelationships" Type="microsoft.graph.tenantRelationship"/>
3611336128
<Singleton Name="admin" Type="microsoft.graph.admin"/>
3611436129
<Singleton Name="education" Type="microsoft.graph.educationRoot">
3611536130
<NavigationPropertyBinding Path="classes/group" Target="directoryObjects"/>
@@ -36140,7 +36155,6 @@
3614036155
<NavigationPropertyBinding Path="plans/buckets" Target="planner/buckets"/>
3614136156
<NavigationPropertyBinding Path="plans/tasks" Target="planner/tasks"/>
3614236157
</Singleton>
36143-
<Singleton Name="tenantRelationships" Type="microsoft.graph.tenantRelationship"/>
3614436158
<Singleton Name="print" Type="microsoft.graph.print"/>
3614536159
<Singleton Name="external" Type="microsoft.graph.externalConnectors.external"/>
3614636160
<Singleton Name="appCatalogs" Type="microsoft.graph.appCatalogs"/>

0 commit comments

Comments
 (0)