Merge pull request #1022 from KelvinTegelaar/dev

pull[bot] · web-flow · commit a5743c4309ac · 2026-06-14T00:41:07.000Z
[pull] dev from KelvinTegelaar:dev
diff --git a/Config/ExcludeSkuList.JSON b/Config/ExcludeSkuList.JSON
@@ -59,6 +59,10 @@
     "GUID": "8c4ce438-32a7-4ac5-91a6-e22ae08d9c8b",
     "Product_Display_Name": "Rights Management Adhoc"
   },
+  {
+    "GUID": "093e8d14-a334-43d9-93e3-30589a8b47d0",
+    "Product_Display_Name": "Rights Management Service Basic Content Protection"
+  },
   {
     "GUID": "5b631642-bd26-49fe-bd20-1daaa972ef80",
     "Product_Display_Name": "Microsoft Power Apps for Developer"
diff --git a/Modules/CIPPCore/Public/Get-CIPPLicenseOverview.ps1 b/Modules/CIPPCore/Public/Get-CIPPLicenseOverview.ps1
@@ -5,7 +5,8 @@ function Get-CIPPLicenseOverview {
         $TenantFilter,
         $APIName = 'Get License Overview',
         $Headers,
-        [switch]$AlertMode
+        [switch]$AlertMode,
+        [switch]$IncludeExcluded
     )
 
     $Requests = @(
@@ -72,6 +73,7 @@ function Get-CIPPLicenseOverview {
             $null -eq $_.ExcludedEverywhere -or $_.ExcludedEverywhere -eq $true
         } | ForEach-Object { $_.GUID })
     }
+    $DropdownVisibleGuids = @($ExcludedSkuList | Where-Object { $_.ShowInLicenseDropdown -eq $true } | ForEach-Object { $_.GUID })
 
     $AllLicensedUsers = @(($Results | Where-Object { $_.id -eq 'licensedUsers' }).body.value) | Sort-Object -Property displayName
     $UsersBySku = @{}
