Merge pull request #496 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

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

@@ -5,7 +5,7 @@ function Invoke-ExecPartnerWebhook {
     .ROLE
         CIPP.AppSettings.ReadWrite
     #>
-    Param($Request, $TriggerMetadata)
+    param($Request, $TriggerMetadata)
     switch ($Request.Query.Action) {
         'ListEventTypes' {
             $Uri = 'https://api.partnercenter.microsoft.com/webhooks/v1/registration/events'
@@ -72,7 +72,7 @@ function Invoke-ExecPartnerWebhook {
         }
     }
 
-    return @{
+    return [HttpResponseContext]@{
         StatusCode = [System.Net.HttpStatusCode]::OK
         Body       = $Body
     }

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/New-CippCoreRequest.ps1

@@ -50,10 +50,17 @@ function New-CippCoreRequest {
                         return ([HttpResponseContext]($HttpResponse | Select-Object -First 1))
                     } else {
                         # If no valid response context found, create a default success response
-                        return ([HttpResponseContext]@{
-                                StatusCode = [HttpStatusCode]::OK
-                                Body       = $Response
-                            })
+                        if ($Response.PSObject.Properties.Name -contains 'StatusCode' -and $Response.PSObject.Properties.Name -contains 'Body') {
+                            return ([HttpResponseContext]@{
+                                    StatusCode = $Response.StatusCode
+                                    Body       = $Response.Body
+                                })
+                        } else {
+                            return ([HttpResponseContext]@{
+                                    StatusCode = [HttpStatusCode]::OK
+                                    Body       = $Response
+                                })
+                        }
                     }
                 }
             } catch {