update logging

Author: JohnDuprey

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

@@ -22,6 +22,7 @@ function Invoke-ExecCAExclusion {
         $PolicyId = $Request.Body.PolicyId
         $ExclusionType = $Request.Body.ExclusionType
 
+        $Policy = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/identity/conditionalAccess/policies/$($PolicyId)?`$select=id,displayName" -tenantid $TenantFilter
 
         if ($Users) {
             $UserID = $Users.value
@@ -48,7 +49,7 @@ function Invoke-ExecCAExclusion {
 
             $TaskBody = [pscustomobject]@{
                 TenantFilter  = $TenantFilter
-                Name          = "Add CA Exclusion Vacation Mode: $Username - $($TenantFilter)"
+                Name          = "Add CA Exclusion Vacation Mode: $PolicyName"
                 Command       = @{
                     value = 'Set-CIPPCAExclusion'
                     label = 'Set-CIPPCAExclusion'
@@ -62,7 +63,7 @@ function Invoke-ExecCAExclusion {
             Add-CIPPScheduledTask -Task $TaskBody -hidden $false
             #Removal of the exclusion
             $TaskBody.Parameters.ExclusionType = 'Remove'
-            $TaskBody.Name = "Remove CA Exclusion Vacation Mode: $Username - $($TenantFilter)"
+            $TaskBody.Name = "Remove CA Exclusion Vacation Mode: $PolicyName"
             $TaskBody.ScheduledTime = $EndDate
             Add-CIPPScheduledTask -Task $TaskBody -hidden $false
             $body = @{ Results = "Successfully added vacation mode schedule for $Username." }

Modules/CIPPCore/Public/Set-CIPPCAExclusion.ps1

@@ -10,12 +10,12 @@ function Set-CIPPCAExclusion {
         $Headers
     )
     try {
-        $CheckExististing = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/identity/conditionalAccess/policies/$($PolicyId)" -tenantid $TenantFilter -AsApp $true
+        $CheckExisting = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/identity/conditionalAccess/policies/$($PolicyId)" -tenantid $TenantFilter -AsApp $true
         if ($ExclusionType -eq 'add') {
             if ($Users) {
                 $Username = $Users.addedFields.userPrincipalName
                 $ExcludeUsers = [System.Collections.Generic.List[string]]::new()
-                foreach ($User in $CheckExististing.conditions.users.excludeUsers) {
+                foreach ($User in $CheckExisting.conditions.users.excludeUsers) {
                     $ExcludeUsers.Add($User)
                 }
                 foreach ($User in $Users.value) {
@@ -35,15 +35,15 @@ function Set-CIPPCAExclusion {
                 }
                 $NewExclusions = [pscustomobject]@{
                     conditions = [pscustomobject]@{ users = [pscustomobject]@{
-                            excludeUsers = @($CheckExististing.conditions.users.excludeUsers + $UserID)
+                            excludeUsers = @($CheckExisting.conditions.users.excludeUsers + $UserID)
                         }
                     }
                 }
             }
 
             $RawJson = ConvertTo-Json -Depth 10 -InputObject $NewExclusions
             if ($PSCmdlet.ShouldProcess($PolicyId, "Add exclusion for $UserID")) {
-                New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/identity/conditionalAccess/policies/$($CheckExististing.id)" -tenantid $tenantfilter -type PATCH -body $RawJSON -AsApp $true
+                New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/identity/conditionalAccess/policies/$($CheckExisting.id)" -tenantid $tenantfilter -type PATCH -body $RawJSON -AsApp $true
             }
         }
 
@@ -59,24 +59,24 @@ function Set-CIPPCAExclusion {
             }
             $NewExclusions = [pscustomobject]@{
                 conditions = [pscustomobject]@{ users = [pscustomobject]@{
-                        excludeUsers = @($CheckExististing.conditions.users.excludeUsers | Where-Object { $UserID -notcontains $_ })
+                        excludeUsers = @($CheckExisting.conditions.users.excludeUsers | Where-Object { $UserID -notcontains $_ })
                     }
                 }
             }
             $RawJson = ConvertTo-Json -Depth 10 -InputObject $NewExclusions
             if ($PSCmdlet.ShouldProcess($PolicyId, "Remove exclusion for $UserID")) {
-                New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/identity/conditionalAccess/policies/$($CheckExististing.id)" -tenantid $tenantfilter -type PATCH -body $RawJSON -AsApp $true
+                New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/identity/conditionalAccess/policies/$($CheckExisting.id)" -tenantid $tenantfilter -type PATCH -body $RawJSON -AsApp $true
             }
         }
 
         foreach ($User in $Username) {
-            "Successfully performed $($ExclusionType) exclusion for $User from policy $($PolicyId)"
-            Write-LogMessage -headers $Headers -API 'Set-CIPPCAExclusion' -message "Successfully performed $($ExclusionType) exclusion for $User from policy $($PolicyId)" -Sev 'Info' -tenant $TenantFilter
+            "Successfully performed $($ExclusionType) exclusion for $User from policy $($CheckExisting.displayName)"
+            Write-LogMessage -headers $Headers -API 'Set-CIPPCAExclusion' -message "Successfully performed $($ExclusionType) exclusion for $User from policy $($CheckExisting.displayName)" -Sev 'Info' -tenant $TenantFilter
         }
     } catch {
         foreach ($User in $Username) {
-            "Failed to $($ExclusionType) user exclusion for $User from policy $($PolicyId): $($_.Exception.Message)"
-            Write-LogMessage -headers $Headers -API 'Set-CIPPCAExclusion' -message "Failed to $($ExclusionType) user exclusion for $User from policy $($PolicyId): $_" -Sev 'Error' -tenant $TenantFilter -LogData (Get-CippException -Exception $_)
+            "Failed to $($ExclusionType) user exclusion for $User from policy $($CheckExisting.displayName): $($_.Exception.Message)"
+            Write-LogMessage -headers $Headers -API 'Set-CIPPCAExclusion' -message "Failed to $($ExclusionType) user exclusion for $User from policy $($CheckExisting.displayName): $_" -Sev 'Error' -tenant $TenantFilter -LogData (Get-CippException -Exception $_)
         }
     }
 }