Added implementation for late bound properties

timayabi2020 · timayabi2020 · commit 10b303389e38 · 2025-04-29T14:13:11.000+03:00
diff --git a/config/ModuleMetadata.json b/config/ModuleMetadata.json
@@ -27,15 +27,15 @@
   "versions": {
     "authentication": {
       "prerelease": "",
-      "version": "2.27.0"
+      "version": "2.27.1"
     },
     "beta": {
       "prerelease": "",
-      "version": "2.27.0"
+      "version": "2.27.1"
     },
     "v1.0": {
       "prerelease": "",
-      "version": "2.27.0"
+      "version": "2.27.1"
     }
   }
 }
diff --git a/config/ModulesMapping.jsonc b/config/ModulesMapping.jsonc
@@ -1,44 +1,44 @@
  {
   "Applications": "^applicationTemplates\\.|^applications\\.|^servicePrincipals\\.|^onPremisesPublishingProfiles\\.|^users.appRoleAssignment$|^groups.appRoleAssignment$",
-  "Bookings": "^bookingBusinesses\\.|^bookingCurrencies\\.|^solutions.booking.*.Actions$|^solutions.bookingBusiness$|^solutions.bookingCurrency$|^solutions.virtualEventsRoot$|^solutions.booking.*.Functions$|^solutions.solutionsRoot$",
-  "BusinessScenario": "^solutions.businessScenario$|^solutions.BusinessScenario.*.Actions$|^solutions.BusinessScenario.*.Functions$",
-  "BackupRestore": "^solutions.backupRestoreRoot$|^solutions.backupRestore.*.Actions$|^solutions.backupRestore.*.Functions$",
-  "Calendar": "^places\\.|^users.calendar$|^users.calendarGroup$|^users.event$|^groups.calendar$|^groups.event$",
-  "ChangeNotifications": "^subscriptions\\.",
-  "CloudCommunications": "^users.onlineMeeting$|^users.presence$|^communications\\.",
-  "Compliance": "^compliance\\.|^privacy.subjectRightsRequest$",
-  "CrossDeviceExperiences": "^users.userActivity$|^users.device$",
-  "Devices.CloudPrint": "^print\\.",
-  "Devices.CorporateManagement": "^deviceAppManagement\\.|^officeConfiguration\\.|^users.mobileAppIntentAndState$|^users.mobileAppTroubleshootingEvent$|^users.windowsInformationProtectionDeviceRegistration$|^users.managedAppRegistration$|^users.managedDevice$|^users.deviceManagementTroubleshootingEvent$|^users.deviceEnrollmentConfiguration$",
-  "Devices.ServiceAnnouncement": "^admin.serviceAnnouncement$|^admin.*.Actions$|^admin.*.Functions$",
-  "DeviceManagement": "^deviceManagement.(deviceCompliancePolicy.*|deviceManagementConfigurationPolicy.*|deviceManagementCompliancePolicy.*|deviceManagementConfigurationSettingDefinition.*|deviceConfiguration.*|managedDevice.*|managementCondition.*|microsoftTunnel.*|windowsInformationProtection.*|deviceManagement|deviceManagement(DerivedCredentialSettings|Intent|ResourceAccessProfileBase|Script|SettingCategory|SettingDefinition|Template|TroubleshootingEvent)|androidForWork(AppConfigurationSchema|Settings)|androidManagedStore(AccountEnterpriseSettings|AppConfigurationSchema)|deviceAndAppManagementAssignmentFilter|deviceCategory|advancedThreatProtectionOnboardingStateSummary|dataSharingConsent|detectedApp|deviceHealthScript|deviceShellScript|embeddedSIMActivationCodePool|groupPolicyConfiguration|macOSSoftwareUpdateAccountSummary|mobileAppTroubleshootingEvent|notificationMessageTemplate|remoteActionAudit|softwareUpdateStatusSummary|windowsMalwareInformation|windowsQualityUpdateProfile)$|^admin.edge$|^deviceManagement.monitoring$|^users.ListCloudPCs$",
-  "DeviceManagement.Administration": "^deviceManagement.(virtualEndpoint.*|.*Partner.*|.*Certificate.*|.*role.*|deviceManagement(DomainJoinConnector|ExchangeConnector|ExchangeOnPremisesPolicy)|groupPolicy(Category|Definition|DefinitionFile|MigrationReport|ObjectFile|UploadedDefinitionFile)|auditEvent|cartToClassAssociation|comanagementEligibleDevice|deviceAndAppManagementRoleAssignment|intuneBrandingProfile|iosUpdateDeviceStatus|mobileThreatDefenseConnector|ndesConnector|resourceOperation|restrictedAppsViolation|termsAndConditions)",
-  "DeviceManagement.Enrollment": "^deviceManagement.(.*Enrollment.*|.*Autopilot.*|.*depOnboarding.*|importedDeviceIdentity|onPremisesConditionalAccessSettings|windowsFeatureUpdateProfile)$|^roleManagement.roleManagement$|^roleManagement.rbacApplicationMultiple$|^roleManagement.unifiedRbacApplication$",
-  "DeviceManagement.Functions": "^deviceManagement.*.Functions$",
-  "DirectoryObjects": "^directoryObjects\\.|^directory.publicKeyInfrastructureRoot$",
-  "Education": "^education\\.",
-  "Files": "^drives\\.|^shares\\.|^users.drive$|^groups.drive$",
-  "Financials": "^financials\\.",
-  "Groups": "^groups.group$|^groups.directoryObject$|^groups.conversation$|^groups.endpoint$|^groups.extension$|^groups.groupLifecyclePolicy$|^groups.resourceSpecificPermissionGrant$|^groups.profilePhoto$|^groups.conversationThread$|^groupLifecyclePolicies\\.|^users.group$|^groups.directorySetting$|^groups.*.Actions$|^groups.*.Functions$|^groupSettings\\.|^groups.groupSetting$|^groupSettingTemplates\\.",
-  "Identity.DirectoryManagement": "^administrativeUnits\\.|^contacts\\.|^devices\\.|^domains\\.|^directoryRoles\\.|^directoryRoleTemplates\\.|^directorySettingTemplates\\.|^settings\\.|^subscribedSkus\\.|^contracts\\.|^directory\\.|^users.scopedRoleMembership$|^organization.organization$|^organization.organizationalBranding$|^organization.organizationSettings$|^organization.*.Actions$|^organization.extension$|^tenantRelationships.*.Actions$|^tenantRelationships.*.Functions$|admin.peopleAdminSettings$|^organization\\.partnerInformation$",
- "Identity.Governance": "^accessReviews\\.|^businessFlowTemplates\\.|^programs\\.|^programControls\\.|^programControlTypes\\.|^privilegedRoles\\.|^privilegedRoleAssignments\\.|^privilegedRoleAssignmentRequests\\.|^privilegedApproval\\.|^privilegedOperationEvents\\.|^privilegedAccess\\.|^agreements\\.|^users.agreementAcceptance$|^identityGovernance\\.|^roleManagement.rbacApplication$|^roleManagement.*.Functions$|roleManagement.*.Actions$",
+//   "Bookings": "^bookingBusinesses\\.|^bookingCurrencies\\.|^solutions.booking.*.Actions$|^solutions.bookingBusiness$|^solutions.bookingCurrency$|^solutions.virtualEventsRoot$|^solutions.booking.*.Functions$|^solutions.solutionsRoot$",
+//   "BusinessScenario": "^solutions.businessScenario$|^solutions.BusinessScenario.*.Actions$|^solutions.BusinessScenario.*.Functions$",
+//   "BackupRestore": "^solutions.backupRestoreRoot$|^solutions.backupRestore.*.Actions$|^solutions.backupRestore.*.Functions$",
+//   "Calendar": "^places\\.|^users.calendar$|^users.calendarGroup$|^users.event$|^groups.calendar$|^groups.event$",
+//   "ChangeNotifications": "^subscriptions\\.",
+//   "CloudCommunications": "^users.onlineMeeting$|^users.presence$|^communications\\.",
+//   "Compliance": "^compliance\\.|^privacy.subjectRightsRequest$",
+//   "CrossDeviceExperiences": "^users.userActivity$|^users.device$",
+//   "Devices.CloudPrint": "^print\\.",
+//   "Devices.CorporateManagement": "^deviceAppManagement\\.|^officeConfiguration\\.|^users.mobileAppIntentAndState$|^users.mobileAppTroubleshootingEvent$|^users.windowsInformationProtectionDeviceRegistration$|^users.managedAppRegistration$|^users.managedDevice$|^users.deviceManagementTroubleshootingEvent$|^users.deviceEnrollmentConfiguration$",
+//   "Devices.ServiceAnnouncement": "^admin.serviceAnnouncement$|^admin.*.Actions$|^admin.*.Functions$",
+//   "DeviceManagement": "^deviceManagement.(deviceCompliancePolicy.*|deviceManagementConfigurationPolicy.*|deviceManagementCompliancePolicy.*|deviceManagementConfigurationSettingDefinition.*|deviceConfiguration.*|managedDevice.*|managementCondition.*|microsoftTunnel.*|windowsInformationProtection.*|deviceManagement|deviceManagement(DerivedCredentialSettings|Intent|ResourceAccessProfileBase|Script|SettingCategory|SettingDefinition|Template|TroubleshootingEvent)|androidForWork(AppConfigurationSchema|Settings)|androidManagedStore(AccountEnterpriseSettings|AppConfigurationSchema)|deviceAndAppManagementAssignmentFilter|deviceCategory|advancedThreatProtectionOnboardingStateSummary|dataSharingConsent|detectedApp|deviceHealthScript|deviceShellScript|embeddedSIMActivationCodePool|groupPolicyConfiguration|macOSSoftwareUpdateAccountSummary|mobileAppTroubleshootingEvent|notificationMessageTemplate|remoteActionAudit|softwareUpdateStatusSummary|windowsMalwareInformation|windowsQualityUpdateProfile)$|^admin.edge$|^deviceManagement.monitoring$|^users.ListCloudPCs$",
+//   "DeviceManagement.Administration": "^deviceManagement.(virtualEndpoint.*|.*Partner.*|.*Certificate.*|.*role.*|deviceManagement(DomainJoinConnector|ExchangeConnector|ExchangeOnPremisesPolicy)|groupPolicy(Category|Definition|DefinitionFile|MigrationReport|ObjectFile|UploadedDefinitionFile)|auditEvent|cartToClassAssociation|comanagementEligibleDevice|deviceAndAppManagementRoleAssignment|intuneBrandingProfile|iosUpdateDeviceStatus|mobileThreatDefenseConnector|ndesConnector|resourceOperation|restrictedAppsViolation|termsAndConditions)",
+//   "DeviceManagement.Enrollment": "^deviceManagement.(.*Enrollment.*|.*Autopilot.*|.*depOnboarding.*|importedDeviceIdentity|onPremisesConditionalAccessSettings|windowsFeatureUpdateProfile)$|^roleManagement.roleManagement$|^roleManagement.rbacApplicationMultiple$|^roleManagement.unifiedRbacApplication$",
+//   "DeviceManagement.Functions": "^deviceManagement.*.Functions$",
+//   "DirectoryObjects": "^directoryObjects\\.|^directory.publicKeyInfrastructureRoot$",
+//   "Education": "^education\\.",
+//   "Files": "^drives\\.|^shares\\.|^users.drive$|^groups.drive$",
+//   "Financials": "^financials\\.",
+//   "Groups": "^groups.group$|^groups.directoryObject$|^groups.conversation$|^groups.endpoint$|^groups.extension$|^groups.groupLifecyclePolicy$|^groups.resourceSpecificPermissionGrant$|^groups.profilePhoto$|^groups.conversationThread$|^groupLifecyclePolicies\\.|^users.group$|^groups.directorySetting$|^groups.*.Actions$|^groups.*.Functions$|^groupSettings\\.|^groups.groupSetting$|^groupSettingTemplates\\.",
+//   "Identity.DirectoryManagement": "^administrativeUnits\\.|^contacts\\.|^devices\\.|^domains\\.|^directoryRoles\\.|^directoryRoleTemplates\\.|^directorySettingTemplates\\.|^settings\\.|^subscribedSkus\\.|^contracts\\.|^directory\\.|^users.scopedRoleMembership$|^organization.organization$|^organization.organizationalBranding$|^organization.organizationSettings$|^organization.*.Actions$|^organization.extension$|^tenantRelationships.*.Actions$|^tenantRelationships.*.Functions$|admin.peopleAdminSettings$|^organization\\.partnerInformation$",
+//  "Identity.Governance": "^accessReviews\\.|^businessFlowTemplates\\.|^programs\\.|^programControls\\.|^programControlTypes\\.|^privilegedRoles\\.|^privilegedRoleAssignments\\.|^privilegedRoleAssignmentRequests\\.|^privilegedApproval\\.|^privilegedOperationEvents\\.|^privilegedAccess\\.|^agreements\\.|^users.agreementAcceptance$|^identityGovernance\\.|^roleManagement.rbacApplication$|^roleManagement.*.Functions$|roleManagement.*.Actions$",
   "Identity.SignIns": "^organization.certificateBasedAuthConfiguration$|^invitations\\.|^identityProviders\\.|^oauth2PermissionGrants\\.|^identityProtection\\.|^dataPolicyOperations\\.|^identity\\.|^trustFramework\\.|^informationProtection\\.|^policies\\.|^users.authentication$|^users.informationProtection$|^tenantRelationships.multiTenantOrganization$|^policies.deviceRegistrationPolicy$|^policies.deviceRegistrationPolicy$",
-  "Identity.Partner": "^tenantRelationships.delegatedAdminRelationship$|^tenantRelationships.delegatedAdminCustomer$",
-  "Mail": "^users.inferenceClassification$|^users.mailFolder$|^users.message$",
-  "ManagedTenants": "^tenantRelationships.managedTenant$",
-  "NetworkAccess": "^networkAccess\\.",
-  "Notes": "^users.onenote$|^groups.onenote$|^sites.onenote$",
-  "People": "^users.person$|^users.profile$|^users.officeGraphInsights$|^users.userAnalytics$",
-  "PersonalContacts": "^users.contactFolder$|^users.contact$",
-  "Planner": "^planner\\.|^users.plannerUser$|^groups.plannerGroup$",
-  "Reports": "^reports\\.|^auditLogs\\.|^deviceManagement.deviceManagementReports$|^admin.adminReportSetting",
-  "SchemaExtensions": "^schemaExtensions\\.",
-  "Search": "^search\\.|^external\\.",
-  "Security": "^security\\.|^users.security$",
-  "Sites": "^sites.baseSitePage$|^sites.site$|^sites.itemAnalytics$|^sites.columnDefinition$|^sites.contentType$|^sites.drive$|^sites.list$|^sites.sitePage$|^sites.permission$|^sites.store$|^users.site$|^groups.site$|^sites.*.Functions$|^sites.*.Actions$|^sites.richLongRunningOperation$|^termStore.sets.ListChildren$|^admin.sharepoint$",
-  "Teams": "^teams\\.|^chats\\.|^users.chat$|^appCatalogs.teamsApp$|^users.userTeamwork$|^teamwork\\.|^users.team$|^groups.team$",
+//   "Identity.Partner": "^tenantRelationships.delegatedAdminRelationship$|^tenantRelationships.delegatedAdminCustomer$",
+//   "Mail": "^users.inferenceClassification$|^users.mailFolder$|^users.message$",
+//   "ManagedTenants": "^tenantRelationships.managedTenant$",
+//   "NetworkAccess": "^networkAccess\\.",
+//   "Notes": "^users.onenote$|^groups.onenote$|^sites.onenote$",
+//   "People": "^users.person$|^users.profile$|^users.officeGraphInsights$|^users.userAnalytics$",
+//   "PersonalContacts": "^users.contactFolder$|^users.contact$",
+//   "Planner": "^planner\\.|^users.plannerUser$|^groups.plannerGroup$",
+//   "Reports": "^reports\\.|^auditLogs\\.|^deviceManagement.deviceManagementReports$|^admin.adminReportSetting",
+//   "SchemaExtensions": "^schemaExtensions\\.",
+//   "Search": "^search\\.|^external\\.",
+//   "Security": "^security\\.|^users.security$",
+//   "Sites": "^sites.baseSitePage$|^sites.site$|^sites.itemAnalytics$|^sites.columnDefinition$|^sites.contentType$|^sites.drive$|^sites.list$|^sites.sitePage$|^sites.permission$|^sites.store$|^users.site$|^groups.site$|^sites.*.Functions$|^sites.*.Actions$|^sites.richLongRunningOperation$|^termStore.sets.ListChildren$|^admin.sharepoint$",
+//   "Teams": "^teams\\.|^chats\\.|^users.chat$|^appCatalogs.teamsApp$|^users.userTeamwork$|^teamwork\\.|^users.team$|^groups.team$",
   "Users": "^users.user$|^users.directoryObject$|^users.licenseDetails$|^users.mailboxSettings|^users.notification$|^users.outlookUser$|^users.profilePhoto$|^users.userSettings$|^users.extension$|^users.oAuth2PermissionGrant$|^users.todo$|^users.itemInsights$|^users.servicePrincipal$",
   "Users.Actions": "^users.*.Actions$",
-  "Users.Functions": "^users.*.Functions$",
-  "WindowsUpdates": "^admin.adminWindows$"
+//   "Users.Functions": "^users.*.Functions$",
+//   "WindowsUpdates": "^admin.adminWindows$"
  }
