Merge pull request #1134 from JohnDuprey/dev

AsApp support
KelvinTegelaar · Oct 3, 2024 · ea2920f · ea2920f
2 parents 2e95af5 + 5958925
commit ea2920f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/...PPCore/Public/Entrypoints/Activity Triggers/Graph Requests/Push-ListGraphRequestQueue.ps1 b/...PPCore/Public/Entrypoints/Activity Triggers/Graph Requests/Push-ListGraphRequestQueue.ps1
@@ -34,6 +34,7 @@ function Push-ListGraphRequestQueue {
             NoPagination                = $Item.NoPagination
             ReverseTenantLookupProperty = $Item.ReverseTenantLookupProperty
             ReverseTenantLookup         = $Item.ReverseTenantLookup
+            AsApp                       = $Item.AsApp ?? $false
             SkipCache                   = $true
         }
 

diff --git a/Modules/CIPPCore/Public/GraphRequests/Get-GraphRequestList.ps1 b/Modules/CIPPCore/Public/GraphRequests/Get-GraphRequestList.ps1
@@ -64,7 +64,8 @@ function Get-GraphRequestList {
         [switch]$CountOnly,
         [switch]$NoAuthCheck,
         [switch]$ReverseTenantLookup,
-        [string]$ReverseTenantLookupProperty = 'tenantId'
+        [string]$ReverseTenantLookupProperty = 'tenantId',
+        [boolean]$AsApp = $false
     )
 
     $SingleTenantThreshold = 8000
@@ -110,6 +111,9 @@ function Get-GraphRequestList {
         if ($NoAuthCheck.IsPresent) {
             $GraphRequest.noauthcheck = $NoAuthCheck.IsPresent
         }
+        if ($AsApp) {
+            $GraphRequest.asApp = $AsApp
+        }
         if ($Parameters.'$count' -and !$SkipCache.IsPresent -and !$NoPagination.IsPresent) {
             $Count = New-GraphGetRequest @GraphRequest -CountOnly -ErrorAction Stop
             if ($CountOnly.IsPresent) { return $Count }
@@ -174,6 +178,8 @@ function Get-GraphRequestList {
                             NoPagination                = $using:NoPagination.IsPresent
                             ReverseTenantLookupProperty = $using:ReverseTenantLookupProperty
                             ReverseTenantLookup         = $using:ReverseTenantLookup.IsPresent
+                            NoAuthCheck                 = $using:NoAuthCheck.IsPresent
+                            AsApp                       = $using:AsApp
                             SkipCache                   = $true
                         }
 
@@ -220,6 +226,7 @@ function Get-GraphRequestList {
                                     PartitionKey                = $PartitionKey
                                     NoPagination                = $NoPagination.IsPresent
                                     NoAuthCheck                 = $NoAuthCheck.IsPresent
+                                    AsApp                       = $AsApp
                                     ReverseTenantLookupProperty = $ReverseTenantLookupProperty
                                     ReverseTenantLookup         = $ReverseTenantLookup.IsPresent
                                 }
@@ -289,7 +296,7 @@ function Get-GraphRequestList {
 
                         $GraphRequestResults = New-GraphGetRequest @GraphRequest -Caller 'Get-GraphRequestList' -ErrorAction Stop
                         if ($GraphRequestResults.nextLink) {
-                            $Metadata['nextLink'] = $GraphRequestResults.nextLink | Select-Object -Last 1
+                            #$Metadata['nextLink'] = $GraphRequestResults.nextLink | Select-Object -Last 1
                             #GraphRequestResults is an array of objects, so we need to remove the last object before returning
                             $GraphRequestResults = $GraphRequestResults | Select-Object -First ($GraphRequestResults.Count - 1)
                         }