Skip to content

Commit dc0df58

Browse files
committed
group template edit support
also normalize property casing
1 parent 46cc031 commit dc0df58

File tree

2 files changed

+21
-14
lines changed

2 files changed

+21
-14
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using namespace System.Net
22

3-
Function Invoke-AddGroupTemplate {
3+
function Invoke-AddGroupTemplate {
44
<#
55
.FUNCTIONALITY
66
Entrypoint,AnyTenant
@@ -13,27 +13,27 @@ Function Invoke-AddGroupTemplate {
1313
$Headers = $Request.Headers
1414
Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
1515

16-
$GUID = (New-Guid).GUID
16+
$GUID = $Request.Body.GUID ?? (New-Guid).GUID
1717
try {
18-
if (!$Request.body.displayname) { throw 'You must enter a displayname' }
18+
if (!$Request.Body.displayname) { throw 'You must enter a displayname' }
1919

2020
$object = [PSCustomObject]@{
21-
Displayname = $request.body.displayName
22-
Description = $request.body.description
23-
groupType = $request.body.groupType
24-
MembershipRules = $request.body.membershipRules
25-
allowExternal = $request.body.allowExternal
26-
username = $request.body.username
21+
displayName = $Request.Body.displayName
22+
description = $Request.Body.description
23+
groupType = $Request.Body.groupType
24+
membershipRules = $Request.Body.membershipRules
25+
allowExternal = $Request.Body.allowExternal
26+
username = $Request.Body.username
2727
GUID = $GUID
2828
} | ConvertTo-Json
2929
$Table = Get-CippTable -tablename 'templates'
3030
$Table.Force = $true
31-
Add-CIPPAzDataTableEntity @Table -Entity @{
31+
Add-CIPPAzDataTableEntity @Table -Force -Entity @{
3232
JSON = "$object"
3333
RowKey = "$GUID"
3434
PartitionKey = 'GroupTemplate'
3535
}
36-
Write-LogMessage -headers $Request.Headers -API $APINAME -message "Created Group template named $($Request.body.displayname) with GUID $GUID" -Sev 'Debug'
36+
Write-LogMessage -headers $Request.Headers -API $APINAME -message "Created Group template named $($Request.Body.displayname) with GUID $GUID" -Sev 'Debug'
3737

3838
$body = [pscustomobject]@{'Results' = 'Successfully added template' }
3939
} catch {

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using namespace System.Net
22

3-
Function Invoke-ListGroupTemplates {
3+
function Invoke-ListGroupTemplates {
44
<#
55
.FUNCTIONALITY
66
Entrypoint,AnyTenant
@@ -22,8 +22,15 @@ Function Invoke-ListGroupTemplates {
2222
$Filter = "PartitionKey eq 'GroupTemplate'"
2323
$Templates = (Get-CIPPAzDataTableEntity @Table -Filter $Filter) | ForEach-Object {
2424
$data = $_.JSON | ConvertFrom-Json
25-
$data | Add-Member -MemberType NoteProperty -Name GUID -Value $_.RowKey -Force
26-
$data
25+
[PSCustomObject]@{
26+
displayName = $data.displayName
27+
description = $data.description
28+
groupType = $data.groupType
29+
membershipRules = $data.membershipRules
30+
allowExternal = $data.allowExternal
31+
username = $data.username
32+
GUID = $_.RowKey
33+
}
2734
} | Sort-Object -Property displayName
2835

2936
if ($Request.query.ID) { $Templates = $Templates | Where-Object -Property GUID -EQ $Request.query.id }

0 commit comments

Comments
 (0)