Skip to content

Commit 6e216e6

Browse files
small fixes to make things prettier.
1 parent 35c7fb8 commit 6e216e6

2 files changed

Lines changed: 18 additions & 14 deletions

File tree

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

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,24 @@ function Invoke-AddUser {
5858
} else {
5959
try {
6060
$CreationResults = New-CIPPUserTask -UserObj $UserObj -APIName $APIName -Headers $Headers
61+
$ResultsList = [System.Collections.Generic.List[object]]::new()
62+
$ResultsList.Add($CreationResults.Results[0])
63+
$ResultsList.Add(@{
64+
'resultText' = $CreationResults.Results[1]
65+
'copyField' = $CreationResults.Username
66+
'state' = 'success'
67+
})
68+
$ResultsList.Add(@{
69+
'resultText' = $CreationResults.Results[2]
70+
'copyField' = $CreationResults.password
71+
'state' = 'success'
72+
})
73+
# Append any additional results (licenses, groups, aliases, manager, etc.)
74+
foreach ($AdditionalResult in $CreationResults.Results | Select-Object -Skip 3) {
75+
$ResultsList.Add($AdditionalResult)
76+
}
6177
$body = [pscustomobject] @{
62-
'Results' = @(
63-
$CreationResults.Results[0],
64-
@{
65-
'resultText' = $CreationResults.Results[1]
66-
'copyField' = $CreationResults.Username
67-
'state' = 'success'
68-
},
69-
@{
70-
'resultText' = $CreationResults.Results[2]
71-
'copyField' = $CreationResults.password
72-
'state' = 'success'
73-
}
74-
)
78+
'Results' = $ResultsList
7579
'CopyFrom' = @{
7680
'Success' = $CreationResults.CopyFrom.Success
7781
'Error' = $CreationResults.CopyFrom.Error

Modules/CIPPCore/Public/New-CIPPUserTask.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ function New-CIPPUserTask {
7272
if ($UserObj.AddToGroups) {
7373
$UserObj.AddToGroups | ForEach-Object {
7474
try {
75-
$AddMemberResult = Add-CIPPGroupMember -Headers $Headers -GroupType $_.addedFields.groupType -GroupId $_.value -Member $CreationResults.Username -TenantFilter $UserObj.tenantFilter
75+
$AddMemberResult = Add-CIPPGroupMember -Headers $Headers -GroupType $_.addedFields.groupType -GroupId $_.value -Member @($CreationResults.Username) -TenantFilter $UserObj.tenantFilter
7676
$Results.Add($AddMemberResult)
7777
} catch {
7878
$Results.Add("Failed to add to group $($_.label): $_")

0 commit comments

Comments
 (0)