cleanup classic api token usage

Author: JohnDuprey

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

@@ -26,8 +26,7 @@ function New-GraphGetRequest {
 
     if ($NoAuthCheck -eq $true -or $IsAuthorised) {
         if ($scope -eq 'ExchangeOnline') {
-            $AccessToken = Get-ClassicAPIToken -resource 'https://outlook.office365.com' -Tenantid $tenantid
-            $headers = @{ Authorization = "Bearer $($AccessToken.access_token)" }
+            $headers = Get-GraphToken -tenantid $tenantid -scope 'https://outlook.office365.com/.default' -AsApp $asapp -SkipCache $skipTokenCache
         } else {
             $headers = Get-GraphToken -tenantid $tenantid -scope $scope -AsApp $asapp -SkipCache $skipTokenCache
         }

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

@@ -5,13 +5,13 @@ function New-TeamsAPIGetRequest($Uri, $tenantID, $Method = 'GET', $Resource = '4
     #>
 
     if ((Get-AuthorisedRequest -Uri $uri -TenantID $tenantid)) {
-        $token = Get-ClassicAPIToken -Tenant $tenantid -Resource $Resource
+        $token = Get-GraphToken -TenantID $tenantID -Scope "$Resource/.default"
 
         $NextURL = $Uri
         $ReturnedData = do {
             try {
                 $Data = Invoke-RestMethod -ContentType "$ContentType;charset=UTF-8" -Uri $NextURL -Method $Method -Headers @{
-                    Authorization            = "Bearer $($token.access_token)"
+                    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()
@@ -29,4 +29,4 @@ function New-TeamsAPIGetRequest($Uri, $tenantID, $Method = 'GET', $Resource = '4
     } else {
         Write-Error 'Not allowed. You cannot manage your own tenant or tenants not under your scope'
     }
-}
+}