update telemetry, clean-up, and improve perf

AzureAD · Jan 11, 2023 · c4c167e · c4c167e
1 parent b0b9796
commit c4c167e
Showing 1 changed file with 12 additions and 20 deletions.
diff --git a/src/internal/Confirm-ModuleAuthentication.ps1 b/src/internal/Confirm-ModuleAuthentication.ps1
@@ -73,6 +73,7 @@ function Confirm-ModuleAuthentication {
             $Stopwatch.Stop()
             if ($MsGraphToken) {
                 $AuthDetail = [ordered]@{
+                    ClientId      = $ClientApplication.ClientId
                     TokenType     = $MsGraphToken.TokenType
                     ExpiresOn     = $MsGraphToken.ExpiresOn
                     CorrelationId = $MsGraphToken.CorrelationId
@@ -87,16 +88,6 @@ function Confirm-ModuleAuthentication {
                 Write-AppInsightsDependency 'GET Access Token' -Type 'Azure AD' -Data 'GET Access Token' -Duration $Stopwatch.Elapsed -Success ($null -ne $MsGraphToken) -OrderedProperties $AuthDetail
             }
         }
-        if (!$script:ConnectState.MsGraphToken -or ($script:ConnectState.MsGraphToken.AccessToken -ne $MsGraphToken.AccessToken)) {
-            Write-Verbose 'Connecting Modules...'
-            #Connect-MgGraph -Environment $CloudEnvironment -TenantId $MsGraphToken.TenantId -AccessToken $MsGraphToken.AccessToken | Out-Null
-            if ($script:MsGraphSession.Headers.ContainsKey('Authorization')) {
-                $script:MsGraphSession.Headers['Authorization'] = $MsGraphToken.CreateAuthorizationHeader()
-            }
-            else {
-                $script:MsGraphSession.Headers.Add('Authorization', $MsGraphToken.CreateAuthorizationHeader())
-            }
-        }
     }
     else {
         Write-Warning 'Using a confidential client is non-interactive and requires that the necessary scopes/permissions be added to the application or have permissions on-behalf-of a user.'
@@ -110,6 +101,7 @@ function Confirm-ModuleAuthentication {
             if (!$script:ConnectState.MsGraphToken -or ($script:ConnectState.MsGraphToken.AccessToken -ne $MsGraphToken.AccessToken)) {
                 if ($MsGraphToken) {
                     $AuthDetail = [ordered]@{
+                        ClientId      = $ClientApplication.ClientId
                         TokenType     = $MsGraphToken.TokenType
                         ExpiresOn     = $MsGraphToken.ExpiresOn
                         CorrelationId = $MsGraphToken.CorrelationId
@@ -120,20 +112,20 @@ function Confirm-ModuleAuthentication {
                 Write-AppInsightsDependency 'GET Access Token (Confidential Client)' -Type 'Azure AD' -Data 'GET Access Token (Confidential Client)' -Duration $Stopwatch.Elapsed -Success ($null -ne $MsGraphToken) -OrderedProperties $AuthDetail
             }
         }
-        if (!$script:ConnectState.MsGraphToken -or ($script:ConnectState.MsGraphToken.AccessToken -ne $MsGraphToken.AccessToken)) {
-            Write-Verbose 'Connecting Modules...'
-            #Connect-MgGraph -Environment $CloudEnvironment -TenantId $MsGraphToken.TenantId -AccessToken $MsGraphToken.AccessToken | Out-Null
-            if ($script:MsGraphSession.Headers.ContainsKey('Authorization')) {
-                $script:MsGraphSession.Headers['Authorization'] = $MsGraphToken.CreateAuthorizationHeader()
-            }
-            else {
-                $script:MsGraphSession.Headers.Add('Authorization', $MsGraphToken.CreateAuthorizationHeader())
-            }
+    }
+    if (!$script:ConnectState.MsGraphToken -or ($script:ConnectState.MsGraphToken.AccessToken -ne $MsGraphToken.AccessToken)) {
+        Write-Verbose 'Connecting Modules...'
+        #Connect-MgGraph -Environment $CloudEnvironment -TenantId $MsGraphToken.TenantId -AccessToken $MsGraphToken.AccessToken | Out-Null
+        if ($script:MsGraphSession.Headers.ContainsKey('Authorization')) {
+            $script:MsGraphSession.Headers['Authorization'] = $MsGraphToken.CreateAuthorizationHeader()
+        }
+        else {
+            $script:MsGraphSession.Headers.Add('Authorization', $MsGraphToken.CreateAuthorizationHeader())
         }
     }
     $script:ConnectState.MsGraphToken = $MsGraphToken
 
     if ($MsGraphSession) {
-        Write-Output $script:MsGraphSession
+        return $script:MsGraphSession
     }
 }