@azure/msal-browser 3.7.2-alpha.3 → 3.9.0

package/package.json

@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/AzureAD/microsoft-authentication-library-for-js.git"
   },
-  "version": "3.7.2-alpha.3",
+  "version": "3.9.0",
   "description": "Microsoft Authentication Library for js",
   "keywords": [
     "implicit",
@@ -101,6 +101,6 @@
     "typescript": "^4.9.5"
   },
   "dependencies": {
-    "@azure/msal-common": "14.6.2-alpha.3"
+    "@azure/msal-common": "14.7.0"
   }
 }

package/src/controllers/StandardController.ts

@@ -345,18 +345,9 @@ export class StandardController implements IController {
             const redirectResponseKey = hash || "";
             let response = this.redirectResponse.get(redirectResponseKey);
             if (typeof response === "undefined") {
-                this.eventHandler.emitEvent(
-                    EventType.HANDLE_REDIRECT_START,
-                    InteractionType.Redirect
-                );
-                this.logger.verbose(
-                    "handleRedirectPromise has been called for the first time, storing the promise"
-                );
-
                 const request: NativeTokenRequest | null =
                     this.browserStorage.getCachedNativeRequest();
-                let redirectResponse: Promise<AuthenticationResult | null>;
-                if (
+                const useNative =
                     request &&
                     NativeMessageHandler.isNativeAvailable(
                         this.config,
@@ -364,8 +355,26 @@ export class StandardController implements IController {
                         this.nativeExtensionProvider
                     ) &&
                     this.nativeExtensionProvider &&
-                    !hash
-                ) {
+                    !hash;
+                const correlationId = useNative
+                    ? request?.correlationId
+                    : this.browserStorage.getTemporaryCache(
+                          TemporaryCacheKeys.CORRELATION_ID,
+                          true
+                      ) || "";
+                const rootMeasurement = this.performanceClient.startMeasurement(
+                    "acquireTokenRedirect",
+                    correlationId
+                );
+                this.eventHandler.emitEvent(
+                    EventType.HANDLE_REDIRECT_START,
+                    InteractionType.Redirect
+                );
+                this.logger.verbose(
+                    "handleRedirectPromise has been called for the first time, storing the promise"
+                );
+                let redirectResponse: Promise<AuthenticationResult | null>;
+                if (useNative && this.nativeExtensionProvider) {
                     this.logger.trace(
                         "handleRedirectPromise - acquiring token from native platform"
                     );
@@ -383,20 +392,36 @@ export class StandardController implements IController {
                         this.nativeInternalStorage,
                         request.correlationId
                     );
-                    redirectResponse = nativeClient.handleRedirectPromise();
+
+                    redirectResponse = invokeAsync(
+                        nativeClient.handleRedirectPromise.bind(nativeClient),
+                        PerformanceEvents.HandleNativeRedirectPromiseMeasurement,
+                        this.logger,
+                        this.performanceClient,
+                        rootMeasurement.event.correlationId
+                    )(
+                        this.performanceClient,
+                        rootMeasurement.event.correlationId
+                    );
                 } else {
                     this.logger.trace(
                         "handleRedirectPromise - acquiring token from web flow"
                     );
-                    const correlationId =
-                        this.browserStorage.getTemporaryCache(
-                            TemporaryCacheKeys.CORRELATION_ID,
-                            true
-                        ) || Constants.EMPTY_STRING;
                     const redirectClient =
                         this.createRedirectClient(correlationId);
-                    redirectResponse =
-                        redirectClient.handleRedirectPromise(hash);
+                    redirectResponse = invokeAsync(
+                        redirectClient.handleRedirectPromise.bind(
+                            redirectClient
+                        ),
+                        PerformanceEvents.HandleRedirectPromiseMeasurement,
+                        this.logger,
+                        this.performanceClient,
+                        rootMeasurement.event.correlationId
+                    )(
+                        hash,
+                        this.performanceClient,
+                        rootMeasurement.event.correlationId
+                    );
                 }
 
                 response = redirectResponse
@@ -426,35 +451,49 @@ export class StandardController implements IController {
                                     "handleRedirectResponse returned result, acquire token success"
                                 );
                             }
+                            rootMeasurement.end({ success: true });
                         }
                         this.eventHandler.emitEvent(
                             EventType.HANDLE_REDIRECT_END,
                             InteractionType.Redirect
                         );
+                        rootMeasurement.end({ success: false });
 
                         return result;
                     })
                     .catch((e) => {
+                        const eventError = e as EventError;
                         // Emit login event if there is an account
                         if (loggedInAccounts.length > 0) {
                             this.eventHandler.emitEvent(
                                 EventType.ACQUIRE_TOKEN_FAILURE,
                                 InteractionType.Redirect,
                                 null,
-                                e as EventError
+                                eventError
                             );
                         } else {
                             this.eventHandler.emitEvent(
                                 EventType.LOGIN_FAILURE,
                                 InteractionType.Redirect,
                                 null,
-                                e as EventError
+                                eventError
                             );
                         }
                         this.eventHandler.emitEvent(
                             EventType.HANDLE_REDIRECT_END,
                             InteractionType.Redirect
                         );
+                        if (eventError instanceof AuthError) {
+                            rootMeasurement.end({
+                                success: false,
+                                errorCode: eventError.errorCode,
+                                subErrorCode: eventError.subError,
+                            });
+                        } else {
+                            rootMeasurement.end({
+                                success: false,
+                            });
+                        }
 
                         throw e;
                     });

