@azure/msal-common 15.13.0 → 16.0.0-alpha.0

package/src/account/ClientInfo.ts

@@ -7,18 +7,14 @@ import {
     createClientAuthError,
     ClientAuthErrorCodes,
 } from "../error/ClientAuthError.js";
-import { Separators, Constants } from "../utils/Constants.js";
+import * as Constants from "../utils/Constants.js";
 
 /**
- * Client info object which consists of:
- * uid: user id
- * utid: tenant id
- * xms_tdbr: optional, only for non-US tenants
+ * Client info object which consists of two IDs. Need to add more info here.
  */
 export type ClientInfo = {
     uid: string;
     utid: string;
-    xms_tdbr?: string;
 };
 
 /**
@@ -57,14 +53,11 @@ export function buildClientInfoFromHomeAccountId(
         );
     }
     const clientInfoParts: string[] = homeAccountId.split(
-        Separators.CLIENT_INFO_SEPARATOR,
+        Constants.CLIENT_INFO_SEPARATOR,
         2
     );
     return {
         uid: clientInfoParts[0],
-        utid:
-            clientInfoParts.length < 2
-                ? Constants.EMPTY_STRING
-                : clientInfoParts[1],
+        utid: clientInfoParts.length < 2 ? "" : clientInfoParts[1],
     };
 }

package/src/authority/Authority.ts

@@ -15,12 +15,7 @@ import {
     ClientAuthErrorCodes,
 } from "../error/ClientAuthError.js";
 import { INetworkModule } from "../network/INetworkModule.js";
-import {
-    AADAuthorityConstants,
-    AuthorityMetadataSource,
-    Constants,
-    RegionDiscoveryOutcomes,
-} from "../utils/Constants.js";
+import * as Constants from "../utils/Constants.js";
 import {
     EndpointMetadata,
     getCloudDiscoveryMetadataFromHardcodedValues,
@@ -55,7 +50,7 @@ import type { AzureCloudOptions } from "../config/ClientConfiguration.js";
 import { Logger } from "../logger/Logger.js";
 import { AuthError } from "../error/AuthError.js";
 import { IPerformanceClient } from "../telemetry/performance/IPerformanceClient.js";
-import { PerformanceEvents } from "../telemetry/performance/PerformanceEvent.js";
+import * as PerformanceEvents from "../telemetry/performance/PerformanceEvents.js";
 import { invokeAsync } from "../utils/FunctionWrappers.js";
 import * as CacheHelpers from "../cache/utils/CacheHelpers.js";
 
@@ -84,7 +79,7 @@ export class Authority {
     // Logger object
     private logger: Logger;
     // Performance client
-    protected performanceClient: IPerformanceClient | undefined;
+    protected performanceClient: IPerformanceClient;
     // Correlation Id
     protected correlationId: string;
     // Indicates if the authority is fake, for the purpose of a Managed Identity Application
@@ -93,9 +88,9 @@ export class Authority {
     private static reservedTenantDomains: Set<string> = new Set([
         "{tenant}",
         "{tenantid}",
-        AADAuthorityConstants.COMMON,
-        AADAuthorityConstants.CONSUMERS,
-        AADAuthorityConstants.ORGANIZATIONS,
+        Constants.AADAuthority.COMMON,
+        Constants.AADAuthority.CONSUMERS,
+        Constants.AADAuthority.ORGANIZATIONS,
     ]);
 
     constructor(
@@ -105,7 +100,7 @@ export class Authority {
         authorityOptions: AuthorityOptions,
         logger: Logger,
         correlationId: string,
-        performanceClient?: IPerformanceClient,
+        performanceClient: IPerformanceClient,
         managedIdentity?: boolean
     ) {
         this.canonicalAuthority = authority;
@@ -354,7 +349,8 @@ export class Authority {
                  */
                 if (cachedPart !== tenantId) {
                     this.logger.verbose(
-                        `Replacing tenant domain name ${cachedPart} with id ${tenantId}`
+                        `Replacing tenant domain name '${cachedPart}' with id '${tenantId}'`,
+                        this.correlationId
                     );
                     cachedPart = tenantId;
                 }
