Modified cache logging to be more clear (#3072)

* Modified cache logging to be more clear * Refactoring Co-authored-by: trwalke <trwalke@microsoft.com>
AzureAD · Dec 15, 2021 · 191d0dc · 191d0dc
1 parent c240dad
commit 191d0dc
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/src/client/Microsoft.Identity.Client/Internal/Requests/RequestBase.cs b/src/client/Microsoft.Identity.Client/Internal/Requests/RequestBase.cs
@@ -361,19 +361,23 @@ private void LogReturnedToken(AuthenticationResult result)
             if (result.AccessToken != null &&
                 AuthenticationRequestParameters.RequestContext.Logger.IsLoggingEnabled(LogLevel.Info))
             {
-                int appHashCode = AuthenticationRequestParameters.AppConfig.GetHashCode();
                 string scopes = string.Join(" ", result.Scopes);
-                Uri canonicalAuthority = new Uri(AuthenticationRequestParameters.AuthorityInfo.CanonicalAuthority);
-                AuthenticationRequestParameters.RequestContext.Logger.InfoPii(
-                    $"Fetched access token from host {canonicalAuthority.Host}. Endpoint {canonicalAuthority}. ",
-                    $"Fetched access token from host {canonicalAuthority.Host}. ");
-
+
                 AuthenticationRequestParameters.RequestContext.Logger.Info("\n\t=== Token Acquisition finished successfully:");
                 AuthenticationRequestParameters.RequestContext.Logger.InfoPii(
-                        $" AT expiration time: {result.ExpiresOn}, scopes {scopes} " +
-                            $"source {result.AuthenticationResultMetadata.TokenSource} from {canonicalAuthority} appHashCode {appHashCode}",
-                        $" AT expiration time: {result.ExpiresOn}, scopes {scopes} " +
-                            $"source {result.AuthenticationResultMetadata.TokenSource} from {canonicalAuthority.Host} appHashCode {appHashCode}");
+                        $" AT expiration time: {result.ExpiresOn}, scopes {scopes}" +
+                            $"source {result.AuthenticationResultMetadata.TokenSource}",
+                        $" AT expiration time: {result.ExpiresOn}, scopes {scopes}" +
+                            $"source {result.AuthenticationResultMetadata.TokenSource}");
+
+                if (result.AuthenticationResultMetadata.TokenSource != TokenSource.Cache)
+                {
+                    Uri canonicalAuthority = new Uri(AuthenticationRequestParameters.AuthorityInfo.CanonicalAuthority);
+
+                    AuthenticationRequestParameters.RequestContext.Logger.InfoPii(
+                        $"Fetched access token from host {canonicalAuthority.Host}. Endpoint {canonicalAuthority}. ",
+                        $"Fetched access token from host {canonicalAuthority.Host}. ");
+                }
             }
         }