diff --git a/src/readme.graph.md b/src/readme.graph.md
@@ -495,6 +495,9 @@ directive:
             }
            });
         }
+
+        $ = $.replace(/await this\.Client\.(\w+)\(\s*Headers\s*,\s*([^,\s]+)[^;]+;/g,'await Microsoft.Graph.PowerShell.ModelExtensions.ModelExtensions.EnsurePropertiesAreReady($2,failOnExplicitNulls: false);\nawait this.Client.$1(Headers, $2, on2Xx, onDefault, this, Pipeline);')
+    
         
         return $;
       }
diff --git a/tools/Custom/ModelExtensions.cs b/tools/Custom/ModelExtensions.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using NamespacePrefixPlaceholder.PowerShell.Runtime;
+
+namespace NamespacePrefixPlaceholder.PowerShell.ModelExtensions
+{
+    public static class ModelExtensions
+    {
+        /// <summary>
+        /// Ensures that all properties marked as set on the model have meaningful values.
+        /// </summary>
+        /// <param name="model">The model object (must implement IsPropertySet(string)).</param>
+        /// <param name="failOnExplicitNulls">If true, properties explicitly set to null will be considered invalid (strict mode).</param>
+        /// <param name="retries">Number of retries for late-bound properties.</param>
+        /// <param name="delayMs">Delay (ms) between retries.</param>
+        public static async Task EnsurePropertiesAreReady(
+            this object model,
+            bool failOnExplicitNulls = false,
+            int retries = 3,
+            int delayMs = 100)
+        {
+            if (model == null)
+                throw new ArgumentNullException(nameof(model));
+
+            // Ensure the model supports IsPropertySet(string)
+            var isPropertySetMethod = model.GetType().GetMethod("IsPropertySet", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+            if (isPropertySetMethod == null)
+                throw new InvalidOperationException($"{model.GetType().Name} does not implement IsPropertySet(string)");
+
+            var props = model.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public);
+
+            for (int attempt = 0; attempt <= retries; attempt++)
+            {
+                var unready = props
+                    .Where(p => IsUnready(model, p, isPropertySetMethod, failOnExplicitNulls))
+                    .ToList();
+
+                if (!unready.Any())
+                    return; // Ready!
+
+                if (attempt < retries)
+                    await Task.Delay(delayMs);
+            }
+
+            // Final check before throwing
+            var stillUnready = props
+                .Where(p => IsUnready(model, p, isPropertySetMethod, failOnExplicitNulls))
+                .Select(p => p.Name)
+                .ToList();
+
+            if (stillUnready.Any())
+            {
+                throw new InvalidOperationException(
+                    $"Model '{model.GetType().Name}' has properties marked as set but not initialized properly: {string.Join(", ", stillUnready)}"
+                );
+            }
+        }
+
+        private static bool IsUnready(object model, PropertyInfo prop, MethodInfo isPropertySetMethod, bool failOnExplicitNulls)
+        {
+            bool isSet = (bool)isPropertySetMethod.Invoke(model, new object[] { prop.Name });
+            if (!isSet) return false; // not marked as set, skip
+
+            object value = prop.GetValue(model);
+
+            if (value == null)
+                return failOnExplicitNulls; // null is OK in relaxed mode, fail in strict
+
+            return IsDefault(value);
+        }
+
+        private static bool IsDefault(object value)
+        {
+            Type type = value.GetType();
+            if (!type.IsValueType) return false;
+            object defaultValue = Activator.CreateInstance(type);
+            return value.Equals(defaultValue);
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -27,15 +27,15 @@`
`27`	`27`	`"versions": {`
`28`	`28`	`"authentication": {`
`29`	`29`	`"prerelease": "",`
`30`		`- "version": "2.27.0"`
	`30`	`+ "version": "2.27.1"`
`31`	`31`	`},`
`32`	`32`	`"beta": {`
`33`	`33`	`"prerelease": "",`
`34`		`- "version": "2.27.0"`
	`34`	`+ "version": "2.27.1"`
`35`	`35`	`},`
`36`	`36`	`"v1.0": {`
`37`	`37`	`"prerelease": "",`
`38`		`- "version": "2.27.0"`
	`38`	`+ "version": "2.27.1"`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -495,6 +495,9 @@ directive:`
`495`	`495`	`}`
`496`	`496`	`});`
`497`	`497`	`}`
	`498`	`+`
	`499`	`+ $ = $.replace(/await this\.Client\.(\w+)\(\sHeaders\s,\s*([^,\s]+)[^;]+;/g,'await Microsoft.Graph.PowerShell.ModelExtensions.ModelExtensions.EnsurePropertiesAreReady($2,failOnExplicitNulls: false);\nawait this.Client.$1(Headers, $2, on2Xx, onDefault, this, Pipeline);')`
	`500`	`+`
`498`	`501`
`499`	`502`	`return $;`
`500`	`503`	`}`