Merge pull request KelvinTegelaar#1516 from kris6673/clear-form

Fix: Fix incorrect success response handling in group creation

Author: KelvinTegelaar

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Groups/Invoke-AddGroup.ps1

@@ -36,14 +36,12 @@ function Invoke-AddGroup {
                     if ($GroupObject.groupType -eq 'm365') {
                         $BodyParams | Add-Member -NotePropertyName 'groupTypes' -NotePropertyValue @('Unified', 'DynamicMembership')
                         $BodyParams.mailEnabled = $true
-                    }
-                    else {
+                    } else {
                         $BodyParams | Add-Member -NotePropertyName 'groupTypes' -NotePropertyValue @('DynamicMembership')
                     }
                     # Skip adding static members if we're using dynamic membership
                     $SkipStaticMembers = $true
-                }
-                elseif ($GroupObject.groupType -eq 'm365') {
+                } elseif ($GroupObject.groupType -eq 'm365') {
                     $BodyParams | Add-Member -NotePropertyName 'groupTypes' -NotePropertyValue @('Unified')
                     $BodyParams.mailEnabled = $true
                 }
@@ -56,17 +54,15 @@ function Invoke-AddGroup {
                     $BodyParams.'[email protected]' = @($BodyParams.'[email protected]')
                 }
                 $GraphRequest = New-GraphPostRequest -uri 'https://graph.microsoft.com/beta/groups' -tenantid $tenant -type POST -body (ConvertTo-Json -InputObject $BodyParams -Depth 10) -Verbose
-            }
-            else {
+            } else {
                 if ($GroupObject.groupType -eq 'dynamicDistribution') {
                     $ExoParams = @{
                         Name               = $GroupObject.displayName
                         RecipientFilter    = $GroupObject.membershipRules
                         PrimarySmtpAddress = $Email
                     }
                     $GraphRequest = New-ExoRequest -tenantid $tenant -cmdlet 'New-DynamicDistributionGroup' -cmdParams $ExoParams
-                }
-                else {
+                } else {
                     $ExoParams = @{
                         Name                               = $GroupObject.displayName
                         Alias                              = $GroupObject.username
@@ -87,19 +83,18 @@ function Invoke-AddGroup {
 
             "Successfully created group $($GroupObject.displayName) for $($tenant)"
             Write-LogMessage -headers $Request.Headers -API $APIName -tenant $tenant -message "Created group $($GroupObject.displayName) with id $($GraphRequest.id)" -Sev Info
-
-        }
-        catch {
+            $StatusCode = [HttpStatusCode]::OK
+        } catch {
             $ErrorMessage = Get-CippException -Exception $_
             Write-LogMessage -headers $Request.Headers -API $APIName -tenant $tenant -message "Group creation API failed. $($ErrorMessage.NormalizedError)" -Sev Error -LogData $ErrorMessage
             "Failed to create group. $($GroupObject.displayName) for $($tenant) $($ErrorMessage.NormalizedError)"
+            $StatusCode = [HttpStatusCode]::InternalServerError
         }
     }
-    $ResponseBody = [pscustomobject]@{'Results' = @($Results) }
 
     # Associate values to output bindings by calling 'Push-OutputBinding'.
     Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
-            StatusCode = [HttpStatusCode]::OK
-            Body       = $ResponseBody
+            StatusCode = $StatusCode
+            Body       = @{'Results' = @($Results) }
         })
 }