fix(intune): preserve @odata.type on synced App Protection templates

Templates synced from a gold tenant fetch App Protection policies via
their concrete type URL (e.g. androidManagedAppProtections('id')), and
Graph omits @odata.type from those responses. The stored RAWJson then
lacks @odata.type, so Set-CIPPIntunePolicy built the deploy URL as
deviceAppManagement/s and Graph returned "Resource not found for the
segment 's'.". Re-add @odata.type from the known ODataType when Graph
omits it, and fail with a clear error on deploy when a stored template
still has no @odata.type.

Author: Zacgoose

Modules/CIPPCore/Public/New-CIPPIntuneTemplate.ps1

@@ -47,6 +47,11 @@ function New-CIPPIntuneTemplate {
                 default { 'managedAppPolicies' }
             }
             $Template = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/deviceAppManagement/$($AppProtectionUrl)('$($ID)')" -tenantid $TenantFilter
+            if ($ODataType -and !$Template.'@odata.type') {
+                # Graph omits @odata.type when an entity is fetched via its concrete type URL, but Set-CIPPIntunePolicy derives the deploy URL from it
+                if ($ODataType -notmatch '^#') { $ODataType = "#$ODataType" }
+                $null = $Template | Add-Member -MemberType NoteProperty -Name '@odata.type' -Value $ODataType -Force
+            }
             $DisplayName = $Template.displayName
             $TemplateJson = ConvertTo-Json -InputObject $Template -Depth 100 -Compress
         }

Modules/CIPPCore/Public/Set-CIPPIntunePolicy.ps1

@@ -27,6 +27,9 @@ function Set-CIPPIntunePolicy {
             'AppProtection' {
                 $PlatformType = 'deviceAppManagement'
                 $TemplateType = ($RawJSON | ConvertFrom-Json).'@odata.type' -replace '#microsoft.graph.', ''
+                if ([string]::IsNullOrWhiteSpace($TemplateType)) {
+                    throw "App Protection template '$DisplayName' does not contain @odata.type, so the policy type cannot be determined. Recreate the template or re-run the template sync to include @odata.type."
+                }
                 $PolicyFile = $RawJSON | ConvertFrom-Json
                 $Null = $PolicyFile | Add-Member -MemberType NoteProperty -Name 'description' -Value $Description -Force
                 $null = $PolicyFile | Add-Member -MemberType NoteProperty -Name 'displayName' -Value $DisplayName -Force