Merge pull request #200 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecOnboardTenantQueue.ps1

@@ -233,7 +233,8 @@ Function Push-ExecOnboardTenantQueue {
                 $Logs.Add([PSCustomObject]@{ Date = (Get-Date).ToUniversalTime(); Log = 'Checking for missing groups for SAM user' })
                 $SamUserId = (New-GraphGetRequest -uri "https://graph.microsoft.com/beta/me?`$select=id" -NoAuthCheck $true).id
                 $CurrentMemberships = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/me/transitiveMemberOf?`$select=id,displayName" -NoAuthCheck $true
-                foreach ($Role in $Item.Roles) {
+                $ExpectedCippRoles = $Item.Roles | Where-Object { $_.roleDefinitionId -in $ExpectedRoles.roleDefinitionId }
+                foreach ($Role in $ExpectedCippRoles) {
                     if ($CurrentMemberships.id -notcontains $Role.GroupId) {
                         $PostBody = @{
                             '@odata.id' = 'https://graph.microsoft.com/v1.0/directoryObjects/{0}' -f $SamUserId

Modules/CIPPCore/Public/Entrypoints/Invoke-ExecExtensionNinjaOneQueue.ps1

@@ -18,4 +18,13 @@ Function Invoke-ExecExtensionNinjaOneQueue {
         'SyncTenant' { Invoke-NinjaOneTenantSync -QueueItem $QueueItem }
     }
 
+    $Body = [PSCustomObject]@{
+        StatusCode = [HttpStatusCode]::OK
+        Body       = 'Success'
+    }
+
+    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+        StatusCode = [HttpStatusCode]::OK
+        Body       = $Body
+    })
 }

Modules/CIPPCore/Public/Get-CIPPTextReplacement.ps1

@@ -18,7 +18,8 @@ function Get-CIPPTextReplacement {
     if ($Text -isnot [string]) {
         return $Text
     }
-    $blacklist = @(
+
+    $ReservedVariables = @(
         '%serial%',
         '%systemroot%',
         '%systemdrive%',
@@ -27,8 +28,16 @@ function Get-CIPPTextReplacement {
         '%tenantfilter%',
         '%tenantname%',
         '%partnertenantid%',
-        '%samappid%'
+        '%samappid%',
+        '%userprofile%',
+        '%username%',
+        '%userdomain%',
+        '%windir%',
+        '%programfiles%',
+        '%programfiles(x86)%',
+        '%programdata%'
     )
+    
     $Tenant = Get-Tenants -TenantFilter $TenantFilter
     $CustomerId = $Tenant.customerId
 
@@ -54,7 +63,7 @@ function Get-CIPPTextReplacement {
     # Replace custom variables
     foreach ($Replace in $Vars.GetEnumerator()) {
         $String = '%{0}%' -f $Replace.Key
-        if ($string -notin $blacklist) {
+        if ($string -notin $ReservedVariables) {
             $Text = $Text -replace $String, $Replace.Value
         }
     }

Modules/CIPPCore/Public/New-CIPPApplicationCopy.ps1

@@ -22,8 +22,8 @@ function New-CIPPApplicationCopy {
             $ExistingAppRoleAssignments = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/servicePrincipals(appId='$($app)')/appRoleAssignments" -tenantid $env:TenantID -NoAuthCheck $true -AsApp $true
             $Type = 'ServicePrincipal'
         }
-        if (!$ExistingApp) {
-            Write-LogMessage -message "Failed to add $App to tenant. This app does not exist." -tenant $tenant -API 'Application Copy' -sev error
+        if (!$ExistingApp -and !$ExistingAppRoleAssignments) {
+            Write-LogMessage -message "Failed to add $App to tenant. This app does not exist or does not have any consented permissions." -tenant $tenant -API 'Application Copy' -sev error
             continue
         }
         if ($Type -eq 'Application') {

Modules/CippExtensions/Public/NinjaOne/Invoke-NinjaOneTenantSync.ps1

@@ -2141,4 +2141,5 @@ function Invoke-NinjaOneTenantSync {
         $CurrentItem | Add-Member -NotePropertyName lastStatus -NotePropertyValue 'Failed' -Force
         Add-CIPPAzDataTableEntity @MappingTable -Entity $CurrentItem -Force
     }
+    return $true
 }

Modules/CippExtensions/Public/NinjaOne/Push-NinjaOneQueue.ps1

@@ -11,5 +11,5 @@ function Push-NinjaOneQueue {
         'SyncTenant' { Invoke-NinjaOneTenantSync -QueueItem $Item }
         'SyncTenants' { Invoke-NinjaOneSync }
     }
-
-}
+    return $true
+}