@azure/msal-common 14.0.3 → 14.1.0-alpha.0

package/src/crypto/PopTokenGenerator.ts

@@ -8,6 +8,8 @@ import { TimeUtils } from "../utils/TimeUtils";
 import { UrlString } from "../url/UrlString";
 import { IPerformanceClient } from "../telemetry/performance/IPerformanceClient";
 import { PerformanceEvents } from "../telemetry/performance/PerformanceEvent";
+import { invokeAsync } from "../utils/FunctionWrappers";
+import { Logger } from "../logger/Logger";
 
 /**
  * See eSTS docs for more info.
@@ -50,18 +52,21 @@ export class PopTokenGenerator {
      * @returns
      */
     async generateCnf(
-        request: SignedHttpRequestParameters
+        request: SignedHttpRequestParameters,
+        logger: Logger
     ): Promise<ReqCnfData> {
         this.performanceClient?.addQueueMeasurement(
             PerformanceEvents.PopTokenGenerateCnf,
             request.correlationId
         );
 
-        this.performanceClient?.setPreQueueTime(
-            PerformanceEvents.PopTokenGenerateKid,
+        const reqCnf = await invokeAsync(
+            this.generateKid.bind(this),
+            PerformanceEvents.PopTokenGenerateCnf,
+            logger,
+            this.performanceClient,
             request.correlationId
-        );
-        const reqCnf = await this.generateKid(request);
+        )(request);
         const reqCnfString: string = this.cryptoUtils.base64Encode(
             JSON.stringify(reqCnf)
         );

package/src/error/AuthError.ts

@@ -4,18 +4,27 @@
  */
 
 import { Constants } from "../utils/Constants";
+import * as AuthErrorCodes from "./AuthErrorCodes";
+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: "unexpected_error",
-        desc: "Unexpected error in authentication.",
+        code: AuthErrorCodes.unexpectedError,
+        desc: AuthErrorMessages[AuthErrorCodes.unexpectedError],
     },
     postRequestFailed: {
-        code: "post_request_failed",
-        desc: "Post request failed from the network, could be a 4xx/5xx or a network unavailability. Please check the exact error code for details.",
+        code: AuthErrorCodes.postRequestFailed,
+        desc: AuthErrorMessages[AuthErrorCodes.postRequestFailed],
     },
 };
 
@@ -59,27 +68,16 @@ export class AuthError extends Error {
     setCorrelationId(correlationId: string): void {
         this.correlationId = correlationId;
     }
+}
 
-    /**
-     * Creates an error that is thrown when something unexpected happens in the library.
-     * @param errDesc
-     */
-    static createUnexpectedError(errDesc: string): AuthError {
-        return new AuthError(
-            AuthErrorMessage.unexpectedError.code,
-            `${AuthErrorMessage.unexpectedError.desc}: ${errDesc}`
-        );
-    }
-
-    /**
-     * Creates an error for post request failures.
-     * @param errDesc
-     * @returns
-     */
-    static createPostRequestFailed(errDesc: string): AuthError {
-        return new AuthError(
-            AuthErrorMessage.postRequestFailed.code,
-            `${AuthErrorMessage.postRequestFailed.desc}: ${errDesc}`
-        );
-    }
+export function createAuthError(
+    code: string,
+    additionalMessage?: string
+): AuthError {
+    return new AuthError(
+        code,
+        additionalMessage
+            ? `${AuthErrorMessages[code]} ${additionalMessage}`
+            : AuthErrorMessages[code]
+    );
 }

package/src/error/AuthErrorCodes.ts

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+/**
+ * AuthErrorMessage class containing string constants used by error codes and messages.
+ */
+export const unexpectedError = "unexpected_error";
+export const postRequestFailed = "post_request_failed";