Merge pull request #1239 from JohnDuprey/dev

bugfixes
KelvinTegelaar · Jan 17, 2025 · a286779 · a286779
2 parents 62044da + 80edcde
commit a286779
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/...lic/Entrypoints/HTTP Functions/Identity/Administration/Groups/Invoke-AddGroupTemplate.ps1 b/...lic/Entrypoints/HTTP Functions/Identity/Administration/Groups/Invoke-AddGroupTemplate.ps1
@@ -20,7 +20,7 @@ Function Invoke-AddGroupTemplate {
             Displayname     = $request.body.displayname
             Description     = $request.body.description
             groupType       = $request.body.groupType
-            MembershipRules = $request.body.membershipRule
+            MembershipRules = $request.body.membershipRules
             allowExternal   = $request.body.allowExternal
             username        = $request.body.username
             GUID            = $GUID

diff --git a/...IPPCore/Public/Entrypoints/HTTP Functions/Tenant/Conditional/Invoke-ExecNamedLocation.ps1 b/...IPPCore/Public/Entrypoints/HTTP Functions/Tenant/Conditional/Invoke-ExecNamedLocation.ps1
@@ -17,10 +17,10 @@ Function Invoke-ExecNamedLocation {
     # Write to the Azure Functions log stream.
     Write-Host 'PowerShell HTTP trigger function processed a request.'
 
-    $TenantFilter = $Request.Body.TenantFilter
-    $NamedLocationId = $Request.Body.NamedLocationId
-    $change = $Request.Body.change
-    $content = $Request.Body.input
+    $TenantFilter = $Request.Body.TenantFilter ?? $Request.Query.TenantFilter
+    $NamedLocationId = $Request.Body.NamedLocationId ?? $Request.Query.NamedLocationId
+    $change = $Request.Body.change ?? $Request.Query.change
+    $content = $Request.Body.input ?? $Request.Query.input
 
     try {
         $results = Set-CIPPNamedLocation -NamedLocationId $NamedLocationId -TenantFilter $TenantFilter -change $change -content $content -ExecutingUser $request.headers.'x-ms-client-principal'

diff --git a/Modules/CIPPCore/Public/Invoke-CIPPOffboardingJob.ps1 b/Modules/CIPPCore/Public/Invoke-CIPPOffboardingJob.ps1
@@ -35,21 +35,21 @@ function Invoke-CIPPOffboardingJob {
             Set-CIPPSignInState -TenantFilter $tenantFilter -userid $username -AccountEnabled $false -ExecutingUser $ExecutingUser -APIName $APIName
         }
 
-        { $_.'OnedriveAccess' -ne '' } {
+        { $_.'OnedriveAccess' } {
             $Options.OnedriveAccess | ForEach-Object { Set-CIPPSharePointPerms -tenantFilter $tenantFilter -userid $username -OnedriveAccessUser $_.value -ExecutingUser $ExecutingUser -APIName $APIName }
         }
 
-        { $_.'AccessNoAutomap' -ne '' } {
+        { $_.'AccessNoAutomap' } {
             $Options.AccessNoAutomap | ForEach-Object { Set-CIPPMailboxAccess -tenantFilter $tenantFilter -userid $username -AccessUser $_.value -Automap $false -AccessRights @('FullAccess') -ExecutingUser $ExecutingUser -APIName $APIName }
         }
-        { $_.'AccessAutomap' -ne '' } {
+        { $_.'AccessAutomap' } {
             $Options.AccessAutomap | ForEach-Object { Set-CIPPMailboxAccess -tenantFilter $tenantFilter -userid $username -AccessUser $_.value -Automap $true -AccessRights @('FullAccess') -ExecutingUser $ExecutingUser -APIName $APIName }
         }
 
-        { $_.'OOO' -ne '' } {
+        { $_.'OOO' } {
             Set-CIPPOutOfOffice -tenantFilter $tenantFilter -userid $username -InternalMessage $Options.OOO -ExternalMessage $Options.OOO -ExecutingUser $ExecutingUser -APIName $APIName -state 'Enabled'
         }
-        { $_.'forward' -ne '' } {
+        { $_.'forward' } {
             if (!$Options.keepCopy) {
                 Set-CIPPForwarding -userid $userid -username $username -tenantFilter $Tenantfilter -Forward $Options.forward.value -ExecutingUser $ExecutingUser -APIName $APIName
             } else {