Fix: Update assignment mode handling and improve existing assignment deduplication logic

Author: kris6673

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Endpoint/Applications/Invoke-ExecAssignApp.ps1

@@ -20,7 +20,7 @@ function Invoke-ExecAssignApp {
     $AppType = $Request.Query.AppType ?? $Request.Body.AppType
     $GroupNamesRaw = $Request.Query.GroupNames ?? $Request.Body.GroupNames
     $GroupIdsRaw = $Request.Query.GroupIds ?? $Request.Body.GroupIds
-    $AssignmentMode = $Request.Query.AssignmentMode ?? $Request.Body.AssignmentMode
+    $AssignmentMode = $Request.Body.assignmentMode
 
     $Intent = if ([string]::IsNullOrWhiteSpace($Intent)) { 'Required' } else { $Intent }
 
@@ -58,7 +58,7 @@ function Invoke-ExecAssignApp {
     # Try to get the application type if not provided. Mostly just useful for ppl using the API that dont know the application type.
     if (-not $AppType) {
         try {
-            $AppMetadata = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/deviceAppManagement/mobileApps/$appFilter?`$select=id,@odata.type" -tenantid $TenantFilter
+            $AppMetadata = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/deviceAppManagement/mobileApps/$appFilter" -tenantid $TenantFilter
             $odataType = $AppMetadata.'@odata.type'
             if ($odataType) {
                 $AppType = ($odataType -replace '#microsoft.graph.', '') -replace 'App$'

Modules/CIPPCore/Public/Set-CIPPAssignedApplication.ps1

@@ -128,8 +128,18 @@ function Set-CIPPAssignedApplication {
         # Deduplicate current assignments so the new ones override existing ones
         if ($ExistingAssignments) {
             $ExistingAssignments = $ExistingAssignments | ForEach-Object {
-                if ($_.target.groupId -notin $MobileAppAssignment.target.groupId) {
-                    $_
+                $ExistingAssignment = $_
+                switch ($ExistingAssignment.target.'@odata.type') {
+                    '#microsoft.graph.groupAssignmentTarget' {
+                        if ($ExistingAssignment.target.groupId -notin $MobileAppAssignment.target.groupId) {
+                            $ExistingAssignment
+                        }
+                    }
+                    default {
+                        if ($ExistingAssignment.target.'@odata.type' -notin $MobileAppAssignment.target.'@odata.type') {
+                            $ExistingAssignment
+                        }
+                    }
                 }
             }
         }
@@ -164,6 +174,7 @@ function Set-CIPPAssignedApplication {
         }
         if ($PSCmdlet.ShouldProcess($GroupName, "Assigning Application $ApplicationId")) {
             Start-Sleep -Seconds 1
+            # Write-Information (ConvertTo-Json $DefaultAssignmentObject -Depth 10)
             $null = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/deviceAppManagement/mobileApps/$($ApplicationId)/assign" -tenantid $TenantFilter -type POST -body ($DefaultAssignmentObject | ConvertTo-Json -Compress -Depth 10)
             Write-LogMessage -headers $Headers -API $APIName -message "Assigned Application $ApplicationId to $($GroupName)" -Sev 'Info' -tenant $TenantFilter
         }