Merge branch 'KelvinTegelaar:master' into master

jephens · Jul 16, 2024 · eeebbd5 · eeebbd5
2 parents be404eb + bd57189
commit eeebbd5
Show file tree

Hide file tree

Showing 108 changed files with 1,179 additions and 691 deletions.
diff --git a/Modules/CIPPCore/CIPPCore.psm1 b/Modules/CIPPCore/CIPPCore.psm1
@@ -4,8 +4,7 @@ $Functions = $Public + $Private
 foreach ($import in @($Functions)) {
     try {
         . $import.FullName
-    }
-    catch {
+    } catch {
         Write-Error -Message "Failed to import function $($import.FullName): $_"
     }
 }

diff --git a/Modules/CIPPCore/Public/Add-CIPPApplicationPermission.ps1 b/Modules/CIPPCore/Public/Add-CIPPApplicationPermission.ps1
@@ -41,10 +41,11 @@ function Add-CIPPApplicationPermission {
     $counter = 0
     foreach ($Grant in $Grants) {
         try {
-            $SettingsRequest = New-GraphPOSTRequest -body ($Grant | ConvertTo-Json) -uri "https://graph.microsoft.com/beta/servicePrincipals/$($ourSVCPrincipal.id)/appRoleAssignedTo" -tenantid $Tenantfilter -type POST -NoAuthCheck $true
+            $SettingsRequest = New-GraphPOSTRequest -body (ConvertTo-Json -InputObject $Grant -Depth 5) -uri "https://graph.microsoft.com/beta/servicePrincipals/$($ourSVCPrincipal.id)/appRoleAssignedTo" -tenantid $Tenantfilter -type POST -NoAuthCheck $true
             $counter++
         } catch {
-            $Results.add("Failed to grant $($Grant.appRoleId) to $($Grant.resourceId): $($_.Exception.Message)") | Out-Null
+            $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
+            $Results.add("Failed to grant $($Grant.appRoleId) to $($Grant.resourceId): $ErrorMessage") | Out-Null
         }
     }
     "Added $counter Application permissions to $($ourSVCPrincipal.displayName)"

diff --git a/Modules/CIPPCore/Public/Add-CIPPAzDataTableEntity.ps1 b/Modules/CIPPCore/Public/Add-CIPPAzDataTableEntity.ps1
@@ -134,7 +134,8 @@ function Add-CIPPAzDataTableEntity {
                     }
 
                 } catch {
-                    throw "Error processing entity: $($_.Exception.Message) Linenumner: $($_.InvocationInfo.ScriptLineNumber)"
+                    $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
+                    throw "Error processing entity: $ErrorMessage Linenumber: $($_.InvocationInfo.ScriptLineNumber)"
                 }
             } else {
                 Write-Information "THE ERROR IS $($_.Exception.ErrorCode). The size of the entity is $entitySize."

diff --git a/Modules/CIPPCore/Public/Add-CIPPBPAField.ps1 b/Modules/CIPPCore/Public/Add-CIPPBPAField.ps1
@@ -30,12 +30,12 @@ function Add-CIPPBPAField {
             $Result["$fieldName"] = [bool]$FieldValue
         }
         'JSON' {
-            if ($FieldValue -eq $null) { $JsonString = '{}' } else { $JsonString = (ConvertTo-Json -Depth 15 -InputObject $FieldValue -Compress) }
+            if ($null -eq $FieldValue) { $JsonString = '{}' } else { $JsonString = (ConvertTo-Json -Depth 15 -InputObject $FieldValue -Compress) }
             $Result[$fieldName] = [string]$JsonString
         }
         'string' {
             $Result[$fieldName], [string]$FieldValue
         }
     }
     Add-CIPPAzDataTableEntity @Table -Entity $Result -Force
