implement KelvinTegelaar#1550

simplify http function output
always return [HttpResponseContext]

thanks @kris6673!

Author: JohnDuprey

Modules/CIPPCore/Public/Authentication/Test-CIPPAccess.ps1

@@ -79,7 +79,7 @@ function Test-CIPPAccess {
         }
         if ($Request.Params.CIPPEndpoint -eq 'me') {
             $Permissions = Get-CippAllowedPermissions -UserRoles $CustomRoles
-            Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+            return ([HttpResponseContext]@{
                     StatusCode = [HttpStatusCode]::OK
                     Body       = (
                         @{
@@ -90,7 +90,6 @@ function Test-CIPPAccess {
                             'permissions'     = $Permissions
                         } | ConvertTo-Json -Depth 5)
                 })
-            return
         }
 
     } else {
@@ -107,7 +106,7 @@ function Test-CIPPAccess {
         if ($Request.Params.CIPPEndpoint -eq 'me') {
 
             if (!$User.userRoles) {
-                Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+                return ([HttpResponseContext]@{
                         StatusCode = [HttpStatusCode]::OK
                         Body       = (
                             @{
@@ -118,15 +117,14 @@ function Test-CIPPAccess {
             }
 
             $Permissions = Get-CippAllowedPermissions -UserRoles $User.userRoles
-            Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+            return ([HttpResponseContext]@{
                     StatusCode = [HttpStatusCode]::OK
                     Body       = (
                         @{
                             'clientPrincipal' = $User
                             'permissions'     = $Permissions
                         } | ConvertTo-Json -Depth 5)
                 })
-            return
         }
 
         if ($User.userRoles -contains 'admin' -or $User.userRoles -contains 'superadmin') {

Modules/CIPPCore/Public/CippQueue/Invoke-ListCippQueue.ps1

@@ -74,7 +74,7 @@ function Invoke-ListCippQueue {
     }
 
     if ($request) {
-        Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+        return ([HttpResponseContext]@{
                 StatusCode = [HttpStatusCode]::OK
                 Body       = @($QueueData)
             })

Modules/CIPPCore/Public/CippQueue/Invoke-RemoveCippQueue.ps1

@@ -9,14 +9,14 @@ function Invoke-RemoveCippQueue {
 
     $APIName = $Request.Params.CIPPEndpoint
     $Headers = $Request.Headers
-    Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
+
 
     $CippQueue = Get-CippTable -TableName 'CippQueue'
     Clear-AzDataTable @CippQueue
     $CippQueueTasks = Get-CippTable -TableName 'CippQueueTasks'
     Clear-AzDataTable @CippQueueTasks
 
-    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+    return ([HttpResponseContext]@{
             StatusCode = [HttpStatusCode]::OK
             Body       = @{Results = @('History cleared') }
         })

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecAddAlert.ps1

@@ -12,7 +12,7 @@ function Invoke-ExecAddAlert {
 
     $APIName = $Request.Params.CIPPEndpoint
     $Headers = $Request.Headers
-    Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
+
 
     $Severity = 'Alert'
 
@@ -70,7 +70,7 @@ function Invoke-ExecAddAlert {
         Write-LogMessage -headers $Headers -API 'Alerts' -message $Request.Body.text -Sev $Severity
         'Successfully generated alert.'
     }
-    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+    return ([HttpResponseContext]@{
             StatusCode = [HttpStatusCode]::OK
             Body       = $Result
         })

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecAzBobbyTables.ps1

@@ -15,7 +15,7 @@ function Invoke-ExecAzBobbyTables {
 
     $APIName = $Request.Params.CIPPEndpoint
     $Headers = $Request.Headers
-    Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
+
 
     $AllowList = @(
         'Add-AzDataTableEntity'
@@ -57,7 +57,7 @@ function Invoke-ExecAzBobbyTables {
         $StatusCode = [HttpStatusCode]::NotFound
     }
 
-    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+    return ([HttpResponseContext]@{
             StatusCode = $StatusCode
             Body       = @($Results)
         })

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecCPVRefresh.ps1

@@ -14,11 +14,11 @@ function Invoke-ExecCPVRefresh {
 
     $APIName = $Request.Params.CIPPEndpoint
     $Headers = $Request.Headers
-    Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
+
 
     $InstanceId = Start-UpdatePermissionsOrchestrator
 
-    Push-OutputBinding -Name Response -Value @{
+    return @{
         StatusCode = [System.Net.HttpStatusCode]::OK
         Body       = @{
             Results    = 'CPV Refresh has been triggered'

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecCippFunction.ps1

@@ -14,7 +14,7 @@ function Invoke-ExecCippFunction {
 
     $APIName = $Request.Params.CIPPEndpoint
     $Headers = $Request.Headers
-    Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
+
 
     $BlockList = @(
         'Get-GraphToken'
@@ -45,7 +45,7 @@ function Invoke-ExecCippFunction {
         $StatusCode = [HttpStatusCode]::NotFound
     }
 
-    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+    return ([HttpResponseContext]@{
             StatusCode = $StatusCode
             Body       = $Results
         })

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecDurableFunctions.ps1

@@ -10,7 +10,7 @@ function Invoke-ExecDurableFunctions {
 
     $APIName = $Request.Params.CIPPEndpoint
     $Headers = $Request.Headers
-    Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
+
 
     # Collect info
     $StorageContext = New-AzStorageContext -ConnectionString $env:AzureWebJobsStorage
@@ -170,7 +170,7 @@ function Invoke-ExecDurableFunctions {
         }
     }
 
-    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+    return ([HttpResponseContext]@{
             StatusCode = [HttpStatusCode]::OK
             Body       = $Body
         })

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecEditTemplate.ps1

@@ -12,7 +12,7 @@ function Invoke-ExecEditTemplate {
 
     $APIName = $Request.Params.CIPPEndpoint
     $Headers = $Request.Headers
-    Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
+
 
     try {
         $Table = Get-CippTable -tablename 'templates'
@@ -45,7 +45,7 @@ function Invoke-ExecEditTemplate {
 
 
     # Associate values to output bindings by calling 'Push-OutputBinding'.
-    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+    return ([HttpResponseContext]@{
             StatusCode = [HttpStatusCode]::OK
             Body       = $body
         })

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecGeoIPLookup.ps1

@@ -12,7 +12,7 @@ Function Invoke-ExecGeoIPLookup {
 
     $APIName = $Request.Params.CIPPEndpoint
     $Headers = $Request.Headers
-    Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
+
 
     $IP = $Request.Query.IP ?? $Request.Body.IP
 
@@ -24,7 +24,7 @@ Function Invoke-ExecGeoIPLookup {
     }
 
     # Associate values to output bindings by calling 'Push-OutputBinding'.
-    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+    return ([HttpResponseContext]@{
             StatusCode = [HttpStatusCode]::OK
             Body       = $LocationInfo
         })