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

package/src/client/BaseClient.ts

@@ -16,7 +16,7 @@ import { NetworkResponse } from "../network/NetworkResponse.js";
 import { ICrypto } from "../crypto/ICrypto.js";
 import { Authority } from "../authority/Authority.js";
 import { Logger } from "../logger/Logger.js";
-import { Constants, HeaderNames } from "../utils/Constants.js";
+import { HeaderNames, URL_FORM_CONTENT_TYPE } from "../utils/Constants.js";
 import { ServerAuthorizationTokenResponse } from "../response/ServerAuthorizationTokenResponse.js";
 import { CacheManager } from "../cache/CacheManager.js";
 import { ServerTelemetryManager } from "../telemetry/server/ServerTelemetryManager.js";
@@ -29,7 +29,7 @@ import * as RequestParameterBuilder from "../request/RequestParameterBuilder.js"
 import * as UrlUtils from "../utils/UrlUtils.js";
 import { BaseAuthRequest } from "../request/BaseAuthRequest.js";
 import { createDiscoveredInstance } from "../authority/AuthorityFactory.js";
-import { PerformanceEvents } from "../telemetry/performance/PerformanceEvent.js";
+import * as PerformanceEvents from "../telemetry/performance/PerformanceEvents.js";
 import { ThrottlingUtils } from "../network/ThrottlingUtils.js";
 import { AuthError } from "../error/AuthError.js";
 import {
@@ -66,11 +66,11 @@ export abstract class BaseClient {
     public authority: Authority;
 
     // Performance telemetry client
-    protected performanceClient?: IPerformanceClient;
+    protected performanceClient: IPerformanceClient;
 
     protected constructor(
         configuration: ClientConfiguration,
-        performanceClient?: IPerformanceClient
+        performanceClient: IPerformanceClient
     ) {
         // Set the configuration
         this.config = buildClientConfiguration(configuration);
@@ -104,7 +104,7 @@ export abstract class BaseClient {
         ccsCred?: CcsCredential
     ): Record<string, string> {
         const headers: Record<string, string> = {};
-        headers[HeaderNames.CONTENT_TYPE] = Constants.URL_FORM_CONTENT_TYPE;
+        headers[HeaderNames.CONTENT_TYPE] = URL_FORM_CONTENT_TYPE;
         if (!this.config.systemOptions.preventCorsPreflight && ccsCred) {
             switch (ccsCred.type) {
                 case CcsCredentialType.HOME_ACCOUNT_ID:
@@ -117,8 +117,8 @@ export abstract class BaseClient {
                         ] = `Oid:${clientInfo.uid}@${clientInfo.utid}`;
                     } catch (e) {
                         this.logger.verbose(
-                            "Could not parse home account ID for CCS Header: " +
-                                e
+                            `Could not parse home account ID for CCS Header: '${e}'`,
+                            ""
                         );
                     }
                     break;
@@ -144,16 +144,8 @@ export abstract class BaseClient {
         queryString: string,
         headers: Record<string, string>,
         thumbprint: RequestThumbprint,
-        correlationId: string,
-        queuedEvent?: string
+        correlationId: string
     ): Promise<NetworkResponse<ServerAuthorizationTokenResponse>> {
-        if (queuedEvent) {
-            this.performanceClient?.addQueueMeasurement(
-                queuedEvent,
-                correlationId
-            );
-        }
-
         const response =
             await this.sendPostRequest<ServerAuthorizationTokenResponse>(
                 thumbprint,
@@ -266,10 +258,6 @@ export abstract class BaseClient {
         cloudInstanceHostname: string,
         correlationId: string
     ): Promise<void> {
-        this.performanceClient?.addQueueMeasurement(
-            PerformanceEvents.UpdateTokenEndpointAuthority,
-            correlationId
-        );
         const cloudInstanceAuthorityUri = `https://${cloudInstanceHostname}/${this.authority.tenant}/`;
         const cloudInstanceAuthority = await createDiscoveredInstance(
             cloudInstanceAuthorityUri,

package/src/client/RefreshTokenClient.ts

@@ -13,12 +13,7 @@ import { Authority } from "../authority/Authority.js";
 import { ServerAuthorizationTokenResponse } from "../response/ServerAuthorizationTokenResponse.js";
 import * as RequestParameterBuilder from "../request/RequestParameterBuilder.js";
 import * as UrlUtils from "../utils/UrlUtils.js";
-import {
-    GrantType,
-    AuthenticationScheme,
-    Errors,
-    HeaderNames,
-} from "../utils/Constants.js";
+import * as Constants from "../utils/Constants.js";
 import * as AADServerParamKeys from "../constants/AADServerParamKeys.js";
 import { ResponseHandler } from "../response/ResponseHandler.js";
 import { AuthenticationResult } from "../response/AuthenticationResult.js";
@@ -44,7 +39,7 @@ import {
     InteractionRequiredAuthErrorCodes,
     createInteractionRequiredAuthError,
 } from "../error/InteractionRequiredAuthError.js";
-import { PerformanceEvents } from "../telemetry/performance/PerformanceEvent.js";
+import * as PerformanceEvents from "../telemetry/performance/PerformanceEvents.js";
 import { IPerformanceClient } from "../telemetry/performance/IPerformanceClient.js";
 import { invoke, invokeAsync } from "../utils/FunctionWrappers.js";
 import { ClientAssertion } from "../account/ClientCredentials.js";
@@ -60,18 +55,13 @@ const DEFAULT_REFRESH_TOKEN_EXPIRATION_OFFSET_SECONDS = 300; // 5 Minutes
 export class RefreshTokenClient extends BaseClient {
     constructor(
         configuration: ClientConfiguration,
-        performanceClient?: IPerformanceClient
+        performanceClient: IPerformanceClient
     ) {
         super(configuration, performanceClient);
     }
     public async acquireToken(
         request: CommonRefreshTokenRequest
     ): Promise<AuthenticationResult> {
-        this.performanceClient?.addQueueMeasurement(
-            PerformanceEvents.RefreshTokenClientAcquireToken,
-            request.correlationId
-        );
-
         const reqTimestamp = TimeUtils.nowSeconds();
         const response = await invokeAsync(
             this.executeTokenRequest.bind(this),
@@ -82,16 +72,21 @@ export class RefreshTokenClient extends BaseClient {
         )(request, this.authority);
 
         // Retrieve requestId from response headers
-        const requestId = response.headers?.[HeaderNames.X_MS_REQUEST_ID];
+        const requestId =
+            response.headers?.[Constants.HeaderNames.X_MS_REQUEST_ID];
         const responseHandler = new ResponseHandler(
             this.config.authOptions.clientId,
             this.cacheManager,
             this.cryptoUtils,
             this.logger,
+            this.performanceClient,
             this.config.serializableCache,
             this.config.persistencePlugin
         );
-        responseHandler.validateTokenResponse(response.body);
+        responseHandler.validateTokenResponse(
+            response.body,
+            request.correlationId
+        );
 
         return invokeAsync(
             responseHandler.handleServerTokenResponse.bind(responseHandler),
@@ -125,12 +120,6 @@ export class RefreshTokenClient extends BaseClient {
                 ClientConfigurationErrorCodes.tokenRequestEmpty
             );
         }
-
-        this.performanceClient?.addQueueMeasurement(
-            PerformanceEvents.RefreshTokenClientAcquireTokenByRefreshToken,
-            request.correlationId
-        );
-
         // We currently do not support silent flow for account === null use cases; This will be revisited for confidential flow usecases
         if (!request.account) {
             throw createClientAuthError(
@@ -140,7 +129,8 @@ export class RefreshTokenClient extends BaseClient {
 
         // try checking if FOCI is enabled for the given application
         const isFOCI = this.cacheManager.isAppMetadataFOCI(
-            request.account.environment
+            request.account.environment,
+            request.correlationId
         );
 
         // if the app is part of the family, retrive a Family refresh token if present and make a refreshTokenRequest
@@ -160,8 +150,8 @@ export class RefreshTokenClient extends BaseClient {
                         InteractionRequiredAuthErrorCodes.noTokensFound;
                 const clientMismatchErrorWithFamilyRT =
                     e instanceof ServerError &&
-                    e.errorCode === Errors.INVALID_GRANT_ERROR &&
-                    e.subError === Errors.CLIENT_MISMATCH_ERROR;
+                    e.errorCode === Constants.INVALID_GRANT_ERROR &&
+                    e.subError === Constants.CLIENT_MISMATCH_ERROR;
 
                 // if family Refresh Token (FRT) cache acquisition fails or if client_mismatch error is seen with FRT, reattempt with application Refresh Token (ART)
                 if (noFamilyRTInCache || clientMismatchErrorWithFamilyRT) {
@@ -196,11 +186,6 @@ export class RefreshTokenClient extends BaseClient {
         request: CommonSilentFlowRequest,
         foci: boolean
     ) {
-        this.performanceClient?.addQueueMeasurement(
-            PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken,
-            request.correlationId
-        );
-
         // fetches family RT or application RT based on FOCI value
         const refreshToken = invoke(
             this.cacheManager.getRefreshToken.bind(this.cacheManager),
@@ -208,13 +193,7 @@ export class RefreshTokenClient extends BaseClient {
             this.logger,
             this.performanceClient,
             request.correlationId
-        )(
-            request.account,
-            foci,
-            request.correlationId,
-            undefined,
-            this.performanceClient
-        );
+        )(request.account, foci, request.correlationId, undefined);
 
         if (!refreshToken) {
             throw createInteractionRequiredAuthError(
@@ -244,7 +223,8 @@ export class RefreshTokenClient extends BaseClient {
             ...request,
             refreshToken: refreshToken.secret,
             authenticationScheme:
-                request.authenticationScheme || AuthenticationScheme.BEARER,
+                request.authenticationScheme ||
+                Constants.AuthenticationScheme.BEARER,
             ccsCredential: {
                 credential: request.account.homeAccountId,
                 type: CcsCredentialType.HOME_ACCOUNT_ID,
@@ -269,7 +249,8 @@ export class RefreshTokenClient extends BaseClient {
                 if (e.subError === InteractionRequiredAuthErrorCodes.badToken) {
                     // Remove bad refresh token from cache
                     this.logger.verbose(
-                        "acquireTokenWithRefreshToken: bad refresh token, removing from cache"
+                        "acquireTokenWithRefreshToken: bad refresh token, removing from cache",
+                        request.correlationId
                     );
                     const badRefreshTokenKey =
                         this.cacheManager.generateCredentialKey(refreshToken);
@@ -293,11 +274,6 @@ export class RefreshTokenClient extends BaseClient {
         request: CommonRefreshTokenRequest,
         authority: Authority
     ): Promise<NetworkResponse<ServerAuthorizationTokenResponse>> {
-        this.performanceClient?.addQueueMeasurement(
-            PerformanceEvents.RefreshTokenClientExecuteTokenRequest,
-            request.correlationId
-        );
-
         const queryParametersString = this.createTokenQueryParameters(request);
         const endpoint = UrlString.appendQueryString(
             authority.tokenEndpoint,
@@ -326,14 +302,7 @@ export class RefreshTokenClient extends BaseClient {
             this.logger,
             this.performanceClient,
             request.correlationId
-        )(
-            endpoint,
-            requestBody,
-            headers,
-            thumbprint,
-            request.correlationId,
-            PerformanceEvents.RefreshTokenClientExecutePostToTokenEndpoint
-        );
+        )(endpoint, requestBody, headers, thumbprint, request.correlationId);
     }
 
     /**
@@ -343,11 +312,6 @@ export class RefreshTokenClient extends BaseClient {
     private async createTokenRequestBody(
         request: CommonRefreshTokenRequest
     ): Promise<string> {
-        this.performanceClient?.addQueueMeasurement(
-            PerformanceEvents.RefreshTokenClientCreateTokenRequestBody,
-            request.correlationId
-        );
-
         const parameters = new Map<string, string>();
 
         RequestParameterBuilder.addClientId(
@@ -373,7 +337,7 @@ export class RefreshTokenClient extends BaseClient {
 
         RequestParameterBuilder.addGrantType(
             parameters,
-            GrantType.REFRESH_TOKEN_GRANT
+            Constants.GrantType.REFRESH_TOKEN_GRANT
         );
 
         RequestParameterBuilder.addClientInfo(parameters);
@@ -425,7 +389,9 @@ export class RefreshTokenClient extends BaseClient {
             );
         }
 
-        if (request.authenticationScheme === AuthenticationScheme.POP) {
+        if (
+            request.authenticationScheme === Constants.AuthenticationScheme.POP
+        ) {
             const popTokenGenerator = new PopTokenGenerator(
                 this.cryptoUtils,
                 this.performanceClient
@@ -448,7 +414,9 @@ export class RefreshTokenClient extends BaseClient {
 
             // SPA PoP requires full Base64Url encoded req_cnf string (unhashed)
             RequestParameterBuilder.addPopToken(parameters, reqCnfData);
-        } else if (request.authenticationScheme === AuthenticationScheme.SSH) {
+        } else if (
+            request.authenticationScheme === Constants.AuthenticationScheme.SSH
+        ) {
             if (request.sshJwk) {
                 RequestParameterBuilder.addSshJwk(parameters, request.sshJwk);
             } else {
@@ -486,8 +454,8 @@ export class RefreshTokenClient extends BaseClient {
                         );
                     } catch (e) {
                         this.logger.verbose(
-                            "Could not parse home account ID for CCS Header: " +
-                                e
+                            `Could not parse home account ID for CCS Header: '${e}'`,
+                            request.correlationId
                         );
                     }
                     break;

package/src/client/SilentFlowClient.ts

@@ -19,7 +19,7 @@ import { IPerformanceClient } from "../telemetry/performance/IPerformanceClient.
 import { StringUtils } from "../utils/StringUtils.js";
 import { checkMaxAge, extractTokenClaims } from "../account/AuthToken.js";
 import { TokenClaims } from "../account/TokenClaims.js";
-import { PerformanceEvents } from "../telemetry/performance/PerformanceEvent.js";
+import * as PerformanceEvents from "../telemetry/performance/PerformanceEvents.js";
 import { invokeAsync } from "../utils/FunctionWrappers.js";
 import { getTenantFromAuthorityString } from "../authority/Authority.js";
 
@@ -27,7 +27,7 @@ import { getTenantFromAuthorityString } from "../authority/Authority.js";
 export class SilentFlowClient extends BaseClient {
     constructor(
         configuration: ClientConfiguration,
-        performanceClient?: IPerformanceClient
+        performanceClient: IPerformanceClient
     ) {
         super(configuration, performanceClient);
     }
@@ -39,17 +39,9 @@ export class SilentFlowClient extends BaseClient {
     async acquireCachedToken(
         request: CommonSilentFlowRequest
     ): Promise<[AuthenticationResult, CacheOutcome]> {
-        this.performanceClient?.addQueueMeasurement(
-            PerformanceEvents.SilentFlowClientAcquireCachedToken,
-            request.correlationId
-        );
         let lastCacheOutcome: CacheOutcome = CacheOutcome.NOT_APPLICABLE;
 
-        if (
-            request.forceRefresh ||
-            (!this.config.cacheOptions.claimsBasedCachingEnabled &&
-                !StringUtils.isEmptyObj(request.claims))
-        ) {
+        if (request.forceRefresh || !StringUtils.isEmptyObj(request.claims)) {
             // Must refresh due to present force_refresh flag.
             this.setCacheOutcome(
                 CacheOutcome.FORCE_REFRESH_OR_CLAIMS,
@@ -124,12 +116,13 @@ export class SilentFlowClient extends BaseClient {
                 request.account,
                 request.correlationId,
                 tokenKeys,
-                requestTenantId,
-                this.performanceClient
+                requestTenantId
             ),
             refreshToken: null,
-            appMetadata:
-                this.cacheManager.readAppMetadataFromCache(environment),
+            appMetadata: this.cacheManager.readAppMetadataFromCache(
+                environment,
+                request.correlationId
+            ),
         };
 
         this.setCacheOutcome(lastCacheOutcome, request.correlationId);
@@ -163,7 +156,8 @@ export class SilentFlowClient extends BaseClient {
         );
         if (cacheOutcome !== CacheOutcome.NOT_APPLICABLE) {
             this.logger.info(
-                `Token refresh is required due to cache outcome: ${cacheOutcome}`
+                `Token refresh is required due to cache outcome: '${cacheOutcome}'`,
+                correlationId
             );
         }
     }
@@ -176,10 +170,6 @@ export class SilentFlowClient extends BaseClient {
         cacheRecord: CacheRecord,
         request: CommonSilentFlowRequest
     ): Promise<AuthenticationResult> {
-        this.performanceClient?.addQueueMeasurement(
-            PerformanceEvents.SilentFlowClientGenerateResultFromCacheRecord,
-            request.correlationId
-        );
         let idTokenClaims: TokenClaims | undefined;
         if (cacheRecord.idToken) {
             idTokenClaims = extractTokenClaims(
@@ -206,6 +196,7 @@ export class SilentFlowClient extends BaseClient {
             cacheRecord,
             true,
             request,
+            this.performanceClient,
             idTokenClaims
         );
     }

package/src/config/ClientConfiguration.ts

@@ -7,8 +7,9 @@ import { INetworkModule } from "../network/INetworkModule.js";
 import { DEFAULT_CRYPTO_IMPLEMENTATION, ICrypto } from "../crypto/ICrypto.js";
 import { ILoggerCallback, Logger, LogLevel } from "../logger/Logger.js";
 import {
-    Constants,
+    DEFAULT_COMMON_TENANT,
     DEFAULT_TOKEN_RENEWAL_OFFSET_SEC,
+    SKU,
 } from "../utils/Constants.js";
 import { version } from "../packageMetadata.js";
 import type { Authority } from "../authority/Authority.js";
@@ -44,7 +45,6 @@ export type ClientConfiguration = {
     authOptions: AuthOptions;
     systemOptions?: SystemOptions;
     loggerOptions?: LoggerOptions;
-    cacheOptions?: CacheOptions;
     storageInterface?: CacheManager;
     networkInterface?: INetworkModule;
     cryptoInterface?: ICrypto;
@@ -60,7 +60,6 @@ export type CommonClientConfiguration = {
     authOptions: Required<AuthOptions>;
     systemOptions: Required<SystemOptions>;
     loggerOptions: Required<LoggerOptions>;
-    cacheOptions: Required<CacheOptions>;
     storageInterface: CacheManager;
     networkInterface: INetworkModule;
     cryptoInterface: Required<ICrypto>;
@@ -80,11 +79,8 @@ export type CommonClientConfiguration = {
  * - knownAuthorities            - An array of URIs that are known to be valid. Used in B2C scenarios.
  * - cloudDiscoveryMetadata      - A string containing the cloud discovery response. Used in AAD scenarios.
  * - clientCapabilities          - Array of capabilities which will be added to the claims.access_token.xms_cc request property on every network request.
- * - protocolMode                - Enum that represents the protocol that msal follows. Used for configuring proper endpoints.
- * - skipAuthorityMetadataCache  - A flag to choose whether to use or not use the local metadata cache during authority initialization. Defaults to false.
  * - instanceAware               - A flag of whether the STS will send back additional parameters to specify where the tokens should be retrieved from.
  * - redirectUri                 - The redirect URI where authentication responses can be received by your application. It must exactly match one of the redirect URIs registered in the Azure portal.
- * - encodeExtraQueryParams      - A flag to choose whether to encode the extra query parameters or not. Defaults to false.
  * @internal
  */
 export type AuthOptions = {
@@ -93,18 +89,14 @@ export type AuthOptions = {
     redirectUri: string;
     clientCapabilities?: Array<string>;
     azureCloudOptions?: AzureCloudOptions;
-    skipAuthorityMetadataCache?: boolean;
     instanceAware?: boolean;
-    /**
-     * @deprecated This flag is deprecated and will be removed in the next major version where all extra query params will be encoded by default.
-     */
-    encodeExtraQueryParams?: boolean;
 };
 
 /**
  * Use this to configure token renewal info in the Configuration object
  *
  * - tokenRenewalOffsetSeconds    - Sets the window of offset needed to renew the token before expiry
+ * - protocolMode                - Enum that represents the protocol that msal follows. Used for configuring proper endpoints.
  */
 export type SystemOptions = {
     tokenRenewalOffsetSeconds?: number;
@@ -126,18 +118,6 @@ export type LoggerOptions = {
     correlationId?: string;
 };
 
-/**
- *  Use this to configure credential cache preferences in the ClientConfiguration object
- *
- * - claimsBasedCachingEnabled   - Sets whether tokens should be cached based on the claims hash. Default is false.
- */
-export type CacheOptions = {
-    /**
-     * @deprecated claimsBasedCachingEnabled is deprecated and will be removed in the next major version.
-     */
-    claimsBasedCachingEnabled?: boolean;
-};
-
 /**
  * Library-specific options
  */
@@ -184,11 +164,7 @@ const DEFAULT_LOGGER_IMPLEMENTATION: Required<LoggerOptions> = {
     },
     piiLoggingEnabled: false,
     logLevel: LogLevel.Info,
-    correlationId: Constants.EMPTY_STRING,
-};
-
-const DEFAULT_CACHE_OPTIONS: Required<CacheOptions> = {
-    claimsBasedCachingEnabled: false,
+    correlationId: "",
 };
 
 const DEFAULT_NETWORK_IMPLEMENTATION: INetworkModule = {
@@ -201,20 +177,20 @@ const DEFAULT_NETWORK_IMPLEMENTATION: INetworkModule = {
 };
 
 const DEFAULT_LIBRARY_INFO: LibraryInfo = {
-    sku: Constants.SKU,
+    sku: SKU,
     version: version,
-    cpu: Constants.EMPTY_STRING,
-    os: Constants.EMPTY_STRING,
+    cpu: "",
+    os: "",
 };
 
 const DEFAULT_CLIENT_CREDENTIALS: ClientCredentials = {
-    clientSecret: Constants.EMPTY_STRING,
+    clientSecret: "",
     clientAssertion: undefined,
 };
 
 const DEFAULT_AZURE_CLOUD_OPTIONS: AzureCloudOptions = {
     azureCloudInstance: AzureCloudInstance.None,
-    tenant: `${Constants.DEFAULT_COMMON_TENANT}`,
+    tenant: `${DEFAULT_COMMON_TENANT}`,
 };
 
 const DEFAULT_TELEMETRY_OPTIONS: Required<TelemetryOptions> = {
@@ -235,7 +211,6 @@ export function buildClientConfiguration({
     authOptions: userAuthOptions,
     systemOptions: userSystemOptions,
     loggerOptions: userLoggerOption,
-    cacheOptions: userCacheOptions,
     storageInterface: storageImplementation,
     networkInterface: networkImplementation,
     cryptoInterface: cryptoImplementation,
@@ -255,7 +230,6 @@ export function buildClientConfiguration({
         authOptions: buildAuthOptions(userAuthOptions),
         systemOptions: { ...DEFAULT_SYSTEM_OPTIONS, ...userSystemOptions },
         loggerOptions: loggerOptions,
-        cacheOptions: { ...DEFAULT_CACHE_OPTIONS, ...userCacheOptions },
         storageInterface:
             storageImplementation ||
             new DefaultStorageClass(
@@ -284,9 +258,7 @@ function buildAuthOptions(authOptions: AuthOptions): Required<AuthOptions> {
     return {
         clientCapabilities: [],
         azureCloudOptions: DEFAULT_AZURE_CLOUD_OPTIONS,
-        skipAuthorityMetadataCache: false,
         instanceAware: false,
-        encodeExtraQueryParams: false,
         ...authOptions,
     };
 }

package/src/crypto/ICrypto.ts

@@ -28,7 +28,7 @@ export type SignedHttpRequestParameters = Pick<
     | "shrNonce"
     | "shrOptions"
 > & {
-    correlationId?: string;
+    correlationId: string;
 };
 
 /**
@@ -69,12 +69,14 @@ export interface ICrypto {
     /**
      * Removes cryptographic keypair from key store matching the keyId passed in
      * @param kid
+     * @param correlationId
      */
-    removeTokenBindingKey(kid: string): Promise<void>;
+    removeTokenBindingKey(kid: string, correlationId: string): Promise<void>;
     /**
      * Removes all cryptographic keys from IndexedDB storage
+     * @param correlationId
      */
-    clearKeystore(): Promise<boolean>;
+    clearKeystore(correlationId: string): Promise<boolean>;
     /**
      * Returns a signed proof-of-possession token with a given acces token that contains a cnf claim with the required kid.
      * @param accessToken

package/src/crypto/PopTokenGenerator.ts

@@ -7,7 +7,7 @@ import { ICrypto, SignedHttpRequestParameters } from "./ICrypto.js";
 import * as TimeUtils from "../utils/TimeUtils.js";
 import { UrlString } from "../url/UrlString.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 { Logger } from "../logger/Logger.js";
 
@@ -37,9 +37,9 @@ export type KeyLocation = (typeof KeyLocation)[keyof typeof KeyLocation];
 /** @internal */
 export class PopTokenGenerator {
     private cryptoUtils: ICrypto;
-    private performanceClient?: IPerformanceClient;
+    private performanceClient: IPerformanceClient;
 
-    constructor(cryptoUtils: ICrypto, performanceClient?: IPerformanceClient) {
+    constructor(cryptoUtils: ICrypto, performanceClient: IPerformanceClient) {
         this.cryptoUtils = cryptoUtils;
         this.performanceClient = performanceClient;
     }
@@ -54,11 +54,6 @@ export class PopTokenGenerator {
         request: SignedHttpRequestParameters,
         logger: Logger
     ): Promise<ReqCnfData> {
-        this.performanceClient?.addQueueMeasurement(
-            PerformanceEvents.PopTokenGenerateCnf,
-            request.correlationId
-        );
-
         const reqCnf = await invokeAsync(
             this.generateKid.bind(this),
             PerformanceEvents.PopTokenGenerateCnf,
@@ -82,11 +77,6 @@ export class PopTokenGenerator {
      * @returns
      */
     async generateKid(request: SignedHttpRequestParameters): Promise<ReqCnf> {
-        this.performanceClient?.addQueueMeasurement(
-            PerformanceEvents.PopTokenGenerateKid,
-            request.correlationId
-        );
-
         const kidThumbprint = await this.cryptoUtils.getPublicKeyThumbprint(
             request
         );

package/src/error/AuthError.ts

@@ -3,30 +3,12 @@
  * Licensed under the MIT License.
  */
 
-import { Constants } from "../utils/Constants.js";
 import * as AuthErrorCodes from "./AuthErrorCodes.js";
 export { AuthErrorCodes };
 
-export const AuthErrorMessages = {
-    [AuthErrorCodes.unexpectedError]: "Unexpected error in authentication.",
-    [AuthErrorCodes.postRequestFailed]:
-        "Post request failed from the network, could be a 4xx/5xx or a network unavailability. Please check the exact error code for details.",
-};
-
-/**
- * AuthErrorMessage class containing string constants used by error codes and messages.
- * @deprecated Use AuthErrorCodes instead
- */
-export const AuthErrorMessage = {
-    unexpectedError: {
-        code: AuthErrorCodes.unexpectedError,
-        desc: AuthErrorMessages[AuthErrorCodes.unexpectedError],
-    },
-    postRequestFailed: {
-        code: AuthErrorCodes.postRequestFailed,
-        desc: AuthErrorMessages[AuthErrorCodes.postRequestFailed],
-    },
-};
+export function getDefaultErrorMessage(code: string): string {
+    return `See https://aka.ms/msal.js.errors#${code} for details`;
+}
 
 /**
  * General error class thrown by the MSAL.js library.
@@ -53,15 +35,16 @@ export class AuthError extends Error {
     correlationId: string;
 
     constructor(errorCode?: string, errorMessage?: string, suberror?: string) {
-        const errorString = errorMessage
-            ? `${errorCode}: ${errorMessage}`
-            : errorCode;
+        const message =
+            errorMessage ||
+            (errorCode ? getDefaultErrorMessage(errorCode) : "");
+        const errorString = message ? `${errorCode}: ${message}` : errorCode;
         super(errorString);
         Object.setPrototypeOf(this, AuthError.prototype);
 
-        this.errorCode = errorCode || Constants.EMPTY_STRING;
-        this.errorMessage = errorMessage || Constants.EMPTY_STRING;
-        this.subError = suberror || Constants.EMPTY_STRING;
+        this.errorCode = errorCode || "";
+        this.errorMessage = message || "";
+        this.subError = suberror || "";
         this.name = "AuthError";
     }
 
@@ -76,8 +59,6 @@ export function createAuthError(
 ): AuthError {
     return new AuthError(
         code,
-        additionalMessage
-            ? `${AuthErrorMessages[code]} ${additionalMessage}`
-            : AuthErrorMessages[code]
+        additionalMessage || getDefaultErrorMessage(code)
     );
 }