@@ -120,7 +122,9 @@ function Get-CIPPLicenseOverview {
     $GraphRequest = foreach ($singleReq in $RawGraphRequest) {
         $skuId = $singleReq.Licenses
         foreach ($sku in $skuId) {
-            if ($sku.skuId -in $EffectiveExcludedGuids) { continue }
+            if ($sku.skuId -in $EffectiveExcludedGuids) {
+                if (!$IncludeExcluded -or $sku.skuId -notin $DropdownVisibleGuids) { continue }
+            }
             $PrettyNameAdmin = $AdminPortalLicenses | Where-Object { $_.aadSkuId -eq $sku.skuId } | Select-Object -ExpandProperty displayName -First 1
             $PrettyNameCSV = ($ConvertTable | Where-Object { $_.guid -eq $sku.skuid }).'Product_Display_Name' | Select-Object -Last 1
             $PrettyName = $PrettyNameAdmin ?? $PrettyNameCSV ?? $sku.skuPartNumber
@@ -172,4 +176,3 @@ function Get-CIPPLicenseOverview {
     }
     return ($GraphRequest | Sort-Object -Property License)
 }
-
diff --git a/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecExcludeLicenses.ps1 b/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecExcludeLicenses.ps1
@@ -44,6 +44,24 @@ function Invoke-ExecExcludeLicenses {
                 $Result = "Success. $DisplayName($GUID) will now only be excluded from alerts."
                 Write-LogMessage -API $APIName -headers $Headers -message $Result -Sev 'Info'
 
+            }
+            'SetShowInDropdown' {
+                $ShowInDropdown = $Request.Body.ShowInDropdown -eq $true
+                $Filter = "RowKey eq '{0}' and PartitionKey eq 'License'" -f $GUID
+                $Entity = Get-CIPPAzDataTableEntity @Table -Filter $Filter
+                if (!$Entity) { throw "Excluded license not found: $GUID" }
+                if (!$DisplayName) { $DisplayName = $Entity.Product_Display_Name }
+
+                $Entity | Add-Member -NotePropertyName 'ShowInLicenseDropdown' -NotePropertyValue $ShowInDropdown -Force
+                Add-CIPPAzDataTableEntity @Table -Entity $Entity -Force | Out-Null
+
+                $Result = if ($ShowInDropdown) {
+                    "Success. $DisplayName($GUID) will now be shown in license dropdowns."
+                } else {
+                    "Success. $DisplayName($GUID) will now be hidden from license dropdowns."
+                }
+                Write-LogMessage -API $APIName -headers $Headers -message $Result -Sev 'Info'
+
             }
             'RemoveExclusion' {
                 $Filter = "RowKey eq '{0}' and PartitionKey eq 'License'" -f $GUID
diff --git a/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ListExcludedLicenses.ps1 b/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ListExcludedLicenses.ps1
@@ -29,6 +29,9 @@ function Invoke-ListExcludedLicenses {
             if ($null -eq $_.ExcludedEverywhere) {
                 $_ | Add-Member -NotePropertyName 'ExcludedEverywhere' -NotePropertyValue $true -Force
             }
+            if ($null -eq $_.ShowInLicenseDropdown) {
+                $_ | Add-Member -NotePropertyName 'ShowInLicenseDropdown' -NotePropertyValue $false -Force
+            }
             $ExclusionType = if ($_.ExcludedEverywhere -eq $true) { 'Excluded Everywhere' } else { 'Excluded from Alerts Only' }
             $_ | Add-Member -NotePropertyName 'ExclusionType' -NotePropertyValue $ExclusionType -Force
             $_
diff --git a/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/Endpoint/MEM/Invoke-EditIntunePolicy.ps1 b/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/Endpoint/MEM/Invoke-EditIntunePolicy.ps1
@@ -13,24 +13,52 @@ function Invoke-EditIntunePolicy {
 
 
     # Interact with query parameters or the body of the request.
-    $TenantFilter = $Request.Query.tenantFilter ?? $Request.Body.tenantFilter
-    $ID = $Request.Query.ID ?? $Request.Body.ID
-    $DisplayName = $Request.Query.newDisplayName ?? $Request.Body.newDisplayName
-    $PolicyType = $Request.Query.policyType ?? $Request.Body.policyType
+    $TenantFilter = $Request.Body.tenantFilter
+    $ID = $Request.Body.ID
+    $DisplayName = $Request.Body.newDisplayName
+    $PolicyType = $Request.Body.policyType
+    $PlatformType = $Request.Body.platformType ?? 'deviceManagement'
+
+    # The description is optional and may be sent as an empty string to clear it,
+    # so track whether the caller actually supplied the key.
+    $DescriptionProvided = $Request.Body.PSObject.Properties.Name -contains 'description'
+    $Description = $Request.Body.description
 
     try {
+        # App protection policy lists expose the singular @odata.type as the URLName, but a
+        # Graph PATCH needs the plural collection segment. Normalize the known types here.
+        $PolicyType = switch ($PolicyType) {
+            'androidManagedAppProtection' { 'androidManagedAppProtections' }
+            'iosManagedAppProtection' { 'iosManagedAppProtections' }
+            'windowsManagedAppProtection' { 'windowsManagedAppProtections' }
+            'mdmWindowsInformationProtectionPolicy' { 'mdmWindowsInformationProtectionPolicies' }
+            'windowsInformationProtectionPolicy' { 'windowsInformationProtectionPolicies' }
+            'targetedManagedAppConfiguration' { 'targetedManagedAppConfigurations' }
+            default { $PolicyType }
+        }
+
         $properties = @{}
 
-        # Only add displayName if it's provided
+        # Settings catalog policies (configurationPolicies) store the name in the 'name'
+        # property rather than 'displayName'.
+        $NameProperty = if ($PolicyType -ieq 'configurationPolicies') { 'name' } else { 'displayName' }
+
+        # Only add the name if it's provided
         if ($DisplayName) {
-            $properties['displayName'] = $DisplayName
+            $properties[$NameProperty] = $DisplayName
+        }
+
+        # Only add description if the caller supplied it (empty string clears it)
+        if ($DescriptionProvided) {
+            $properties['description'] = $Description
         }
 
         # Update the policy
-        $Request = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/deviceManagement/$PolicyType/$ID" -tenantid $TenantFilter -type PATCH -body ($properties | ConvertTo-Json) -asapp $true
+        $Request = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/$PlatformType/$PolicyType/$ID" -tenantid $TenantFilter -type PATCH -body ($properties | ConvertTo-Json) -asapp $true
 
         $Result = "Successfully updated Intune policy $($ID)"
         if ($DisplayName) { $Result += " name to '$($DisplayName)'" }
+        if ($DescriptionProvided) { $Result += ' and description' }
 
         Write-LogMessage -headers $Headers -API $APIName -tenant $($TenantFilter) -message $Result -Sev 'Info'
         $StatusCode = [HttpStatusCode]::OK
diff --git a/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/Invoke-ListLicenses.ps1 b/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/Invoke-ListLicenses.ps1
@@ -11,8 +11,9 @@ function Invoke-ListLicenses {
     param($Request, $TriggerMetadata)
     # Interact with query parameters or the body of the request.
     $TenantFilter = $Request.Query.tenantFilter
+    $IncludeExcluded = $Request.Query.IncludeExcluded -eq 'true'
     if ($TenantFilter -ne 'AllTenants') {
-        $GraphRequest = Get-CIPPLicenseOverview -TenantFilter $TenantFilter | ForEach-Object {
+        $GraphRequest = Get-CIPPLicenseOverview -TenantFilter $TenantFilter -IncludeExcluded:$IncludeExcluded | ForEach-Object {
             $_
         }
     } else {
diff --git a/Modules/CippExtensions/Public/Hudu/Invoke-HuduExtensionSync.ps1 b/Modules/CippExtensions/Public/Hudu/Invoke-HuduExtensionSync.ps1
@@ -121,7 +121,7 @@ function Invoke-HuduExtensionSync {
         }
 
         $HuduRelations = Get-HuduRelations
-        $Links = @(
+        [System.Collections.ArrayList]$Links = @(
             @{
                 Title = 'M365 Admin Portal'
                 URL   = 'https://admin.cloud.microsoft?delegatedOrg={0}' -f $Tenant.initialDomainName
@@ -153,6 +153,31 @@ function Invoke-HuduExtensionSync {
                 Icon  = 'fas fa-server'
             }
         )
+        if($Configuration.IncludeDefenderLink)
+        {
+            $Links.Add(@{
+                Title = 'Defender Portal'
+                URL   = 'https://security.microsoft.com/?tid={0}' -f $Tenant.customerId
+                Icon  = 'fas fa-shield'
+            })
+        }
+        if($Configuration.IncludeComplianceLink)
+        {
+            $Links.Add(@{
+                Title = 'Compliance Portal'
+                URL   = 'https://compliance.microsoft.com/?tid={0}' -f $Tenant.customerId
+                Icon  = 'fas fa-caret-up'
+            })
+        }
+        if($Configuration.IncludeParterCenterLink)
+        {
+            $Links.Add(@{
+                Title = 'Partner Center Portals'
+                URL   = 'https://partner.microsoft.com/dashboard/v2/customers/{0}/servicemanagementpage' -f $Tenant.customerId
+                Icon  = 'fas fa-arrow-up-right-from-square'
+            })
+        }
+
         $FormattedLinks = foreach ($Link in $Links) {
             Get-HuduLinkBlock @Link
         }
@@ -183,6 +208,11 @@ function Invoke-HuduExtensionSync {
 			 </header>"
 
         $post = '</div>'
+
+        if($Configuration.HideEmptyRoles) {
+            $Roles = $Roles | Where-Object { $_.ParsedMembers }
+        }
+
         $RolesHtml = $Roles | Select-Object DisplayName, Description, ParsedMembers | ConvertTo-Html -PreContent $pre -PostContent $post -Fragment | ForEach-Object { $tmp = $_ -replace '&lt;', '<'; $tmp -replace '&gt;', '>'; } | Out-String
 
         $AdminUsers = (($Roles | Where-Object { $_.displayName -match 'Administrator' }).Members | Where-Object { $null -ne $_.displayName } | Select-Object @{N = 'Name'; E = { "<a target='_blank' href='https://entra.microsoft.com/$($Tenant.defaultDomainName)/#blade/Microsoft_AAD_IAM/UserDetailsMenuBlade/Profile/userId/$($_.Id)'>$($_.displayName) - $($_.userPrincipalName)</a>" } } -Unique).name -join '<br/>'
