Merge pull request #343 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Teams-Sharepoint/Invoke-ListTeamsVoice.ps1

@@ -16,14 +16,15 @@ function Invoke-ListTeamsVoice {
 
     # Interact with query parameters or the body of the request.
     $TenantFilter = $Request.Query.tenantFilter
-    $TenantId = (Get-Tenants | Where-Object -Property defaultDomainName -EQ $TenantFilter).customerId
+    $TenantId = (Get-Tenants -TenantFilter $TenantFilter).customerId
     try {
         $Users = (New-GraphGetRequest -uri "https://graph.microsoft.com/beta/users?`$top=999&`$select=id,userPrincipalName,displayName" -tenantid $TenantFilter)
         $Skip = 0
         $GraphRequest = do {
             Write-Host "Getting page $Skip"
-            $data = (New-TeamsAPIGetRequest -uri "https://api.interfaces.records.teams.microsoft.com/Skype.TelephoneNumberMgmt/Tenants/$($TenantId)/telephone-numbers?skip=$($Skip)&locale=en-US&top=999" -tenantid $TenantFilter).TelephoneNumbers | ForEach-Object {
-                Write-Host 'Reached the loop'
+            $Results = New-TeamsAPIGetRequest -uri "https://api.interfaces.records.teams.microsoft.com/Skype.TelephoneNumberMgmt/Tenants/$($TenantId)/telephone-numbers?skip=$($Skip)&locale=en-US&top=999" -tenantid $TenantFilter
+            #Write-Information ($Results | ConvertTo-Json -Depth 10)
+            $data = $Results.TelephoneNumbers | ForEach-Object {
                 $CompleteRequest = $_ | Select-Object *, @{Name = 'AssignedTo'; Expression = { $users | Where-Object -Property id -EQ $_.TargetId } }
                 if ($CompleteRequest.AcquisitionDate) {
                     $CompleteRequest.AcquisitionDate = $_.AcquisitionDate -split 'T' | Select-Object -First 1
@@ -33,11 +34,9 @@ function Invoke-ListTeamsVoice {
                 $CompleteRequest.AssignedTo ? $null : ($CompleteRequest | Add-Member -NotePropertyName 'AssignedTo' -NotePropertyValue 'Unassigned' -Force)
                 $CompleteRequest
             }
-            Write-Host 'Finished the loop'
             $Skip = $Skip + 999
             $Data
         } while ($data.Count -eq 999)
-        Write-Host 'Exiting the Do.'
         $StatusCode = [HttpStatusCode]::OK
     } catch {
         $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
@@ -48,7 +47,7 @@ function Invoke-ListTeamsVoice {
     Write-Host 'Returning the response'
     Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
             StatusCode = $StatusCode
-            Body       = @($GraphRequest)
+            Body       = @($GraphRequest | Where-Object { $_.TelephoneNumber })
         })
 
 }

Modules/CIPPCore/Public/GraphHelper/New-TeamsAPIGetRequest.ps1

@@ -6,23 +6,49 @@ function New-TeamsAPIGetRequest($Uri, $tenantID, $Method = 'GET', $Resource = '4
 
     if ((Get-AuthorisedRequest -Uri $uri -TenantID $tenantid)) {
         $token = Get-GraphToken -TenantID $tenantID -Scope "$Resource/.default"
-
         $NextURL = $Uri
         $ReturnedData = do {
+            $handler = $null
+            $httpClient = $null
+            $response = $null
             try {
-                $Data = Invoke-RestMethod -ContentType "$ContentType;charset=UTF-8" -Uri $NextURL -Method $Method -Headers @{
-                    Authorization            = $token.Authorization
+                # Create handler and client with compression disabled
+                $handler = New-Object System.Net.Http.HttpClientHandler
+                $handler.AutomaticDecompression = [System.Net.DecompressionMethods]::None
+                $httpClient = New-Object System.Net.Http.HttpClient($handler)
+
+                # Add all required headers
+                $headers = @{
+                    'Authorization'          = $token.Authorization
                     'x-ms-client-request-id' = [guid]::NewGuid().ToString()
                     'x-ms-client-session-id' = [guid]::NewGuid().ToString()
-                    'x-ms-correlation-id'    = [guid]::NewGuid()
+                    'x-ms-correlation-id'    = [guid]::NewGuid().ToString()
                     'X-Requested-With'       = 'XMLHttpRequest'
                     'x-ms-tnm-applicationid' = '045268c0-445e-4ac1-9157-d58f67b167d9'
                     'Accept'                 = 'application/json'
+                    'Accept-Encoding'        = 'identity'
+                    'User-Agent'             = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36'
+                }
+
+                foreach ($header in $headers.GetEnumerator()) {
+                    $httpClient.DefaultRequestHeaders.Add($header.Key, $header.Value)
                 }
+
+                $response = $httpClient.GetAsync($NextURL).Result
+                $contentString = $response.Content.ReadAsStringAsync().Result
+
+                # Parse JSON and return data
+                $Data = $contentString | ConvertFrom-Json
+
                 $Data
                 if ($noPagination) { $nextURL = $null } else { $nextURL = $data.NextLink }
             } catch {
                 throw "Failed to make Teams API Get Request $_"
+            } finally {
+                # Proper cleanup in finally block to ensure disposal even on exceptions
+                if ($response) { $response.Dispose() }
+                if ($httpClient) { $httpClient.Dispose() }
+                if ($handler) { $handler.Dispose() }
             }
         } until ($null -eq $NextURL)
         return $ReturnedData