Merge pull request #307 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecTenantGroup.ps1

@@ -7,7 +7,7 @@ function Invoke-ExecTenantGroup {
     .FUNCTIONALITY
         Entrypoint,AnyTenant
     .ROLE
-        Tenant.Config.ReadWrite
+        TenantGroups.Config.ReadWrite
     #>
     [CmdletBinding()]
     param($Request, $TriggerMetadata)
@@ -57,9 +57,9 @@ function Invoke-ExecTenantGroup {
                 }
                 $MemberEntity = @{
                     PartitionKey = 'Member'
-                    RowKey     = '{0}-{1}' -f $groupId, $member.value
-                    GroupId    = $groupId
-                    customerId = $member.value
+                    RowKey       = '{0}-{1}' -f $groupId, $member.value
+                    GroupId      = $groupId
+                    customerId   = $member.value
                 }
                 Add-CIPPAzDataTableEntity @MembersTable -Entity $MemberEntity -Force
                 $Adds.Add('Added member {0}' -f $member.label)

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Endpoint/Applications/Invoke-AddChocoApp.ps1

@@ -16,7 +16,7 @@ Function Invoke-AddChocoApp {
 
     $ChocoApp = $Request.Body
     $intuneBody = Get-Content 'AddChocoApp\Choco.app.json' | ConvertFrom-Json
-    $AssignTo = $Request.Body.AssignTo
+    $AssignTo = $Request.Body.AssignTo -eq 'customGroup' ? $Request.Body.CustomGroup : $Request.Body.AssignTo
     $intuneBody.description = $ChocoApp.description
     $intuneBody.displayName = $ChocoApp.ApplicationName
     $intuneBody.installExperience.runAsAccount = if ($ChocoApp.InstallAsSystem) { 'system' } else { 'user' }

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Application Approval/Invoke-ExecAppPermissionTemplate.ps1

@@ -3,7 +3,7 @@ function Invoke-ExecAppPermissionTemplate {
     .FUNCTIONALITY
         Entrypoint,AnyTenant
     .ROLE
-        Tenant.Application.ReadWrite
+        Tenant.ApplicationTemplates.ReadWrite
     #>
     [CmdletBinding()]
     param($Request, $TriggerMetadata)

Modules/CIPPCore/Public/Set-CIPPAssignedApplication.ps1

@@ -9,7 +9,7 @@ function Set-CIPPAssignedApplication {
         $APIName = 'Assign Application',
         $Headers
     )
-
+    Write-Host "GroupName: $GroupName Intent: $Intent AppType: $AppType ApplicationId: $ApplicationId TenantFilter: $TenantFilter APIName: $APIName"
     try {
         $MobileAppAssignment = switch ($GroupName) {
             'AllUsers' {

profile.ps1

@@ -13,7 +13,7 @@
 # Remove this if you are not planning on using MSI or Azure PowerShell.
 
 # Import modules
-@('CIPPCore', 'CippExtensions', 'Az.KeyVault', 'Az.Accounts') | ForEach-Object {
+@('CIPPCore', 'CippExtensions', 'Az.KeyVault', 'Az.Accounts', 'AzBobbyTables') | ForEach-Object {
     try {
         $Module = $_
         Import-Module -Name $_ -ErrorAction Stop