-}
+}
diff --git a/Modules/CIPPCore/Public/Add-CIPPScheduledTask.ps1 b/Modules/CIPPCore/Public/Add-CIPPScheduledTask.ps1
@@ -72,7 +72,8 @@ function Add-CIPPScheduledTask {
     try {
         Add-CIPPAzDataTableEntity @Table -Entity $entity -Force
     } catch {
-        return "Could not add task: $($_.Exception.Message)"
+        $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
+        return "Could not add task: $ErrorMessage"
     }
     return "Successfully added task: $($entity.Name)"
 }
diff --git a/Modules/CIPPCore/Public/AdditionalPermissions.json b/Modules/CIPPCore/Public/AdditionalPermissions.json
@@ -2,14 +2,5 @@
   {
     "resourceAppId": "00000003-0000-0ff1-ce00-000000000000",
     "resourceAccess": [{ "id": "AllProfiles.Manage", "type": "Scope" }]
-  },
-  {
-    "resourceAppId": "fb78d390-0c51-40cd-8e17-fdbfab77341b",
-    "resourceAccess": [
-      { "id": "AdminApi.AccessAsUser.All", "type": "Scope" },
-      { "id": "FfoPowerShell.AccessAsUser.All", "type": "Scope" },
-      { "id": "RemotePowerShell.AccessAsUser.All", "type": "Scope" },
-      { "id": "VivaFeatureAccessPolicy.Manage.All", "type": "Scope" }
-    ]
   }
 ]
diff --git a/Modules/CIPPCore/Public/Assert-CippVersion.ps1 b/Modules/CIPPCore/Public/Assert-CippVersion.ps1
@@ -24,4 +24,4 @@ function Assert-CippVersion {
         OutOfDateCIPP        = ([version]$RemoteCIPPVersion -gt [version]$CIPPVersion)
         OutOfDateCIPPAPI     = ([version]$RemoteAPIVersion -gt [version]$APIVersion)
     }
-}
+}
diff --git a/Modules/CIPPCore/Public/Clear-CippDurables.ps1 b/Modules/CIPPCore/Public/Clear-CippDurables.ps1
@@ -59,4 +59,4 @@ function Clear-CippDurables {
     }
     $null = Get-CippTable -TableName ('{0}History' -f $FunctionName)
     Write-Information 'Durable Orchestrators and Queues have been cleared'
-}
+}
diff --git a/...les/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecSetCIPPAutoBackup.ps1 b/...les/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecSetCIPPAutoBackup.ps1
@@ -19,14 +19,14 @@ Function Invoke-ExecSetCIPPAutoBackup {
         }
         Remove-AzDataTableEntity @Table -Entity $task | Out-Null
 