package/src/interaction_client/NativeInteractionClient.ts

@@ -320,8 +320,13 @@ export class NativeInteractionClient extends BaseInteractionClient {
 
     /**
      * If the previous page called native platform for a token using redirect APIs, send the same request again and return the response
+     * @param performanceClient {IPerformanceClient?}
+     * @param correlationId {string?} correlation identifier
      */
-    async handleRedirectPromise(): Promise<AuthenticationResult | null> {
+    async handleRedirectPromise(
+        performanceClient?: IPerformanceClient,
+        correlationId?: string
+    ): Promise<AuthenticationResult | null> {
         this.logger.trace(
             "NativeInteractionClient - handleRedirectPromise called."
         );
@@ -338,6 +343,12 @@ export class NativeInteractionClient extends BaseInteractionClient {
             this.logger.verbose(
                 "NativeInteractionClient - handleRedirectPromise called but there is no cached request, returning null."
             );
+            if (performanceClient && correlationId) {
+                performanceClient?.addFields(
+                    { errorCode: "no_cached_request" },
+                    correlationId
+                );
+            }
             return null;
         }
 

package/src/interaction_client/RedirectClient.ts

@@ -190,10 +190,14 @@ export class RedirectClient extends StandardInteractionClient {
      * Checks if navigateToLoginRequestUrl is set, and:
      * - if true, performs logic to cache and navigate
      * - if false, handles hash string and parses response
-     * @param hash
+     * @param hash {string?} url hash
+     * @param performanceClient {IPerformanceClient?}
+     * @param correlationId {string?} correlation identifier
      */
     async handleRedirectPromise(
-        hash?: string
+        hash?: string,
+        performanceClient?: IPerformanceClient,
+        correlationId?: string
     ): Promise<AuthenticationResult | null> {
         const serverTelemetryManager = this.initializeServerTelemetryManager(
             ApiId.handleRedirectPromise
@@ -216,6 +220,12 @@ export class RedirectClient extends StandardInteractionClient {
                 this.browserStorage.cleanRequestByInteractionType(
                     InteractionType.Redirect
                 );
+                if (performanceClient && correlationId) {
+                    performanceClient?.addFields(
+                        { errorCode: "no_server_response" },
+                        correlationId
+                    );
+                }
                 return null;
             }
 

package/src/packageMetadata.ts

@@ -1,3 +1,3 @@
 /* eslint-disable header/header */
 export const name = "@azure/msal-browser";
-export const version = "3.7.2-alpha.3";
+export const version = "3.9.0";