Merge pull request KelvinTegelaar#1420 from Ren-Roros-Digital/OutOfOffice

chore: SetOoO consistent variables

Author: KelvinTegelaar

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Administration/Invoke-ExecSetOoO.ps1

@@ -11,33 +11,33 @@ Function Invoke-ExecSetOoO {
     param($Request, $TriggerMetadata)
     try {
         $APIName = $Request.Params.CIPPEndpoint
-        Write-LogMessage -headers $Request.Headers -API $APINAME -message 'Accessed this API' -Sev 'Debug'
-        $Username = $request.body.userId
-        $Tenantfilter = $request.body.tenantfilter
-        if ($Request.body.input) {
-            $InternalMessage = $Request.body.input
-            $ExternalMessage = $Request.body.input
+        Write-LogMessage -headers $Request.Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
+        $Username = $Request.Body.userId
+        $TenantFilter = $Request.Body.tenantFilter
+        if ($Request.Body.input) {
+            $InternalMessage = $Request.Body.input
+            $ExternalMessage = $Request.Body.input
         } else {
-            $InternalMessage = $Request.body.InternalMessage
-            $ExternalMessage = $Request.body.ExternalMessage
+            $InternalMessage = $Request.Body.InternalMessage
+            $ExternalMessage = $Request.Body.ExternalMessage
         }
         #if starttime and endtime are a number, they are unix timestamps and need to be converted to datetime, otherwise just use them.
-        $StartTime = if ($Request.body.StartTime -match '^\d+$') { [DateTimeOffset]::FromUnixTimeSeconds([int]$Request.body.StartTime).DateTime } else { $Request.body.StartTime }
-        $EndTime = if ($Request.body.EndTime -match '^\d+$') { [DateTimeOffset]::FromUnixTimeSeconds([int]$Request.body.EndTime).DateTime } else { $Request.body.EndTime }
+        $StartTime = if ($Request.Body.StartTime -match '^\d+$') { [DateTimeOffset]::FromUnixTimeSeconds([int]$Request.Body.StartTime).DateTime } else { $Request.Body.StartTime }
+        $EndTime = if ($Request.Body.EndTime -match '^\d+$') { [DateTimeOffset]::FromUnixTimeSeconds([int]$Request.Body.EndTime).DateTime } else { $Request.Body.EndTime }
 
         $Results = try {
             if ($Request.Body.AutoReplyState.value -ne 'Scheduled') {
-                Set-CIPPOutOfOffice -userid $Username -tenantFilter $TenantFilter -APIName $APINAME -Headers $Request.Headers -InternalMessage $InternalMessage -ExternalMessage $ExternalMessage -State $Request.Body.AutoReplyState.value
+                Set-CIPPOutOfOffice -userid $Username -tenantFilter $TenantFilter -APIName $APIName -Headers $Request.Headers -InternalMessage $InternalMessage -ExternalMessage $ExternalMessage -State $Request.Body.AutoReplyState.value
             } else {
-                Set-CIPPOutOfOffice -userid $Username -tenantFilter $TenantFilter -APIName $APINAME -Headers $Request.Headers -InternalMessage $InternalMessage -ExternalMessage $ExternalMessage -StartTime $StartTime -EndTime $EndTime -State $Request.Body.AutoReplyState.value
+                Set-CIPPOutOfOffice -userid $Username -tenantFilter $TenantFilter -APIName $APIName -Headers $Request.Headers -InternalMessage $InternalMessage -ExternalMessage $ExternalMessage -StartTime $StartTime -EndTime $EndTime -State $Request.Body.AutoReplyState.value
             }
         } catch {
-            "Could not add out of office message for $($username). Error: $($_.Exception.Message)"
+            "Could not add out of office message for $($Username). Error: $($_.Exception.Message)"
         }
 
-        $body = [pscustomobject]@{'Results' = $($results) }
+        $Body = [PSCustomObject]@{'Results' = $($Results) }
     } catch {
-        $body = [pscustomobject]@{'Results' = "Could not set Out of Office user: $($_.Exception.message)" }
+        $Body = [PSCustomObject]@{'Results' = "Could not set Out of Office user: $($_.Exception.Message)" }
     }
 
     # Associate values to output bindings by calling 'Push-OutputBinding'.

Modules/CIPPCore/Public/Set-CIPPOutOfoffice.ps1

@@ -21,8 +21,8 @@ function Set-CIPPOutOfOffice {
         }
         if ($State -ne 'Scheduled') {
             $null = New-ExoRequest -tenantid $TenantFilter -cmdlet 'Set-MailboxAutoReplyConfiguration' -cmdParams @{Identity = $userid; AutoReplyState = $State; InternalMessage = $InternalMessage; ExternalMessage = $ExternalMessage } -Anchor $userid
-            Write-LogMessage -headers $Headers -API $APIName -message "Set Out-of-office for $($userid) to $state" -Sev 'Info' -tenant $TenantFilter
-            return "Set Out-of-office for $($userid) to $state."
+            Write-LogMessage -headers $Headers -API $APIName -message "Set Out-of-office for $($userid) to $State" -Sev 'Info' -tenant $TenantFilter
+            return "Set Out-of-office for $($userid) to $State."
         } else {
             $null = New-ExoRequest -tenantid $TenantFilter -cmdlet 'Set-MailboxAutoReplyConfiguration' -cmdParams @{Identity = $userid; AutoReplyState = $State; InternalMessage = $InternalMessage; ExternalMessage = $ExternalMessage; StartTime = $StartTime; EndTime = $EndTime } -Anchor $userid
             Write-LogMessage -headers $Headers -API $APIName -message "Scheduled Out-of-office for $($userid) between $StartTime and $EndTime" -Sev 'Info' -tenant $TenantFilter

Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardIntuneTemplate.ps1

@@ -120,7 +120,7 @@ function Invoke-CIPPStandardIntuneTemplate {
                 Set-CIPPIntunePolicy -TemplateType $TemplateFile.body.Type -Description $TemplateFile.description -DisplayName $TemplateFile.displayname -RawJSON $templateFile.rawJSON -AssignTo $TemplateFile.AssignTo -ExcludeGroup $TemplateFile.excludeGroup -tenantFilter $Tenant
             } catch {
                 $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
-                Write-LogMessage -API 'Standards' -tenant $tenant -message "Failed to create or update Intune Template $PolicyName, Error: $ErrorMessage" -sev 'Error'
+                Write-LogMessage -API 'Standards' -tenant $tenant -message "Failed to create or update Intune Template $($TemplateFile.displayname), Error: $ErrorMessage" -sev 'Error'
             }
         }