-        $TaskBody = @{
+        $TaskBody = [pscustomobject]@{
             TenantFilter  = 'AllTenants'
             Name          = 'Automated CIPP Backup'
             Command       = @{
                 value = 'New-CIPPBackup'
                 label = 'New-CIPPBackup'
             }
-            Parameters    = @{ backupType = 'CIPP' }
+            Parameters    = [pscustomobject]@{ backupType = 'CIPP' }
             ScheduledTime = $unixtime
             Recurrence    = '1d'
         }

diff --git a/...les/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Scheduler/Invoke-AddScheduledItem.ps1 b/...les/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Scheduler/Invoke-AddScheduledItem.ps1
@@ -9,7 +9,7 @@ Function Invoke-AddScheduledItem {
     #>
     [CmdletBinding()]
     param($Request, $TriggerMetadata)
-    if ($Request.query.hidden -eq $null) {
+    if ($null -eq $Request.query.hidden) {
         $hidden = $false
     } else {
         $hidden = $true

diff --git a/.../CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Scheduler/Invoke-RemoveScheduledItem.ps1 b/.../CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Scheduler/Invoke-RemoveScheduledItem.ps1
@@ -10,14 +10,17 @@ Function Invoke-RemoveScheduledItem {
     [CmdletBinding()]
     param($Request, $TriggerMetadata)
 
+    $APIName = 'RemoveScheduledItem'
+    $User = $request.headers.'x-ms-client-principal'
+
     $task = @{
         RowKey       = $Request.Query.ID
         PartitionKey = 'ScheduledTask'
     }
     $Table = Get-CIPPTable -TableName 'ScheduledTasks'
     Remove-AzDataTableEntity @Table -Entity $task
 
-    Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message "Task removed: $($task.Name)" -Sev 'Info'
+    Write-LogMessage -user $User -API $APINAME -message "Task removed: $($task.RowKey)" -Sev 'Info'
 
     Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
             StatusCode = [HttpStatusCode]::OK

diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecAccessChecks.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecAccessChecks.ps1
@@ -21,7 +21,7 @@ Function Invoke-ExecAccessChecks {
     }
 
     if ($Request.Query.Tenants -eq 'true') {
-        $Results = Test-CIPPAccessTenant -TenantCSV $Request.Body.tenantid
+        $Results = Test-CIPPAccessTenant -TenantCSV $Request.Body.tenantid -ExecutingUser $Request.Headers.'x-ms-client-principal'
     }
     if ($Request.Query.GDAP -eq 'true') {
         $Results = Test-CIPPGDAPRelationships

diff --git a/...e/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ExecJITAdmin.ps1 b/...e/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ExecJITAdmin.ps1
@@ -171,14 +171,14 @@ Function Invoke-ExecJITAdmin {
             Set-CIPPUserJITAdmin @Parameters
         }
 
-        $DisableTaskBody = @{
+        $DisableTaskBody = [pscustomobject]@{
             TenantFilter  = $Request.Body.TenantFilter
             Name          = "JIT Admin ($($Request.Body.ExpireAction)): $Username"
             Command       = @{
                 value = 'Set-CIPPUserJITAdmin'
                 label = 'Set-CIPPUserJITAdmin'
             }
-            Parameters    = @{
+            Parameters    = [pscustomobject]@{
                 TenantFilter = $Request.Body.TenantFilter
                 User         = @{
                     'UserPrincipalName' = $Username

diff --git a/...blic/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ExecOffboardUser.ps1 b/...blic/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ExecOffboardUser.ps1
@@ -23,7 +23,7 @@ Function Invoke-ExecOffboardUser {
                     Command       = @{
                         value = 'Invoke-CIPPOffboardingJob'
                     }
-                    Parameters    = @{
+                    Parameters    = [pscustomobject]@{
                         Username     = $Username
                         APIName      = 'Scheduled Offboarding'
                         options      = $request.body

diff --git a/.../CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Conditional/Invoke-ExecCAExclusion.ps1 b/.../CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Conditional/Invoke-ExecCAExclusion.ps1
@@ -18,14 +18,14 @@ Function Invoke-ExecCAExclusion {
     }
     if ($Request.body.vacation -eq 'true') {
         $StartDate = $Request.body.StartDate
-        $TaskBody = @{
+        $TaskBody = [pscustomobject]@{
             TenantFilter  = $Request.body.TenantFilter
             Name          = "Add CA Exclusion Vacation Mode: $Username - $($Request.body.TenantFilter)"
             Command       = @{
                 value = 'Set-CIPPCAExclusion'
                 label = 'Set-CIPPCAExclusion'
             }
-            Parameters    = @{
+            Parameters    = [pscustomobject]@{
                 ExclusionType = 'Add'
                 UserID        = $Request.body.UserID
                 PolicyId      = $Request.body.PolicyId

diff --git a/Modules/CIPPCore/Public/Get-CIPPBitlockerKey.ps1 b/Modules/CIPPCore/Public/Get-CIPPBitlockerKey.ps1
@@ -14,9 +14,8 @@ function Get-CIPPBitlockerKey {
         }
         return $GraphRequest
     } catch {
+        $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
         Write-LogMessage -user $ExecutingUser -API $APIName -message "Could not add OOO for $($userid)" -Sev 'Error' -tenant $TenantFilter -LogData (Get-CippException -Exception $_)
-        return "Could not add out of office message for $($userid). Error: $($_.Exception.Message)"
+        return "Could not add out of office message for $($userid). Error: $ErrorMessage"
     }
 }
-
-
diff --git a/Modules/CIPPCore/Public/Get-CIPPDomainAnalyser.ps1 b/Modules/CIPPCore/Public/Get-CIPPDomainAnalyser.ps1
@@ -36,4 +36,4 @@ function Get-CIPPDomainAnalyser {
         $Results = @()
     }
     return $Results
-}
+}
diff --git a/Modules/CIPPCore/Public/Get-CIPPLAPSPassword.ps1 b/Modules/CIPPCore/Public/Get-CIPPLAPSPassword.ps1
@@ -4,7 +4,7 @@ function Get-CIPPLapsPassword {
     param (
         $device,
         $TenantFilter,
-        $APIName = "Get LAPS Password",
+        $APIName = 'Get LAPS Password',
         $ExecutingUser
     )
 
@@ -15,10 +15,10 @@ function Get-CIPPLapsPassword {
             "The password for $($_.AccountName) is $($PlainText) generated at $($date)"
         }
         if ($GraphRequest) { return $GraphRequest } else { return "No LAPS password found for $device" }
-    }
-    catch {
-        Write-LogMessage -user $ExecutingUser -API $APIName -message "Could not add OOO for $($userid)" -Sev "Error" -tenant $TenantFilter
-        return "Could not add out of office message for $($userid). Error: $($_.Exception.Message)"
+    } catch {
+        $ErrorMessage = Get-CippException -Exception $_
+        Write-LogMessage -user $ExecutingUser -API $APIName -message "Could not add OOO for $($userid). Error: $($ErrorMessage.NormalizedError)" -Sev 'Error' -tenant $TenantFilter -LogData $ErrorMessage
+        return "Could not add out of office message for $($userid). Error: $($ErrorMessage.NormalizedError)"
     }
 }
 

diff --git a/Modules/CIPPCore/Public/Get-CIPPLicenseOverview.ps1 b/Modules/CIPPCore/Public/Get-CIPPLicenseOverview.ps1
@@ -7,7 +7,7 @@ function Get-CIPPLicenseOverview {
         $ExecutingUser
     )
 
-   
+
     $LicRequest = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/subscribedSkus' -tenantid $TenantFilter
     $SkuIDs = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/directory/subscriptions' -tenantid $TenantFilter
 
@@ -25,7 +25,7 @@ function Get-CIPPLicenseOverview {
             if ($sku.skuId -in $ExcludedSkuList.GUID) { continue }
             $PrettyName = ($ConvertTable | Where-Object { $_.guid -eq $sku.skuid }).'Product_Display_Name' | Select-Object -Last 1
             if (!$PrettyName) { $PrettyName = $sku.skuPartNumber }
-            
+
             # Initialize $Term with the default value
             $TermInfo = foreach ($Subscription in $sku.subscriptionIds) {
                 $SubInfo = $SkuIDs | Where-Object { $_.id -eq $Subscription }
@@ -63,7 +63,7 @@ function Get-CIPPLicenseOverview {
                 TermInfo       = [string]($TermInfo | ConvertTo-Json -Depth 10 -Compress)
                 'PartitionKey' = 'License'
                 'RowKey'       = "$($singlereq.Tenant) - $($sku.skuid)"
-            }      
+            }
         }
     }
     return $GraphRequest

diff --git a/Modules/CIPPCore/Public/Get-CIPPMFAState.ps1 b/Modules/CIPPCore/Public/Get-CIPPMFAState.ps1
@@ -47,7 +47,7 @@ function Get-CIPPMFAState {
                         $Policy.conditions.users.excludeUsers.foreach({ $ExcludeAllUsers.Add($_) | Out-Null })
                         continue
                     }
-                } 
+                }
             }
         } catch {
         }
@@ -76,7 +76,7 @@ function Get-CIPPMFAState {
         $PerUser = if ($PerUserMFAState -eq $null) { $null } else { ($PerUserMFAState | Where-Object -Property UserPrincipalName -EQ $_.UserPrincipalName).PerUserMFAState }
 
         $MFARegUser = if (($MFARegistration | Where-Object -Property UserPrincipalName -EQ $_.UserPrincipalName).IsMFARegistered -eq $null) { $false } else { ($MFARegistration | Where-Object -Property UserPrincipalName -EQ $_.UserPrincipalName) }
-        
+
         [PSCustomObject]@{
             Tenant          = $TenantFilter
             ID              = $_.ObjectId
@@ -92,7 +92,7 @@ function Get-CIPPMFAState {
             RowKey          = [string]($_.UserPrincipalName).replace('#', '')
             PartitionKey    = 'users'
         }
-        
+
     }
     return $GraphRequest
 }
diff --git a/Modules/CIPPCore/Public/Get-CIPPOutOfOffice.ps1 b/Modules/CIPPCore/Public/Get-CIPPOutOfOffice.ps1
@@ -3,22 +3,22 @@ function Get-CIPPOutOfOffice {
     param (
         $userid,
         $TenantFilter,
-        $APIName = "Get Out of Office",
+        $APIName = 'Get Out of Office',
         $ExecutingUser
     )
 
     try {
-        $OutOfOffice = New-ExoRequest -tenantid $TenantFilter -cmdlet "Get-MailboxAutoReplyConfiguration" -cmdParams @{Identity = $userid } -Anchor $userid
+        $OutOfOffice = New-ExoRequest -tenantid $TenantFilter -cmdlet 'Get-MailboxAutoReplyConfiguration' -cmdParams @{Identity = $userid } -Anchor $userid
         $Results = @{
-            AutoReplyState = $OutOfOffice.AutoReplyState
-            StartTime = $OutOfOffice.StartTime.ToString("yyyy-MM-dd HH:mm")
-            EndTime = $OutOfOffice.EndTime.ToString("yyyy-MM-dd HH:mm")
+            AutoReplyState  = $OutOfOffice.AutoReplyState
+            StartTime       = $OutOfOffice.StartTime.ToString('yyyy-MM-dd HH:mm')
+            EndTime         = $OutOfOffice.EndTime.ToString('yyyy-MM-dd HH:mm')
             InternalMessage = $OutOfOffice.InternalMessage
             ExternalMessage = $OutOfOffice.ExternalMessage
         } | ConvertTo-Json
         return $Results
-    }
-    catch {
-        return "Could not retrieve out of office message for $($userid). Error: $($_.Exception.Message)"
+    } catch {
+        $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
+        return "Could not retrieve out of office message for $($userid). Error: $ErrorMessage"
     }
 }
diff --git a/Modules/CIPPCore/Public/Get-CIPPPartnerAzSubscriptions.ps1 b/Modules/CIPPCore/Public/Get-CIPPPartnerAzSubscriptions.ps1
@@ -1,7 +1,7 @@
 function Get-CIPPPartnerAzSubscriptions {
     param (
         $TenantFilter,
-        $APIName = "Get-CIPPPartnerAzSubscriptions"
+        $APIName = 'Get-CIPPPartnerAzSubscriptions'
     )
 
     try {
@@ -15,38 +15,39 @@ function Get-CIPPPartnerAzSubscriptions {
     $subsCache = [system.collections.generic.list[hashtable]]::new()
     try {
         try {
-            $usageRecords = (New-GraphGETRequest -Uri "https://api.partnercenter.microsoft.com/v1/customers/$($TenantFilter)/subscriptions/usagerecords" -scope "https://api.partnercenter.microsoft.com/user_impersonation").items
+            $usageRecords = (New-GraphGETRequest -Uri "https://api.partnercenter.microsoft.com/v1/customers/$($TenantFilter)/subscriptions/usagerecords" -scope 'https://api.partnercenter.microsoft.com/user_impersonation').items
         } catch {
-            throw "Unable to retrieve usagerecord(s): $($_.Exception.Message)"
+            $ErrorMessage = Get-CippException -Exception $_
+            throw "Unable to retrieve usagerecord(s): $($ErrorMessage.NormalizedError)"
         }
 
         foreach ($usageRecord in $usageRecords) {
             # if condition probably needs more refining
-            if ($usageRecord.offerId -notlike "DZH318Z0BPS6*") {
+            if ($usageRecord.offerId -notlike 'DZH318Z0BPS6*') {
                 # Legacy subscriptions are directly accessible
                 $subDetails = @{
-                    tenantId = $tenantFilter
+                    tenantId       = $tenantFilter
                     subscriptionId = ($usageRecord.id).ToLower()
-                    isLegacy = $true
-                    POR = "Legacy subscription"
-                    status = $usageRecord.status
+                    isLegacy       = $true
+                    POR            = 'Legacy subscription'
+                    status         = $usageRecord.status
                 }
-    
+
                 $subsCache.Add($subDetails)
             } else {
                 # For modern subscriptions we need to dig a little deeper
                 try {
-                    $subid = (New-GraphGETRequest -Uri "https://api.partnercenter.microsoft.com/v1/customers/$($TenantFilter)/subscriptions/$($usageRecord.id)/azureEntitlements" -scope "https://api.partnercenter.microsoft.com/user_impersonation").items #| Where-Object { $_.status -eq "active" }
-                
+                    $subid = (New-GraphGETRequest -Uri "https://api.partnercenter.microsoft.com/v1/customers/$($TenantFilter)/subscriptions/$($usageRecord.id)/azureEntitlements" -scope 'https://api.partnercenter.microsoft.com/user_impersonation').items #| Where-Object { $_.status -eq "active" }
+
                     foreach ($id in $subid) {
                         $subDetails = @{
-                            tenantId = $tenantFilter
+                            tenantId       = $tenantFilter
                             subscriptionId = ($id.id)
-                            isLegacy = $false
-                            POR = $id.partnerOnRecord
-                            status = $id.status
+                            isLegacy       = $false
+                            POR            = $id.partnerOnRecord
+                            status         = $id.status
                         }
-        
+
                         $subsCache.Add($subDetails)
                     }
                 } catch {
@@ -59,6 +60,7 @@ function Get-CIPPPartnerAzSubscriptions {
 
         return $subsCache
     } catch {
-        Write-LogMessage -message "Unable to retrieve CSP Azure subscriptions for $($TenantFilter): $($_.Exception.Message)" -Sev 'ERROR' -API $APINAME
+        $ErrorMessage = Get-CippException -Exception $_
+        Write-LogMessage -message "Unable to retrieve CSP Azure subscriptions for $($TenantFilter): $($ErrorMessage.NormalizedError)" -Sev 'ERROR' -API $APINAME -LogData $ErrorMessage
     }
 }
diff --git a/Modules/CIPPCore/Public/Get-CIPPPerUserMFA.ps1 b/Modules/CIPPCore/Public/Get-CIPPPerUserMFA.ps1
@@ -29,6 +29,7 @@ function Get-CIPPPerUserMFA {
             }
         }
     } catch {
-        "Failed to get MFA State for $id : $_"
+        $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
+        "Failed to get MFA State for $id : $ErrorMessage"
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,4 +24,4 @@ function Assert-CippVersion { @@
             OutOfDateCIPP        = ([version]$RemoteCIPPVersion -gt [version]$CIPPVersion)
             OutOfDateCIPPAPI     = ([version]$RemoteAPIVersion -gt [version]$APIVersion)
         }
-    }
+    }