@@ -398,11 +394,6 @@ export class Authority {
      * and the /authorize, /token and logout endpoints.
      */
     public async resolveEndpointsAsync(): Promise<void> {
-        this.performanceClient?.addQueueMeasurement(
-            PerformanceEvents.AuthorityResolveEndpointsAsync,
-            this.correlationId
-        );
-
         const metadataEntity = this.getCurrentMetadataEntity();
 
         const cloudDiscoverySource = await invokeAsync(
@@ -442,7 +433,10 @@ export class Authority {
      */
     private getCurrentMetadataEntity(): AuthorityMetadataEntity {
         let metadataEntity: AuthorityMetadataEntity | null =
-            this.cacheManager.getAuthorityMetadataByAlias(this.hostnameAndPort);
+            this.cacheManager.getAuthorityMetadataByAlias(
+                this.hostnameAndPort,
+                this.correlationId
+            );
 
         if (!metadataEntity) {
             metadataEntity = {
@@ -472,15 +466,16 @@ export class Authority {
      */
     private updateCachedMetadata(
         metadataEntity: AuthorityMetadataEntity,
-        cloudDiscoverySource: AuthorityMetadataSource | null,
+        cloudDiscoverySource: Constants.AuthorityMetadataSource | null,
         endpointMetadataResult: {
-            source: AuthorityMetadataSource;
+            source: Constants.AuthorityMetadataSource;
             metadata?: OpenIdConfigResponse;
         } | null
     ): void {
         if (
-            cloudDiscoverySource !== AuthorityMetadataSource.CACHE &&
-            endpointMetadataResult?.source !== AuthorityMetadataSource.CACHE
+            cloudDiscoverySource !== Constants.AuthorityMetadataSource.CACHE &&
+            endpointMetadataResult?.source !==
+                Constants.AuthorityMetadataSource.CACHE
         ) {
             // Reset the expiration time unless both values came from a successful cache lookup
             metadataEntity.expiresAt =
@@ -489,9 +484,14 @@ export class Authority {
         }
 
         const cacheKey = this.cacheManager.generateAuthorityMetadataCacheKey(
-            metadataEntity.preferred_cache
+            metadataEntity.preferred_cache,
+            this.correlationId
+        );
+        this.cacheManager.setAuthorityMetadata(
+            cacheKey,
+            metadataEntity,
+            this.correlationId
         );
-        this.cacheManager.setAuthorityMetadata(cacheKey, metadataEntity);
         this.metadata = metadataEntity;
     }
 
@@ -501,12 +501,7 @@ export class Authority {
      */
     private async updateEndpointMetadata(
         metadataEntity: AuthorityMetadataEntity
-    ): Promise<AuthorityMetadataSource> {
-        this.performanceClient?.addQueueMeasurement(
-            PerformanceEvents.AuthorityUpdateEndpointMetadata,
-            this.correlationId
-        );
-
+    ): Promise<Constants.AuthorityMetadataSource> {
         const localMetadata =
             this.updateEndpointMetadataFromLocalSources(metadataEntity);
 
@@ -514,7 +509,7 @@ export class Authority {
         if (localMetadata) {
             if (
                 localMetadata.source ===
-                AuthorityMetadataSource.HARDCODED_VALUES
+                Constants.AuthorityMetadataSource.HARDCODED_VALUES
             ) {
                 // If the user prefers to use an azure region replace the global endpoints with regional information.
                 if (
@@ -568,7 +563,7 @@ export class Authority {
                 metadata,
                 true
             );
-            return AuthorityMetadataSource.NETWORK;
+            return Constants.AuthorityMetadataSource.NETWORK;
         } else {
             // Metadata could not be obtained from the config, cache, network or hardcoded values
             throw createClientAuthError(
@@ -587,16 +582,18 @@ export class Authority {
     private updateEndpointMetadataFromLocalSources(
         metadataEntity: AuthorityMetadataEntity
     ): {
-        source: AuthorityMetadataSource;
+        source: Constants.AuthorityMetadataSource;
         metadata?: OpenIdConfigResponse;
     } | null {
         this.logger.verbose(
-            "Attempting to get endpoint metadata from authority configuration"
+            "Attempting to get endpoint metadata from authority configuration",
+            this.correlationId
         );
         const configMetadata = this.getEndpointMetadataFromConfig();
         if (configMetadata) {
             this.logger.verbose(
-                "Found endpoint metadata in authority configuration"
+                "Found endpoint metadata in authority configuration",
+                this.correlationId
             );
             CacheHelpers.updateAuthorityEndpointMetadata(
                 metadataEntity,
@@ -604,37 +601,31 @@ export class Authority {
                 false
             );
             return {
-                source: AuthorityMetadataSource.CONFIG,
+                source: Constants.AuthorityMetadataSource.CONFIG,
             };
         }
 
         this.logger.verbose(
-            "Did not find endpoint metadata in the config... Attempting to get endpoint metadata from the hardcoded values."
+            "Did not find endpoint metadata in the config... Attempting to get endpoint metadata from the hardcoded values.",
+            this.correlationId
         );
 
-        // skipAuthorityMetadataCache is used to bypass hardcoded authority metadata and force a network metadata cache lookup and network metadata request if no cached response is available.
-        if (this.authorityOptions.skipAuthorityMetadataCache) {
-            this.logger.verbose(
-                "Skipping hardcoded metadata cache since skipAuthorityMetadataCache is set to true. Attempting to get endpoint metadata from the network metadata cache."
+        const hardcodedMetadata = this.getEndpointMetadataFromHardcodedValues();
+        if (hardcodedMetadata) {
+            CacheHelpers.updateAuthorityEndpointMetadata(
+                metadataEntity,
+                hardcodedMetadata,
+                false
             );
+            return {
+                source: Constants.AuthorityMetadataSource.HARDCODED_VALUES,
+                metadata: hardcodedMetadata,
+            };
         } else {
-            const hardcodedMetadata =
-                this.getEndpointMetadataFromHardcodedValues();
-            if (hardcodedMetadata) {
-                CacheHelpers.updateAuthorityEndpointMetadata(
-                    metadataEntity,
-                    hardcodedMetadata,
-                    false
-                );
-                return {
-                    source: AuthorityMetadataSource.HARDCODED_VALUES,
-                    metadata: hardcodedMetadata,
-                };
-            } else {
-                this.logger.verbose(
-                    "Did not find endpoint metadata in hardcoded values... Attempting to get endpoint metadata from the network metadata cache."
-                );
-            }
+            this.logger.verbose(
+                "Did not find endpoint metadata in hardcoded values... Attempting to get endpoint metadata from the network metadata cache.",
+                this.correlationId
+            );
         }
 
         // Check cached metadata entity expiration status
@@ -646,10 +637,10 @@ export class Authority {
             !metadataEntityExpired
         ) {
             // No need to update
-            this.logger.verbose("Found endpoint metadata in the cache.");
-            return { source: AuthorityMetadataSource.CACHE };
+            this.logger.verbose("Found endpoint metadata in the cache.", "");
+            return { source: Constants.AuthorityMetadataSource.CACHE };
         } else if (metadataEntityExpired) {
-            this.logger.verbose("The metadata entity is expired.");
+            this.logger.verbose("The metadata entity is expired.", "");
         }
 
         return null;
@@ -700,11 +691,6 @@ export class Authority {
      * @param hasHardcodedMetadata boolean
      */
     private async getEndpointMetadataFromNetwork(): Promise<OpenIdConfigResponse | null> {
-        this.performanceClient?.addQueueMeasurement(
-            PerformanceEvents.AuthorityGetEndpointMetadataFromNetwork,
-            this.correlationId
-        );
-
         const options: ImdsOptions = {};
 
         /*
@@ -715,7 +701,8 @@ export class Authority {
         const openIdConfigurationEndpoint =
             this.defaultOpenIdConfigurationEndpoint;
         this.logger.verbose(
-            `Authority.getEndpointMetadataFromNetwork: attempting to retrieve OAuth endpoints from ${openIdConfigurationEndpoint}`
+            `Authority.getEndpointMetadataFromNetwork: attempting to retrieve OAuth endpoints from '${openIdConfigurationEndpoint}'`,
+            this.correlationId
         );
 
         try {
@@ -729,13 +716,15 @@ export class Authority {
                 return response.body;
             } else {
                 this.logger.verbose(
-                    `Authority.getEndpointMetadataFromNetwork: could not parse response as OpenID configuration`
+                    `Authority.getEndpointMetadataFromNetwork: could not parse response as OpenID configuration`,
+                    this.correlationId
                 );
                 return null;
             }
         } catch (e) {
             this.logger.verbose(
-                `Authority.getEndpointMetadataFromNetwork: ${e}`
+                `Authority.getEndpointMetadataFromNetwork: '${e}'`,
+                this.correlationId
             );
             return null;
         }
@@ -759,11 +748,6 @@ export class Authority {
     private async updateMetadataWithRegionalInformation(
         metadata: OpenIdConfigResponse
     ): Promise<OpenIdConfigResponse> {
-        this.performanceClient?.addQueueMeasurement(
-            PerformanceEvents.AuthorityUpdateMetadataWithRegionalInformation,
-            this.correlationId
-        );
-
         const userConfiguredAzureRegion =
             this.authorityOptions.azureRegionConfiguration?.azureRegion;
 
@@ -773,7 +757,7 @@ export class Authority {
                 Constants.AZURE_REGION_AUTO_DISCOVER_FLAG
             ) {
                 this.regionDiscoveryMetadata.region_outcome =
-                    RegionDiscoveryOutcomes.CONFIGURED_NO_AUTO_DETECTION;
+                    Constants.RegionDiscoveryOutcomes.CONFIGURED_NO_AUTO_DETECTION;
                 this.regionDiscoveryMetadata.region_used =
                     userConfiguredAzureRegion;
                 return Authority.replaceWithRegionalInformation(
@@ -796,7 +780,7 @@ export class Authority {
 
             if (autodetectedRegionName) {
                 this.regionDiscoveryMetadata.region_outcome =
-                    RegionDiscoveryOutcomes.AUTO_DETECTION_REQUESTED_SUCCESSFUL;
+                    Constants.RegionDiscoveryOutcomes.AUTO_DETECTION_REQUESTED_SUCCESSFUL;
                 this.regionDiscoveryMetadata.region_used =
                     autodetectedRegionName;
                 return Authority.replaceWithRegionalInformation(
@@ -806,7 +790,7 @@ export class Authority {
             }
 
             this.regionDiscoveryMetadata.region_outcome =
-                RegionDiscoveryOutcomes.AUTO_DETECTION_REQUESTED_FAILED;
+                Constants.RegionDiscoveryOutcomes.AUTO_DETECTION_REQUESTED_FAILED;
         }
 
         return metadata;
@@ -820,11 +804,7 @@ export class Authority {
      */
     private async updateCloudDiscoveryMetadata(
         metadataEntity: AuthorityMetadataEntity
-    ): Promise<AuthorityMetadataSource> {
-        this.performanceClient?.addQueueMeasurement(
-            PerformanceEvents.AuthorityUpdateCloudDiscoveryMetadata,
-            this.correlationId
-        );
+    ): Promise<Constants.AuthorityMetadataSource> {
         const localMetadataSource =
             this.updateCloudDiscoveryMetadataFromLocalSources(metadataEntity);
         if (localMetadataSource) {
@@ -846,7 +826,7 @@ export class Authority {
                 metadata,
                 true
             );
-            return AuthorityMetadataSource.NETWORK;
+            return Constants.AuthorityMetadataSource.NETWORK;
         }
 
         // Metadata could not be obtained from the config, cache, network or hardcoded values
@@ -857,71 +837,72 @@ export class Authority {
 
     private updateCloudDiscoveryMetadataFromLocalSources(
         metadataEntity: AuthorityMetadataEntity
-    ): AuthorityMetadataSource | null {
+    ): Constants.AuthorityMetadataSource | null {
         this.logger.verbose(
-            "Attempting to get cloud discovery metadata  from authority configuration"
+            "Attempting to get cloud discovery metadata  from authority configuration",
+            this.correlationId
         );
         this.logger.verbosePii(
-            `Known Authorities: ${
+            `Known Authorities: '${
                 this.authorityOptions.knownAuthorities ||
                 Constants.NOT_APPLICABLE
-            }`
+            }'`,
+            this.correlationId
         );
         this.logger.verbosePii(
-            `Authority Metadata: ${
+            `Authority Metadata: '${
                 this.authorityOptions.authorityMetadata ||
                 Constants.NOT_APPLICABLE
-            }`
+            }'`,
+            this.correlationId
         );
         this.logger.verbosePii(
-            `Canonical Authority: ${
+            `Canonical Authority: '${
                 metadataEntity.canonical_authority || Constants.NOT_APPLICABLE
-            }`
+            }'`,
+            this.correlationId
         );
         const metadata = this.getCloudDiscoveryMetadataFromConfig();
         if (metadata) {
             this.logger.verbose(
-                "Found cloud discovery metadata in authority configuration"
+                "Found cloud discovery metadata in authority configuration",
+                this.correlationId
             );
             CacheHelpers.updateCloudDiscoveryMetadata(
                 metadataEntity,
                 metadata,
                 false
             );
-            return AuthorityMetadataSource.CONFIG;
+            return Constants.AuthorityMetadataSource.CONFIG;
         }
 
         // If the cached metadata came from config but that config was not passed to this instance, we must go to hardcoded values
         this.logger.verbose(
-            "Did not find cloud discovery metadata in the config... Attempting to get cloud discovery metadata from the hardcoded values."
+            "Did not find cloud discovery metadata in the config... Attempting to get cloud discovery metadata from the hardcoded values.",
+            this.correlationId
         );
 
-        if (this.options.skipAuthorityMetadataCache) {
+        const hardcodedMetadata = getCloudDiscoveryMetadataFromHardcodedValues(
+            this.hostnameAndPort
+        );
+        if (hardcodedMetadata) {
             this.logger.verbose(
-                "Skipping hardcoded cloud discovery metadata cache since skipAuthorityMetadataCache is set to true. Attempting to get cloud discovery metadata from the network metadata cache."
+                "Found cloud discovery metadata from hardcoded values.",
+                this.correlationId
             );
-        } else {
-            const hardcodedMetadata =
-                getCloudDiscoveryMetadataFromHardcodedValues(
-                    this.hostnameAndPort
-                );
-            if (hardcodedMetadata) {
-                this.logger.verbose(
-                    "Found cloud discovery metadata from hardcoded values."
-                );
-                CacheHelpers.updateCloudDiscoveryMetadata(
-                    metadataEntity,
-                    hardcodedMetadata,
-                    false
-                );
-                return AuthorityMetadataSource.HARDCODED_VALUES;
-            }
-
-            this.logger.verbose(
-                "Did not find cloud discovery metadata in hardcoded values... Attempting to get cloud discovery metadata from the network metadata cache."
+            CacheHelpers.updateCloudDiscoveryMetadata(
+                metadataEntity,
+                hardcodedMetadata,
+                false
             );
+            return Constants.AuthorityMetadataSource.HARDCODED_VALUES;
         }
 
+        this.logger.verbose(
+            "Did not find cloud discovery metadata in hardcoded values... Attempting to get cloud discovery metadata from the network metadata cache.",
+            this.correlationId
+        );
+
         const metadataEntityExpired =
             CacheHelpers.isAuthorityMetadataExpired(metadataEntity);
         if (
@@ -929,11 +910,14 @@ export class Authority {
             metadataEntity.aliasesFromNetwork &&
             !metadataEntityExpired
         ) {
-            this.logger.verbose("Found cloud discovery metadata in the cache.");
+            this.logger.verbose(
+                "Found cloud discovery metadata in the cache.",
+                ""
+            );
             // No need to update
-            return AuthorityMetadataSource.CACHE;
+            return Constants.AuthorityMetadataSource.CACHE;
         } else if (metadataEntityExpired) {
-            this.logger.verbose("The metadata entity is expired.");
+            this.logger.verbose("The metadata entity is expired.", "");
         }
 
         return null;
@@ -946,7 +930,8 @@ export class Authority {
         // CIAM does not support cloud discovery metadata
         if (this.authorityType === AuthorityType.Ciam) {
             this.logger.verbose(
-                "CIAM authorities do not support cloud discovery metadata, generate the aliases from authority host."
+                "CIAM authorities do not support cloud discovery metadata, generate the aliases from authority host.",
+                this.correlationId
             );
             return Authority.createCloudDiscoveryMetadataFromHost(
                 this.hostnameAndPort
@@ -956,11 +941,13 @@ export class Authority {
         // Check if network response was provided in config
         if (this.authorityOptions.cloudDiscoveryMetadata) {
             this.logger.verbose(
-                "The cloud discovery metadata has been provided as a network response, in the config."
+                "The cloud discovery metadata has been provided as a network response, in the config.",
+                this.correlationId
             );
             try {
                 this.logger.verbose(
-                    "Attempting to parse the cloud discovery metadata."
+                    "Attempting to parse the cloud discovery metadata.",
+                    this.correlationId
                 );
                 const parsedResponse = JSON.parse(
                     this.authorityOptions.cloudDiscoveryMetadata
@@ -969,20 +956,23 @@ export class Authority {
                     parsedResponse.metadata,
                     this.hostnameAndPort
                 );
-                this.logger.verbose("Parsed the cloud discovery metadata.");
+                this.logger.verbose("Parsed the cloud discovery metadata.", "");
                 if (metadata) {
                     this.logger.verbose(
-                        "There is returnable metadata attached to the parsed cloud discovery metadata."
+                        "There is returnable metadata attached to the parsed cloud discovery metadata.",
+                        this.correlationId
                     );
                     return metadata;
                 } else {
                     this.logger.verbose(
-                        "There is no metadata attached to the parsed cloud discovery metadata."
+                        "There is no metadata attached to the parsed cloud discovery metadata.",
+                        this.correlationId
                     );
                 }
             } catch (e) {
                 this.logger.verbose(
-                    "Unable to parse the cloud discovery metadata. Throwing Invalid Cloud Discovery Metadata Error."
+                    "Unable to parse the cloud discovery metadata. Throwing Invalid Cloud Discovery Metadata Error.",
+                    this.correlationId
                 );
                 throw createClientConfigurationError(
                     ClientConfigurationErrorCodes.invalidCloudDiscoveryMetadata
@@ -993,7 +983,8 @@ export class Authority {
         // If cloudDiscoveryMetadata is empty or does not contain the host, check knownAuthorities
         if (this.isInKnownAuthorities()) {
             this.logger.verbose(
-                "The host is included in knownAuthorities. Creating new cloud discovery metadata from the host."
+                "The host is included in knownAuthorities. Creating new cloud discovery metadata from the host.",
+                this.correlationId
             );
             return Authority.createCloudDiscoveryMetadataFromHost(
                 this.hostnameAndPort
@@ -1009,10 +1000,6 @@ export class Authority {
      * @param hasHardcodedMetadata boolean
      */
     private async getCloudDiscoveryMetadataFromNetwork(): Promise<CloudDiscoveryMetadata | null> {
-        this.performanceClient?.addQueueMeasurement(
-            PerformanceEvents.AuthorityGetCloudDiscoveryMetadataFromNetwork,
-            this.correlationId
-        );
         const instanceDiscoveryEndpoint = `${Constants.AAD_INSTANCE_DISCOVERY_ENDPT}${this.canonicalAuthority}oauth2/v2.0/authorize`;
         const options: ImdsOptions = {};
 
@@ -1037,42 +1024,50 @@ export class Authority {
                 metadata = typedResponseBody.metadata;
 
                 this.logger.verbosePii(
-                    `tenant_discovery_endpoint is: ${typedResponseBody.tenant_discovery_endpoint}`
+                    `tenant_discovery_endpoint is: '${typedResponseBody.tenant_discovery_endpoint}'`,
+                    this.correlationId
                 );
             } else if (isCloudInstanceDiscoveryErrorResponse(response.body)) {
                 this.logger.warning(
-                    `A CloudInstanceDiscoveryErrorResponse was returned. The cloud instance discovery network request's status code is: ${response.status}`
+                    `A CloudInstanceDiscoveryErrorResponse was returned. The cloud instance discovery network request's status code is: '${response.status}'`,
+                    this.correlationId
                 );
 
                 typedResponseBody =
                     response.body as CloudInstanceDiscoveryErrorResponse;
                 if (typedResponseBody.error === Constants.INVALID_INSTANCE) {
                     this.logger.error(
-                        "The CloudInstanceDiscoveryErrorResponse error is invalid_instance."
+                        "The CloudInstanceDiscoveryErrorResponse error is invalid_instance.",
+                        this.correlationId
                     );
                     return null;
                 }
 
                 this.logger.warning(
-                    `The CloudInstanceDiscoveryErrorResponse error is ${typedResponseBody.error}`
+                    `The CloudInstanceDiscoveryErrorResponse error is '${typedResponseBody.error}'`,
+                    this.correlationId
                 );
                 this.logger.warning(
-                    `The CloudInstanceDiscoveryErrorResponse error description is ${typedResponseBody.error_description}`
+                    `The CloudInstanceDiscoveryErrorResponse error description is '${typedResponseBody.error_description}'`,
+                    this.correlationId
                 );
 
                 this.logger.warning(
-                    "Setting the value of the CloudInstanceDiscoveryMetadata (returned from the network) to []"
+                    "Setting the value of the CloudInstanceDiscoveryMetadata (returned from the network, correlationId) to []",
+                    this.correlationId
                 );
                 metadata = [];
             } else {
                 this.logger.error(
-                    "AAD did not return a CloudInstanceDiscoveryResponse or CloudInstanceDiscoveryErrorResponse"
+                    "AAD did not return a CloudInstanceDiscoveryResponse or CloudInstanceDiscoveryErrorResponse",
+                    this.correlationId
                 );
                 return null;
             }
 
             this.logger.verbose(
-                "Attempting to find a match between the developer's authority and the CloudInstanceDiscoveryMetadata returned from the network request."
+                "Attempting to find a match between the developer's authority and the CloudInstanceDiscoveryMetadata returned from the network request.",
+                this.correlationId
             );
             match = getCloudDiscoveryMetadataFromNetworkResponse(
                 metadata,
@@ -1081,12 +1076,14 @@ export class Authority {
         } catch (error) {
             if (error instanceof AuthError) {
                 this.logger.error(
-                    `There was a network error while attempting to get the cloud discovery instance metadata.\nError: ${error.errorCode}\nError Description: ${error.errorMessage}`
+                    `There was a network error while attempting to get the cloud discovery instance metadata.\nError: '${error.errorCode}'\nError Description: '${error.errorMessage}'`,
+                    this.correlationId
                 );
             } else {
                 const typedError = error as Error;
                 this.logger.error(
-                    `A non-MSALJS error was thrown while attempting to get the cloud instance discovery metadata.\nError: ${typedError.name}\nError Description: ${typedError.message}`
+                    `A non-MSALJS error was thrown while attempting to get the cloud instance discovery metadata.\nError: '${typedError.name}'\nError Description: '${typedError.message}'`,
+                    this.correlationId
                 );
             }
 
@@ -1096,10 +1093,12 @@ export class Authority {
         // Custom Domain scenario, host is trusted because Instance Discovery call succeeded
         if (!match) {
             this.logger.warning(
-                "The developer's authority was not found within the CloudInstanceDiscoveryMetadata returned from the network request."
+                "The developer's authority was not found within the CloudInstanceDiscoveryMetadata returned from the network request.",
+                this.correlationId
             );
             this.logger.verbose(
-                "Creating custom Authority for custom domain scenario."
+                "Creating custom Authority for custom domain scenario.",
+                this.correlationId
             );
 
             match = Authority.createCloudDiscoveryMetadataFromHost(
@@ -1325,9 +1324,9 @@ export function getTenantFromAuthorityString(
         authorityUrlComponents.PathSegments.slice(-1)[0]?.toLowerCase();
 
     switch (tenantId) {
-        case AADAuthorityConstants.COMMON:
-        case AADAuthorityConstants.ORGANIZATIONS:
-        case AADAuthorityConstants.CONSUMERS:
+        case Constants.AADAuthority.COMMON:
+        case Constants.AADAuthority.ORGANIZATIONS:
+        case Constants.AADAuthority.CONSUMERS:
             return undefined;
         default:
             return tenantId;