updates

Author: KelvinTegelaar

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Conditional/Invoke-AddCAPolicy.ps1

@@ -13,7 +13,7 @@ Function Invoke-AddCAPolicy {
     $APIName = $TriggerMetadata.FunctionName
     Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message 'Accessed this API' -Sev 'Debug'
 
-    $Tenants = ($Request.body | Select-Object Select_*).psobject.properties.value
+    $Tenants = $Request.body.tenantFilter.value
     if ('AllTenants' -in $Tenants) { $Tenants = (Get-Tenants).defaultDomainName }
 
     $results = foreach ($Tenant in $tenants) {

Modules/CIPPCore/Public/Entrypoints/Invoke-ExecCSPLicense.ps1

@@ -20,7 +20,6 @@ Function Invoke-ExecCSPLicense {
     # Interact with query parameters or the body of the request.
     $TenantFilter = $Request.body.TenantFilter
     $Action = $Request.body.Action
-
     try {
         if ($Action -eq 'Add') {
             $GraphRequest = Set-SherwebSubscription -tenantFilter $TenantFilter -SKU $Request.body.sku -add $Request.body.Add
@@ -31,7 +30,7 @@ Function Invoke-ExecCSPLicense {
         }
 
         if ($Action -eq 'NewSub') {
-            $GraphRequest = Set-SherwebSubscription -tenantFilter $TenantFilter -SKU $Request.body.sku -Quantity $Request.body.Quantity
+            $GraphRequest = Set-SherwebSubscription -tenantFilter $TenantFilter -SKU $Request.body.sku.value -Quantity $Request.body.Quantity
         }
         if ($Action -eq 'Cancel') {
             $GraphRequest = Remove-SherwebSubscription -tenantFilter $TenantFilter -SubscriptionIds $Request.body.SubscriptionIds

Modules/CIPPCore/Public/Entrypoints/Invoke-ListCSPsku.ps1

@@ -0,0 +1,24 @@
+using namespace System.Net
+
+Function Invoke-ListCSPsku {
+    <#
+    .FUNCTIONALITY
+        Entrypoint
+    .ROLE
+        Tenant.Directory.Read
+    #>
+    [CmdletBinding()]
+    param($Request, $TriggerMetadata)
+
+    $APIName = $TriggerMetadata.FunctionName
+    Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message 'Accessed this API' -Sev 'Debug'
+
+    $GraphRequest = Get-SherwebCatalog -TenantFilter $Request.Query.TenantFilter
+
+
+    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+            StatusCode = [HttpStatusCode]::OK
+            Body       = @($GraphRequest)
+        }) -Clobber
+
+}

Modules/CIPPCore/Public/GraphHelper/Get-NormalizedError.ps1

@@ -64,6 +64,7 @@ function Get-NormalizedError {
         '*AADSTS53003*' { 'Access has been blocked by Conditional Access policies. Please check the Conditional Access configuration documentation' }
         '*AADSTS900023*' { 'This tenant is not available for this operation. Please check the selected tenant and try again.' }
         '*AADSTS9002313*' { 'The credentials used to connect to the Graph API are not available, please retry. If this issue persists you may need to execute the SAM wizard.' }
+        '*One or more platform(s) is/are not configured for the customer. Please configure the platform before trying to purchase a SKU.*' { 'One or more platform(s) is/are not configured for the customer. Please configure the platform before trying to purchase a SKU.' }
         Default { $message }
 
     }

Modules/CIPPCore/Public/New-CIPPCATemplate.ps1

@@ -31,22 +31,25 @@ function New-CIPPCATemplate {
     if ($excludelocations) { $JSON.conditions.locations.excludeLocations = $excludelocations }
     if ($JSON.conditions.users.includeUsers) {
         $JSON.conditions.users.includeUsers = @($JSON.conditions.users.includeUsers | ForEach-Object {
+                $originalID = $_
                 if ($_ -in 'All', 'None', 'GuestOrExternalUsers') { return $_ }
                 try {
                 (New-GraphGetRequest -uri "https://graph.microsoft.com/beta/users/$($_)" -tenantid $TenantFilter).displayName
                 } catch {
-                    return $_
+                    return $originalID
                 }
             })
     }
 
     if ($JSON.conditions.users.excludeUsers) {
         $JSON.conditions.users.excludeUsers = @($JSON.conditions.users.excludeUsers | ForEach-Object {
                 if ($_ -in 'All', 'None', 'GuestOrExternalUsers') { return $_ }
+                $originalID = $_
+
                 try {
                 (New-GraphGetRequest -uri "https://graph.microsoft.com/beta/users/$($_)" -tenantid $TenantFilter).displayName
                 } catch {
-                    return $_
+                    return $originalID
                 }
             })
     }
@@ -58,21 +61,25 @@ function New-CIPPCATemplate {
 
     if ($JSON.conditions.users.includeGroups) {
         $JSON.conditions.users.includeGroups = @($JSON.conditions.users.includeGroups | ForEach-Object {
+                $originalID = $_
                 if ($_ -in 'All', 'None', 'GuestOrExternalUsers' -or -not (Test-IsGuid $_)) { return $_ }
                 try {
                 (New-GraphGetRequest -uri "https://graph.microsoft.com/beta/groups/$($_)" -tenantid $TenantFilter).displayName
                 } catch {
-                    return $_
+                    return $originalID
                 }
             })
     }
     if ($JSON.conditions.users.excludeGroups) {
         $JSON.conditions.users.excludeGroups = @($JSON.conditions.users.excludeGroups | ForEach-Object {
+                $originalID = $_
+
                 if ($_ -in 'All', 'None', 'GuestOrExternalUsers' -or -not (Test-IsGuid $_)) { return $_ }
                 try {
                 (New-GraphGetRequest -uri "https://graph.microsoft.com/beta/groups/$($_)" -tenantid $TenantFilter).displayName
                 } catch {
-                    return $_
+                    return $originalID
+
                 }
             })
     }