Merge pull request KelvinTegelaar#1768 from kris6673/happy-gary-happy-life

Fix: Enhance error handling for user creation tasks

Author: KelvinTegelaar

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-AddUser.ps1

@@ -27,48 +27,62 @@ function Invoke-AddUser {
     }
 
     if ($UserObj.Scheduled.Enabled) {
-        $Username = $UserObj.username ?? $UserObj.mailNickname
-        $TaskBody = [pscustomobject]@{
-            TenantFilter  = $UserObj.tenantFilter
-            Name          = "New user creation: $($Username)@$($UserObj.PrimDomain.value)"
-            Command       = @{
-                value = 'New-CIPPUserTask'
-                label = 'New-CIPPUserTask'
+        try {
+            $Username = $UserObj.username ?? $UserObj.mailNickname
+            $TaskBody = [pscustomobject]@{
+                TenantFilter  = $UserObj.tenantFilter
+                Name          = "New user creation: $($Username)@$($UserObj.PrimDomain.value)"
+                Command       = @{
+                    value = 'New-CIPPUserTask'
+                    label = 'New-CIPPUserTask'
+                }
+                Parameters    = [pscustomobject]@{ UserObj = $UserObj }
+                ScheduledTime = $UserObj.Scheduled.date
+                Reference     = $UserObj.reference ?? $null
+                PostExecution = @{
+                    Webhook = [bool]$Request.Body.PostExecution.Webhook
+                    Email   = [bool]$Request.Body.PostExecution.Email
+                    PSA     = [bool]$Request.Body.PostExecution.PSA
+                }
             }
-            Parameters    = [pscustomobject]@{ UserObj = $UserObj }
-            ScheduledTime = $UserObj.Scheduled.date
-            Reference     = $UserObj.reference ?? $null
-            PostExecution = @{
-                Webhook = [bool]$Request.Body.PostExecution.Webhook
-                Email   = [bool]$Request.Body.PostExecution.Email
-                PSA     = [bool]$Request.Body.PostExecution.PSA
+            Add-CIPPScheduledTask -Task $TaskBody -hidden $false -DisallowDuplicateName $true -Headers $Headers
+            $body = [pscustomobject] @{
+                'Results' = @("Successfully created scheduled task to create user $($UserObj.DisplayName)")
             }
-        }
-        Add-CIPPScheduledTask -Task $TaskBody -hidden $false -DisallowDuplicateName $true -Headers $Headers
-        $body = [pscustomobject] @{
-            'Results' = @("Successfully created scheduled task to create user $($UserObj.DisplayName)")
+        } catch {
+            $body = [pscustomobject] @{
+                'Results' = @("Failed to create scheduled task to create user $($UserObj.DisplayName): $($_.Exception.Message)")
+            }
+            $StatusCode = [HttpStatusCode]::InternalServerError
         }
     } else {
-        $CreationResults = New-CIPPUserTask -UserObj $UserObj -APIName $APIName -Headers $Headers
-        $body = [pscustomobject] @{
-            'Results'  = @(
-                $CreationResults.Results[0],
-                $CreationResults.Results[1],
-                @{
-                    'resultText' = $CreationResults.Results[2]
-                    'copyField'  = $CreationResults.password
-                    'state'      = 'success'
+        try {
+            $CreationResults = New-CIPPUserTask -UserObj $UserObj -APIName $APIName -Headers $Headers
+            $body = [pscustomobject] @{
+                'Results'  = @(
+                    $CreationResults.Results[0],
+                    $CreationResults.Results[1],
+                    @{
+                        'resultText' = $CreationResults.Results[2]
+                        'copyField'  = $CreationResults.password
+                        'state'      = 'success'
+                    }
+                )
+                'CopyFrom' = @{
+                    'Success' = $CreationResults.CopyFrom.Success
+                    'Error'   = $CreationResults.CopyFrom.Error
                 }
-            )
-            'CopyFrom' = @{
-                'Success' = $CreationResults.CopyFrom.Success
-                'Error'   = $CreationResults.CopyFrom.Error
+                'User'     = $CreationResults.User
+            }
+        } catch {
+            $body = [pscustomobject] @{
+                'Results' = @("$($_.Exception.Message)")
             }
-            'User'     = $CreationResults.User
+            $StatusCode = [HttpStatusCode]::InternalServerError
         }
     }
     return ([HttpResponseContext]@{
-            StatusCode = [HttpStatusCode]::OK
+            StatusCode = $StatusCode ? $StatusCode : [HttpStatusCode]::OK
             Body       = $Body
         })
 

Modules/CIPPCore/Public/New-CIPPUserTask.ps1

@@ -14,15 +14,15 @@ function New-CIPPUserTask {
         $Results.Add("Username: $($CreationResults.Username)")
         $Results.Add("Password: $($CreationResults.Password)")
     } catch {
-        $Results.Add("Failed to create user. $($_.Exception.Message)" )
-        return @{'Results' = $Results }
+        $Results.Add("$($_.Exception.Message)" )
+        throw @{'Results' = $Results }
     }
 
     try {
         if ($UserObj.licenses.value) {
             if ($UserObj.sherwebLicense.value) {
-                $License = Set-SherwebSubscription -Headers $Headers -TenantFilter $UserObj.tenantFilter -SKU $UserObj.sherwebLicense.value -Add 1
-                $null = $results.Add('Added Sherweb License, scheduling assignment')
+                $null = Set-SherwebSubscription -Headers $Headers -TenantFilter $UserObj.tenantFilter -SKU $UserObj.sherwebLicense.value -Add 1
+                $null = $Results.Add('Added Sherweb License, scheduling assignment')
                 $taskObject = [PSCustomObject]@{
                     TenantFilter  = $UserObj.tenantFilter
                     Name          = "Assign License: $UserPrincipalName"