From 4cc761ca2b30dccac240585aa8af8d5716f39489 Mon Sep 17 00:00:00 2001 From: Mike Poulson Date: Tue, 5 Nov 2024 22:43:30 -0800 Subject: [PATCH] Update Odata refrences to Graph.microsoft.com Fixes #5342 --- CHANGELOG.md | 4 ++++ .../MSFT_AADApplication/MSFT_AADApplication.psm1 | 4 ++-- .../MSFT_AADEntitlementManagementAccessPackage.psm1 | 8 ++++---- ...SFT_AADEntitlementManagementConnectedOrganization.psm1 | 8 ++++---- .../MSFT_AADServicePrincipal.psm1 | 4 ++-- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 640d606d4e..c0f6664a94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -204,6 +204,10 @@ AADAuthenticationMethodPolicyExternal, AADEnrichedAuditLogs FIXES [#5340](https://github.com/microsoft/Microsoft365DSC/issues/5340) IntuneDeviceManagementEnrollmentAndroidGooglePlay, IntuneAppleMDMPushNotificationCertificate + * Fixes static OData refrences to graph.microsoft.com + AADApplication, AADEntitlementManagementAccessPackage, AADEntitlementManagementConnectedOrganization + AADServicePrincipal + FIXES [#5342] (https://github.com/microsoft/Microsoft365DSC/issues/534) * DEPENDENCIES * Updated Microsoft.Graph to version 2.24.0. * Updated Microsoft.PowerApps.Administration.PowerShell to version 2.0.199. diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.psm1 index 246e7fc2b4..75b7e9a62a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.psm1 @@ -925,7 +925,7 @@ function Set-TargetResource { $Type = 'directoryObjects' } - $ObjectUri = 'https://graph.microsoft.com/v1.0/{0}/{1}' -f $Type, $diff.InputObject + $ObjectUri = $Global:MSCloudLoginConnectionProfile.MicrosoftGraph.ResourceUrl + 'v1.0/{0}/{1}' -f $Type, $diff.InputObject $ownerObject = @{ '@odata.id' = $ObjectUri } @@ -1136,7 +1136,7 @@ function Set-TargetResource $onPremisesPublishingValue.Add('singleSignOnSettings', $singleSignOnValues) $onPremisesPayload = ConvertTo-Json $onPremisesPublishingValue -Depth 10 -Compress Write-Verbose -Message "Updating the OnPremisesPublishing settings for application {$($currentAADApp.DisplayName)} with payload: $onPremisesPayload" - + $Uri = $Global:MSCloudLoginConnectionProfile.MicrosoftGraph.ResourceUrl + "beta/applications/$($currentAADApp.Id)/onPremisesPublishing" Invoke-MgGraphRequest -Method 'PATCH' ` -Uri $Uri ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackage/MSFT_AADEntitlementManagementAccessPackage.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackage/MSFT_AADEntitlementManagementAccessPackage.psm1 index 96b4b6e29d..7f6b0dc6de 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackage/MSFT_AADEntitlementManagementAccessPackage.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackage/MSFT_AADEntitlementManagementAccessPackage.psm1 @@ -355,7 +355,7 @@ function Set-TargetResource foreach ($incompatibleAccessPackage in $IncompatibleAccessPackages) { $ref = @{ - '@odata.id' = "https://graph.microsoft.com/beta/identityGovernance/entitlementManagement/accessPackages/$incompatibleAccessPackage" + '@odata.id' = $Global:MSCloudLoginConnectionProfile.MicrosoftGraph.ResourceUrl + "beta/identityGovernance/entitlementManagement/accessPackages/$incompatibleAccessPackage" } New-MgBetaEntitlementManagementAccessPackageIncompatibleAccessPackageByRef ` @@ -368,7 +368,7 @@ function Set-TargetResource foreach ($IncompatibleGroup in $IncompatibleGroups) { $ref = @{ - '@odata.id' = "https://graph.microsoft.com/beta/groups/$IncompatibleGroup" + '@odata.id' = $Global:MSCloudLoginConnectionProfile.MicrosoftGraph.ResourceUrl + "beta/groups/$IncompatibleGroup" } New-MgBetaEntitlementManagementAccessPackageIncompatibleGroupByRef ` @@ -485,7 +485,7 @@ function Set-TargetResource foreach ($incompatibleAccessPackage in $toBeAdded.InputObject) { $ref = @{ - '@odata.id' = "https://graph.microsoft.com/beta/identityGovernance/entitlementManagement/accessPackages/$incompatibleAccessPackage" + '@odata.id' = $Global:MSCloudLoginConnectionProfile.MicrosoftGraph.ResourceUrl + "beta/identityGovernance/entitlementManagement/accessPackages/$incompatibleAccessPackage" } New-MgBetaEntitlementManagementAccessPackageIncompatibleAccessPackageByRef ` @@ -522,7 +522,7 @@ function Set-TargetResource { $ref = @{ - '@odata.id' = "https://graph.microsoft.com/beta/groups/$incompatibleGroup" + '@odata.id' = $Global:MSCloudLoginConnectionProfile.MicrosoftGraph.ResourceUrl + "beta/groups/$incompatibleGroup" } New-MgBetaEntitlementManagementAccessPackageIncompatibleGroupByRef ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementConnectedOrganization/MSFT_AADEntitlementManagementConnectedOrganization.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementConnectedOrganization/MSFT_AADEntitlementManagementConnectedOrganization.psm1 index 3927d922f8..1c0587dc95 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementConnectedOrganization/MSFT_AADEntitlementManagementConnectedOrganization.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementConnectedOrganization/MSFT_AADEntitlementManagementConnectedOrganization.psm1 @@ -446,7 +446,7 @@ function Set-TargetResource $directoryObjectType=$directoryObject.AdditionalProperties."@odata.type" $directoryObjectType=($directoryObject.AdditionalProperties."@odata.type").split(".")|select-object -last 1 $directoryObjectRef=@{ - "@odata.id" = "https://graph.microsoft.com/beta/$($directoryObjectType)s/$($sponsor)" + "@odata.id" = $Global:MSCloudLoginConnectionProfile.MicrosoftGraph.ResourceUrl + "beta/$($directoryObjectType)s/$($sponsor)" } New-MgBetaEntitlementManagementConnectedOrganizationExternalSponsorByRef ` @@ -459,7 +459,7 @@ function Set-TargetResource $directoryObject = Get-MgBetaDirectoryObject -DirectoryObjectId $sponsor $directoryObjectType=($directoryObject.AdditionalProperties."@odata.type").split(".")|select-object -last 1 $directoryObjectRef=@{ - "@odata.id" = "https://graph.microsoft.com/beta/$($directoryObjectType)s/$($sponsor)" + "@odata.id" = $Global:MSCloudLoginConnectionProfile.MicrosoftGraph.ResourceUrl + "beta/$($directoryObjectType)s/$($sponsor)" } New-MgBetaEntitlementManagementConnectedOrganizationInternalSponsorByRef ` @@ -515,7 +515,7 @@ function Set-TargetResource $directoryObjectType=$directoryObject.AdditionalProperties."@odata.type" $directoryObjectType=($directoryObject.AdditionalProperties."@odata.type").split(".")|select-object -last 1 $directoryObjectRef=@{ - "@odata.id" = "https://graph.microsoft.com/beta/$($directoryObjectType)s/$($sponsor)" + "@odata.id" = $Global:MSCloudLoginConnectionProfile.MicrosoftGraph.ResourceUrl + "beta/$($directoryObjectType)s/$($sponsor)" } New-MgBetaEntitlementManagementConnectedOrganizationExternalSponsorByRef ` @@ -553,7 +553,7 @@ function Set-TargetResource $directoryObjectType=$directoryObject.AdditionalProperties."@odata.type" $directoryObjectType=($directoryObject.AdditionalProperties."@odata.type").split(".")|select-object -last 1 $directoryObjectRef=@{ - "@odata.id" = "https://graph.microsoft.com/beta/$($directoryObjectType)s/$($sponsor)" + "@odata.id" = $Global:MSCloudLoginConnectionProfile.MicrosoftGraph.ResourceUrl + "beta/$($directoryObjectType)s/$($sponsor)" } New-MgBetaEntitlementManagementConnectedOrganizationInternalSponsorByRef ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADServicePrincipal/MSFT_AADServicePrincipal.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADServicePrincipal/MSFT_AADServicePrincipal.psm1 index 089bac9b4b..e4ee61d42f 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADServicePrincipal/MSFT_AADServicePrincipal.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADServicePrincipal/MSFT_AADServicePrincipal.psm1 @@ -548,7 +548,7 @@ function Set-TargetResource { $userInfo = Get-MgUser -UserId $owner $body = @{ - '@odata.id' = "https://graph.microsoft.com/v1.0/directoryObjects/$($userInfo.Id)" + '@odata.id' = $Global:MSCloudLoginConnectionProfile.MicrosoftGraph.ResourceUrl + "v1.0/directoryObjects/$($userInfo.Id)" } Write-Verbose -Message "Adding new owner {$owner}" $newOwner = New-MgServicePrincipalOwnerByRef -ServicePrincipalId $newSP.Id -BodyParameter $body @@ -701,7 +701,7 @@ function Set-TargetResource if ($diff.SideIndicator -eq '=>') { $body = @{ - '@odata.id' = "https://graph.microsoft.com/v1.0/directoryObjects/$($userInfo.Id)" + '@odata.id' = $Global:MSCloudLoginConnectionProfile.MicrosoftGraph.ResourceUrl + "v1.0/directoryObjects/$($userInfo.Id)" } Write-Verbose -Message "Adding owner {$($userInfo.Id)}" New-MgServicePrincipalOwnerByRef -ServicePrincipalId $currentAADServicePrincipal.ObjectId `