Merge pull request KelvinTegelaar#1454 from kris6673/add-team-modernize

Feat: Improve error handling and logging in team creation

Author: KelvinTegelaar

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

@@ -21,7 +21,7 @@ Function Invoke-ExecGroupsDelete {
     $DisplayName = $Request.Query.displayName ?? $Request.Body.displayName
 
     Try {
-        $Result = Remove-CIPPGroup -ID $ID -Grouptype $GroupType -TenantFilter $TenantFilter -DisplayName $DisplayName -APIName $APIName -Headers $Headers
+        $Result = Remove-CIPPGroup -ID $ID -GroupType $GroupType -TenantFilter $TenantFilter -DisplayName $DisplayName -APIName $APIName -Headers $Headers
         $StatusCode = [HttpStatusCode]::OK
     } catch {
         $Result = "$($_.Exception.Message)"

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Teams-Sharepoint/Invoke-AddTeam.ps1

@@ -14,14 +14,14 @@ Function Invoke-AddTeam {
     $Headers = $Request.Headers
     Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
 
-    $userobj = $Request.body
+    # Interact with the body of the request
+    $TeamObj = $Request.Body
+    $TenantID = $TeamObj.tenantid
 
-
-
-    $Owners = ($userobj.owner)
+    $Owners = ($TeamObj.owner)
     try {
         if ($null -eq $Owners) {
-            throw "You have to add at least one owner to the team"
+            throw 'You have to add at least one owner to the team'
         }
         $Owners = $Owners | ForEach-Object {
             $OwnerID = "https://graph.microsoft.com/beta/users('$($_)')"
@@ -34,28 +34,31 @@ Function Invoke-AddTeam {
 
         $TeamsSettings = [PSCustomObject]@{
             'template@odata.bind' = "https://graph.microsoft.com/v1.0/teamsTemplates('standard')"
-            'visibility'          = $userobj.visibility
-            'displayName'         = $userobj.displayname
-            'description'         = $userobj.description
-            'members'             = @($owners)
+            'visibility'          = $TeamObj.visibility
+            'displayName'         = $TeamObj.displayName
+            'description'         = $TeamObj.description
+            'members'             = @($Owners)
 
         } | ConvertTo-Json -Depth 10
+        # Write-Host $TeamsSettings
 
-        Write-Host $TeamsSettings
-        New-GraphPostRequest -AsApp $true -uri 'https://graph.microsoft.com/beta/teams' -tenantid $Userobj.tenantid -type POST -body $TeamsSettings -verbose
-        Write-LogMessage -headers $Request.Headers -API $APINAME -tenant $($userobj.tenantid) -message "Added Team $($userobj.displayname)" -Sev 'Info'
-        $body = [pscustomobject]@{'Results' = 'Success. Team has been added' }
+        $null = New-GraphPostRequest -AsApp $true -uri 'https://graph.microsoft.com/beta/teams' -tenantid $TenantID -type POST -body $TeamsSettings -Verbose
+        $Message = "Successfully created Team: '$($TeamObj.displayName)'"
+        Write-LogMessage -headers $Headers -API $APINAME -tenant $TenantID -message $Message -Sev Info
+        $StatusCode = [HttpStatusCode]::OK
 
     } catch {
-        Write-LogMessage -headers $Request.Headers -API $APINAME -tenant $($userobj.tenantid) -message "Adding Team failed. Error: $($_.Exception.Message)" -Sev 'Error'
-        $body = [pscustomobject]@{'Results' = "Failed. Error message: $($_.Exception.Message)" }
+        $ErrorMessage = Get-CippException -Exception $_
+        $Message = "Failed to create Team: '$($TeamObj.displayName)'. Error: $($ErrorMessage.NormalizedError)"
+        Write-LogMessage -headers $Headers -API $APINAME -tenant $TenantID -message $Message -Sev Error -LogData $ErrorMessage
+        $StatusCode = [HttpStatusCode]::InternalServerError
     }
 
 
     # Associate values to output bindings by calling 'Push-OutputBinding'.
     Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
-            StatusCode = [HttpStatusCode]::OK
-            Body       = $Body
+            StatusCode = $StatusCode
+            Body       = @{ Results = $Message }
         })
 
 }