@azure/msal-browser 4.24.1 → 5.0.0-alpha.0

package/src/error/BrowserAuthError.ts

@@ -7,351 +7,16 @@ import { AuthError } from "@azure/msal-common/browser";
 import * as BrowserAuthErrorCodes from "./BrowserAuthErrorCodes.js";
 export { BrowserAuthErrorCodes }; // Allow importing as "BrowserAuthErrorCodes"
 
-const ErrorLink = "For more visit: aka.ms/msaljs/browser-errors";
-
-/**
- * BrowserAuthErrorMessage class containing string constants used by error codes and messages.
- */
-export const BrowserAuthErrorMessages = {
-    [BrowserAuthErrorCodes.pkceNotCreated]:
-        "The PKCE code challenge and verifier could not be generated.",
-    [BrowserAuthErrorCodes.earJwkEmpty]:
-        "No EAR encryption key provided. This is unexpected.",
-    [BrowserAuthErrorCodes.earJweEmpty]:
-        "Server response does not contain ear_jwe property. This is unexpected.",
-    [BrowserAuthErrorCodes.cryptoNonExistent]:
-        "The crypto object or function is not available.",
-    [BrowserAuthErrorCodes.emptyNavigateUri]:
-        "Navigation URI is empty. Please check stack trace for more info.",
-    [BrowserAuthErrorCodes.hashEmptyError]: `Hash value cannot be processed because it is empty. Please verify that your redirectUri is not clearing the hash. ${ErrorLink}`,
-    [BrowserAuthErrorCodes.noStateInHash]:
-        "Hash does not contain state. Please verify that the request originated from msal.",
-    [BrowserAuthErrorCodes.hashDoesNotContainKnownProperties]: `Hash does not contain known properites. Please verify that your redirectUri is not changing the hash.  ${ErrorLink}`,
-    [BrowserAuthErrorCodes.unableToParseState]:
-        "Unable to parse state. Please verify that the request originated from msal.",
-    [BrowserAuthErrorCodes.stateInteractionTypeMismatch]:
-        "Hash contains state but the interaction type does not match the caller.",
-    [BrowserAuthErrorCodes.interactionInProgress]: `Interaction is currently in progress. Please ensure that this interaction has been completed before calling an interactive API.   ${ErrorLink}`,
-    [BrowserAuthErrorCodes.popupWindowError]:
-        "Error opening popup window. This can happen if you are using IE or if popups are blocked in the browser.",
-    [BrowserAuthErrorCodes.emptyWindowError]:
-        "window.open returned null or undefined window object.",
-    [BrowserAuthErrorCodes.userCancelled]: "User cancelled the flow.",
-    [BrowserAuthErrorCodes.monitorPopupTimeout]: `Token acquisition in popup failed due to timeout.  ${ErrorLink}`,
-    [BrowserAuthErrorCodes.monitorWindowTimeout]: `Token acquisition in iframe failed due to timeout.  ${ErrorLink}`,
-    [BrowserAuthErrorCodes.redirectInIframe]:
-        "Redirects are not supported for iframed or brokered applications. Please ensure you are using MSAL.js in a top frame of the window if using the redirect APIs, or use the popup APIs.",
-    [BrowserAuthErrorCodes.blockIframeReload]: `Request was blocked inside an iframe because MSAL detected an authentication response.  ${ErrorLink}`,
-    [BrowserAuthErrorCodes.blockNestedPopups]:
-        "Request was blocked inside a popup because MSAL detected it was running in a popup.",
-    [BrowserAuthErrorCodes.iframeClosedPrematurely]:
-        "The iframe being monitored was closed prematurely.",
-    [BrowserAuthErrorCodes.silentLogoutUnsupported]:
-        "Silent logout not supported. Please call logoutRedirect or logoutPopup instead.",
-    [BrowserAuthErrorCodes.noAccountError]:
-        "No account object provided to acquireTokenSilent and no active account has been set. Please call setActiveAccount or provide an account on the request.",
-    [BrowserAuthErrorCodes.silentPromptValueError]:
-        "The value given for the prompt value is not valid for silent requests - must be set to 'none' or 'no_session'.",
-    [BrowserAuthErrorCodes.noTokenRequestCacheError]:
-        "No token request found in cache.",
-    [BrowserAuthErrorCodes.unableToParseTokenRequestCacheError]:
-        "The cached token request could not be parsed.",
-    [BrowserAuthErrorCodes.authRequestNotSetError]:
-        "Auth Request not set. Please ensure initiateAuthRequest was called from the InteractionHandler",
-    [BrowserAuthErrorCodes.invalidCacheType]: "Invalid cache type",
-    [BrowserAuthErrorCodes.nonBrowserEnvironment]:
-        "Login and token requests are not supported in non-browser environments.",
-    [BrowserAuthErrorCodes.databaseNotOpen]: "Database is not open!",
-    [BrowserAuthErrorCodes.noNetworkConnectivity]:
-        "No network connectivity. Check your internet connection.",
-    [BrowserAuthErrorCodes.postRequestFailed]:
-        "Network request failed: If the browser threw a CORS error, check that the redirectUri is registered in the Azure App Portal as type 'SPA'",
-    [BrowserAuthErrorCodes.getRequestFailed]:
-        "Network request failed. Please check the network trace to determine root cause.",
-    [BrowserAuthErrorCodes.failedToParseResponse]:
-        "Failed to parse network response. Check network trace.",
-    [BrowserAuthErrorCodes.unableToLoadToken]: "Error loading token to cache.",
-    [BrowserAuthErrorCodes.cryptoKeyNotFound]:
-        "Cryptographic Key or Keypair not found in browser storage.",
-    [BrowserAuthErrorCodes.authCodeRequired]:
-        "An authorization code must be provided (as the `code` property on the request) to this flow.",
-    [BrowserAuthErrorCodes.authCodeOrNativeAccountIdRequired]:
-        "An authorization code or nativeAccountId must be provided to this flow.",
-    [BrowserAuthErrorCodes.spaCodeAndNativeAccountIdPresent]:
-        "Request cannot contain both spa code and native account id.",
-    [BrowserAuthErrorCodes.databaseUnavailable]:
-        "IndexedDB, which is required for persistent cryptographic key storage, is unavailable. This may be caused by browser privacy features which block persistent storage in third-party contexts.",
-    [BrowserAuthErrorCodes.unableToAcquireTokenFromNativePlatform]: `Unable to acquire token from native platform.  ${ErrorLink}`,
-    [BrowserAuthErrorCodes.nativeHandshakeTimeout]:
-        "Timed out while attempting to establish connection to browser extension",
-    [BrowserAuthErrorCodes.nativeExtensionNotInstalled]:
-        "Native extension is not installed. If you think this is a mistake call the initialize function.",
-    [BrowserAuthErrorCodes.nativeConnectionNotEstablished]: `Connection to native platform has not been established. Please install a compatible browser extension and run initialize().  ${ErrorLink}`,
-    [BrowserAuthErrorCodes.uninitializedPublicClientApplication]: `You must call and await the initialize function before attempting to call any other MSAL API.  ${ErrorLink}`,
-    [BrowserAuthErrorCodes.nativePromptNotSupported]:
-        "The provided prompt is not supported by the native platform. This request should be routed to the web based flow.",
-    [BrowserAuthErrorCodes.invalidBase64String]:
-        "Invalid base64 encoded string.",
-    [BrowserAuthErrorCodes.invalidPopTokenRequest]:
-        "Invalid PoP token request. The request should not have both a popKid value and signPopToken set to true.",
-    [BrowserAuthErrorCodes.failedToBuildHeaders]:
-        "Failed to build request headers object.",
-    [BrowserAuthErrorCodes.failedToParseHeaders]:
-        "Failed to parse response headers",
-    [BrowserAuthErrorCodes.failedToDecryptEarResponse]:
-        "Failed to decrypt ear response",
-    [BrowserAuthErrorCodes.timedOut]: "The request timed out.",
-};
-
-/**
- * BrowserAuthErrorMessage class containing string constants used by error codes and messages.
- * @deprecated Use exported BrowserAuthErrorCodes instead.
- * In your app you can do :
- * ```
- * import { BrowserAuthErrorCodes } from "@azure/msal-browser";
- * ```
- */
-export const BrowserAuthErrorMessage = {
-    pkceNotGenerated: {
-        code: BrowserAuthErrorCodes.pkceNotCreated,
-        desc: BrowserAuthErrorMessages[BrowserAuthErrorCodes.pkceNotCreated],
-    },
-    cryptoDoesNotExist: {
-        code: BrowserAuthErrorCodes.cryptoNonExistent,
-        desc: BrowserAuthErrorMessages[BrowserAuthErrorCodes.cryptoNonExistent],
-    },
-    emptyNavigateUriError: {
-        code: BrowserAuthErrorCodes.emptyNavigateUri,
-        desc: BrowserAuthErrorMessages[BrowserAuthErrorCodes.emptyNavigateUri],
-    },
-    hashEmptyError: {
-        code: BrowserAuthErrorCodes.hashEmptyError,
-        desc: BrowserAuthErrorMessages[BrowserAuthErrorCodes.hashEmptyError],
-    },
-    hashDoesNotContainStateError: {
-        code: BrowserAuthErrorCodes.noStateInHash,
-        desc: BrowserAuthErrorMessages[BrowserAuthErrorCodes.noStateInHash],
-    },
-    hashDoesNotContainKnownPropertiesError: {
-        code: BrowserAuthErrorCodes.hashDoesNotContainKnownProperties,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.hashDoesNotContainKnownProperties
-        ],
-    },
-    unableToParseStateError: {
-        code: BrowserAuthErrorCodes.unableToParseState,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.unableToParseState
-        ],
-    },
-    stateInteractionTypeMismatchError: {
-        code: BrowserAuthErrorCodes.stateInteractionTypeMismatch,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.stateInteractionTypeMismatch
-        ],
-    },
-    interactionInProgress: {
-        code: BrowserAuthErrorCodes.interactionInProgress,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.interactionInProgress
-        ],
-    },
-    popupWindowError: {
-        code: BrowserAuthErrorCodes.popupWindowError,
-        desc: BrowserAuthErrorMessages[BrowserAuthErrorCodes.popupWindowError],
-    },
-    emptyWindowError: {
-        code: BrowserAuthErrorCodes.emptyWindowError,
-        desc: BrowserAuthErrorMessages[BrowserAuthErrorCodes.emptyWindowError],
-    },
-    userCancelledError: {
-        code: BrowserAuthErrorCodes.userCancelled,
-        desc: BrowserAuthErrorMessages[BrowserAuthErrorCodes.userCancelled],
-    },
-    monitorPopupTimeoutError: {
-        code: BrowserAuthErrorCodes.monitorPopupTimeout,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.monitorPopupTimeout
-        ],
-    },
-    monitorIframeTimeoutError: {
-        code: BrowserAuthErrorCodes.monitorWindowTimeout,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.monitorWindowTimeout
-        ],
-    },
-    redirectInIframeError: {
-        code: BrowserAuthErrorCodes.redirectInIframe,
-        desc: BrowserAuthErrorMessages[BrowserAuthErrorCodes.redirectInIframe],
-    },
-    blockTokenRequestsInHiddenIframeError: {
-        code: BrowserAuthErrorCodes.blockIframeReload,
-        desc: BrowserAuthErrorMessages[BrowserAuthErrorCodes.blockIframeReload],
-    },
-    blockAcquireTokenInPopupsError: {
-        code: BrowserAuthErrorCodes.blockNestedPopups,
-        desc: BrowserAuthErrorMessages[BrowserAuthErrorCodes.blockNestedPopups],
-    },
-    iframeClosedPrematurelyError: {
-        code: BrowserAuthErrorCodes.iframeClosedPrematurely,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.iframeClosedPrematurely
-        ],
-    },
-    silentLogoutUnsupportedError: {
-        code: BrowserAuthErrorCodes.silentLogoutUnsupported,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.silentLogoutUnsupported
-        ],
-    },
-    noAccountError: {
-        code: BrowserAuthErrorCodes.noAccountError,
-        desc: BrowserAuthErrorMessages[BrowserAuthErrorCodes.noAccountError],
-    },
-    silentPromptValueError: {
-        code: BrowserAuthErrorCodes.silentPromptValueError,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.silentPromptValueError
-        ],
-    },
-    noTokenRequestCacheError: {
-        code: BrowserAuthErrorCodes.noTokenRequestCacheError,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.noTokenRequestCacheError
-        ],
-    },
-    unableToParseTokenRequestCacheError: {
-        code: BrowserAuthErrorCodes.unableToParseTokenRequestCacheError,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.unableToParseTokenRequestCacheError
-        ],
-    },
-    authRequestNotSet: {
-        code: BrowserAuthErrorCodes.authRequestNotSetError,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.authRequestNotSetError
-        ],
-    },
-    invalidCacheType: {
-        code: BrowserAuthErrorCodes.invalidCacheType,
-        desc: BrowserAuthErrorMessages[BrowserAuthErrorCodes.invalidCacheType],
-    },
-    notInBrowserEnvironment: {
-        code: BrowserAuthErrorCodes.nonBrowserEnvironment,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.nonBrowserEnvironment
-        ],
-    },
-    databaseNotOpen: {
-        code: BrowserAuthErrorCodes.databaseNotOpen,
-        desc: BrowserAuthErrorMessages[BrowserAuthErrorCodes.databaseNotOpen],
-    },
-    noNetworkConnectivity: {
-        code: BrowserAuthErrorCodes.noNetworkConnectivity,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.noNetworkConnectivity
-        ],
-    },
-    postRequestFailed: {
-        code: BrowserAuthErrorCodes.postRequestFailed,
-        desc: BrowserAuthErrorMessages[BrowserAuthErrorCodes.postRequestFailed],
-    },
-    getRequestFailed: {
-        code: BrowserAuthErrorCodes.getRequestFailed,
-        desc: BrowserAuthErrorMessages[BrowserAuthErrorCodes.getRequestFailed],
-    },
-    failedToParseNetworkResponse: {
-        code: BrowserAuthErrorCodes.failedToParseResponse,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.failedToParseResponse
-        ],
-    },
-    unableToLoadTokenError: {
-        code: BrowserAuthErrorCodes.unableToLoadToken,
-        desc: BrowserAuthErrorMessages[BrowserAuthErrorCodes.unableToLoadToken],
-    },
-    signingKeyNotFoundInStorage: {
-        code: BrowserAuthErrorCodes.cryptoKeyNotFound,
-        desc: BrowserAuthErrorMessages[BrowserAuthErrorCodes.cryptoKeyNotFound],
-    },
-    authCodeRequired: {
-        code: BrowserAuthErrorCodes.authCodeRequired,
-        desc: BrowserAuthErrorMessages[BrowserAuthErrorCodes.authCodeRequired],
-    },
-    authCodeOrNativeAccountRequired: {
-        code: BrowserAuthErrorCodes.authCodeOrNativeAccountIdRequired,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.authCodeOrNativeAccountIdRequired
-        ],
-    },
-    spaCodeAndNativeAccountPresent: {
-        code: BrowserAuthErrorCodes.spaCodeAndNativeAccountIdPresent,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.spaCodeAndNativeAccountIdPresent
-        ],
-    },
-    databaseUnavailable: {
-        code: BrowserAuthErrorCodes.databaseUnavailable,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.databaseUnavailable
-        ],
-    },
-    unableToAcquireTokenFromNativePlatform: {
-        code: BrowserAuthErrorCodes.unableToAcquireTokenFromNativePlatform,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.unableToAcquireTokenFromNativePlatform
-        ],
-    },
-    nativeHandshakeTimeout: {
-        code: BrowserAuthErrorCodes.nativeHandshakeTimeout,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.nativeHandshakeTimeout
-        ],
-    },
-    nativeExtensionNotInstalled: {
-        code: BrowserAuthErrorCodes.nativeExtensionNotInstalled,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.nativeExtensionNotInstalled
-        ],
-    },
-    nativeConnectionNotEstablished: {
-        code: BrowserAuthErrorCodes.nativeConnectionNotEstablished,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.nativeConnectionNotEstablished
-        ],
-    },
-    uninitializedPublicClientApplication: {
-        code: BrowserAuthErrorCodes.uninitializedPublicClientApplication,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.uninitializedPublicClientApplication
-        ],
-    },
-    nativePromptNotSupported: {
-        code: BrowserAuthErrorCodes.nativePromptNotSupported,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.nativePromptNotSupported
-        ],
-    },
-    invalidBase64StringError: {
-        code: BrowserAuthErrorCodes.invalidBase64String,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.invalidBase64String
-        ],
-    },
-    invalidPopTokenRequest: {
-        code: BrowserAuthErrorCodes.invalidPopTokenRequest,
-        desc: BrowserAuthErrorMessages[
-            BrowserAuthErrorCodes.invalidPopTokenRequest
-        ],
-    },
-};
+export function getDefaultErrorMessage(code: string): string {
+    return `See https://aka.ms/msal.js.errors#${code} for details`;
+}
 
 /**
  * Browser library error class thrown by the MSAL.js library for SPAs
  */
 export class BrowserAuthError extends AuthError {
     constructor(errorCode: string, subError?: string) {
-        super(errorCode, BrowserAuthErrorMessages[errorCode], subError);
+        super(errorCode, getDefaultErrorMessage(errorCode), subError);
 
         Object.setPrototypeOf(this, BrowserAuthError.prototype);
         this.name = "BrowserAuthError";

package/src/error/BrowserConfigurationAuthError.ts

@@ -5,43 +5,8 @@
 
 import { AuthError } from "@azure/msal-common/browser";
 import * as BrowserConfigurationAuthErrorCodes from "./BrowserConfigurationAuthErrorCodes.js";
+import { getDefaultErrorMessage } from "./BrowserAuthError.js";
 export { BrowserConfigurationAuthErrorCodes };
-
-export const BrowserConfigurationAuthErrorMessages = {
-    [BrowserConfigurationAuthErrorCodes.storageNotSupported]:
-        "Given storage configuration option was not supported.",
-    [BrowserConfigurationAuthErrorCodes.stubbedPublicClientApplicationCalled]:
-        "Stub instance of Public Client Application was called. If using msal-react, please ensure context is not used without a provider. For more visit: aka.ms/msaljs/browser-errors",
-    [BrowserConfigurationAuthErrorCodes.inMemRedirectUnavailable]:
-        "Redirect cannot be supported. In-memory storage was selected and storeAuthStateInCookie=false, which would cause the library to be unable to handle the incoming hash. If you would like to use the redirect API, please use session/localStorage or set storeAuthStateInCookie=true.",
-};
-
-/**
- * BrowserAuthErrorMessage class containing string constants used by error codes and messages.
- * @deprecated Use BrowserAuthErrorCodes instead
- */
-export const BrowserConfigurationAuthErrorMessage = {
-    storageNotSupportedError: {
-        code: BrowserConfigurationAuthErrorCodes.storageNotSupported,
-        desc: BrowserConfigurationAuthErrorMessages[
-            BrowserConfigurationAuthErrorCodes.storageNotSupported
-        ],
-    },
-    stubPcaInstanceCalled: {
-        code: BrowserConfigurationAuthErrorCodes.stubbedPublicClientApplicationCalled,
-        desc: BrowserConfigurationAuthErrorMessages[
-            BrowserConfigurationAuthErrorCodes
-                .stubbedPublicClientApplicationCalled
-        ],
-    },
-    inMemRedirectUnavailable: {
-        code: BrowserConfigurationAuthErrorCodes.inMemRedirectUnavailable,
-        desc: BrowserConfigurationAuthErrorMessages[
-            BrowserConfigurationAuthErrorCodes.inMemRedirectUnavailable
-        ],
-    },
-};
-
 /**
  * Browser library error class thrown by the MSAL.js library for SPAs
  */
@@ -59,6 +24,6 @@ export function createBrowserConfigurationAuthError(
 ): BrowserConfigurationAuthError {
     return new BrowserConfigurationAuthError(
         errorCode,
-        BrowserConfigurationAuthErrorMessages[errorCode]
+        getDefaultErrorMessage(errorCode)
     );
 }

package/src/error/NativeAuthError.ts

@@ -12,6 +12,7 @@ import {
 import {
     createBrowserAuthError,
     BrowserAuthErrorCodes,
+    getDefaultErrorMessage,
 } from "./BrowserAuthError.js";
 
 import * as NativeAuthErrorCodes from "./NativeAuthErrorCodes.js";
@@ -28,16 +29,11 @@ export type OSError = {
 
 const INVALID_METHOD_ERROR = -2147186943;
 
-export const NativeAuthErrorMessages = {
-    [NativeAuthErrorCodes.userSwitch]:
-        "User attempted to switch accounts in the native broker, which is not allowed. All new accounts must sign-in through the standard web flow first, please try again.",
-};
-
 export class NativeAuthError extends AuthError {
     ext: OSError | undefined;
 
     constructor(errorCode: string, description?: string, ext?: OSError) {
-        super(errorCode, description);
+        super(errorCode, description || getDefaultErrorMessage(errorCode));
 
         Object.setPrototypeOf(this, NativeAuthError.prototype);
         this.name = "NativeAuthError";
@@ -52,7 +48,8 @@ export function isFatalNativeAuthError(error: NativeAuthError): boolean {
     if (
         error.ext &&
         error.ext.status &&
-        error.ext.status === NativeStatusCodes.DISABLED
+        (error.ext.status === NativeStatusCodes.PERSISTENT_ERROR ||
+            error.ext.status === NativeStatusCodes.DISABLED)
     ) {
         return true;
     }
@@ -67,7 +64,6 @@ export function isFatalNativeAuthError(error: NativeAuthError): boolean {
 
     switch (error.errorCode) {
         case NativeAuthErrorCodes.contentError:
-        case NativeAuthErrorCodes.pageException:
             return true;
         default:
             return false;
@@ -90,7 +86,8 @@ export function createNativeAuthError(
         switch (ext.status) {
             case NativeStatusCodes.ACCOUNT_UNAVAILABLE:
                 return createInteractionRequiredAuthError(
-                    InteractionRequiredAuthErrorCodes.nativeAccountUnavailable
+                    InteractionRequiredAuthErrorCodes.nativeAccountUnavailable,
+                    getDefaultErrorMessage(code)
                 );
             case NativeStatusCodes.USER_INTERACTION_REQUIRED:
                 return new InteractionRequiredAuthError(code, description);
@@ -109,9 +106,5 @@ export function createNativeAuthError(
         }
     }
 
-    return new NativeAuthError(
-        code,
-        NativeAuthErrorMessages[code] || description,
-        ext
-    );
+    return new NativeAuthError(code, description, ext);
 }

package/src/error/NativeAuthErrorCodes.ts

@@ -4,5 +4,5 @@
  */
 
 export const contentError = "ContentError";
-export const pageException = "PageException";
 export const userSwitch = "user_switch";
+export const unsupportedMethod = "unsupported_method";

package/src/error/NestedAppAuthError.ts

@@ -4,16 +4,7 @@
  */
 
 import { AuthError } from "@azure/msal-common/browser";
-
-/**
- * NestedAppAuthErrorMessage class containing string constants used by error codes and messages.
- */
-export const NestedAppAuthErrorMessage = {
-    unsupportedMethod: {
-        code: "unsupported_method",
-        desc: "This method is not supported in nested app environment.",
-    },
-};
+import { unsupportedMethod } from "./NativeAuthErrorCodes.js";
 
 export class NestedAppAuthError extends AuthError {
     constructor(errorCode: string, errorMessage?: string) {
@@ -24,9 +15,6 @@ export class NestedAppAuthError extends AuthError {
     }
 
     public static createUnsupportedError(): NestedAppAuthError {
-        return new NestedAppAuthError(
-            NestedAppAuthErrorMessage.unsupportedMethod.code,
-            NestedAppAuthErrorMessage.unsupportedMethod.desc
-        );
+        return new NestedAppAuthError(unsupportedMethod);
     }
 }

package/src/event/EventHandler.ts

@@ -51,12 +51,16 @@ export class EventHandler {
             const id = callbackId || createGuid();
             if (this.eventCallbacks.has(id)) {
                 this.logger.error(
-                    `Event callback with id: ${id} is already registered. Please provide a unique id or remove the existing callback and try again.`
+                    `Event callback with id: '${id}' is already registered. Please provide a unique id or remove the existing callback and try again.`,
+                    ""
                 );
                 return null;
             }
             this.eventCallbacks.set(id, [callback, eventTypes || []]);
-            this.logger.verbose(`Event callback registered with id: ${id}`);
+            this.logger.verbose(
+                `Event callback registered with id: '${id}'`,
+                ""
+            );
 
             return id;
         }
@@ -70,7 +74,7 @@ export class EventHandler {
      */
     removeEventCallback(callbackId: string): void {
         this.eventCallbacks.delete(callbackId);
-        this.logger.verbose(`Event callback ${callbackId} removed.`);
+        this.logger.verbose(`Event callback '${callbackId}' removed.`, "");
     }
 
     /**
@@ -95,17 +99,14 @@ export class EventHandler {
         };
 
         switch (eventType) {
-            case EventType.ACCOUNT_ADDED:
-            case EventType.ACCOUNT_REMOVED:
+            case EventType.LOGIN_SUCCESS:
+            case EventType.LOGOUT_SUCCESS:
             case EventType.ACTIVE_ACCOUNT_CHANGED:
                 // Send event to other open tabs / MSAL instances on same domain
                 this.broadcastChannel?.postMessage(message);
-                break;
-            default:
-                // Emit event to callbacks registered in this instance
-                this.invokeCallbacks(message);
-                break;
         }
+        // Emit event to callbacks registered in this instance
+        this.invokeCallbacks(message);
     }
 
     /**
@@ -126,7 +127,8 @@ export class EventHandler {
                     eventTypes.includes(message.eventType)
                 ) {
                     this.logger.verbose(
-                        `Emitting event to callback ${callbackId}: ${message.eventType}`
+                        `Emitting event to callback '${callbackId}': '${message.eventType}'`,
+                        ""
                     );
                     callback.apply(null, [message]);
                 }

package/src/event/EventMessage.ts

@@ -65,10 +65,6 @@ export class EventMessageUtils {
         currentStatus?: InteractionStatus
     ): InteractionStatus | null {
         switch (message.eventType) {
-            case EventType.LOGIN_START:
-                return InteractionStatus.Login;
-            case EventType.SSO_SILENT_START:
-                return InteractionStatus.SsoSilent;
             case EventType.ACQUIRE_TOKEN_START:
                 if (
                     message.interactionType === InteractionType.Redirect ||
@@ -81,16 +77,6 @@ export class EventMessageUtils {
                 return InteractionStatus.HandleRedirect;
             case EventType.LOGOUT_START:
                 return InteractionStatus.Logout;
-            case EventType.SSO_SILENT_SUCCESS:
-            case EventType.SSO_SILENT_FAILURE:
-                if (
-                    currentStatus &&
-                    currentStatus !== InteractionStatus.SsoSilent
-                ) {
-                    // Prevent this event from clearing any status other than ssoSilent
-                    break;
-                }
-                return InteractionStatus.None;
             case EventType.LOGOUT_END:
                 if (
                     currentStatus &&
@@ -109,8 +95,6 @@ export class EventMessageUtils {
                     break;
                 }
                 return InteractionStatus.None;
-            case EventType.LOGIN_SUCCESS:
-            case EventType.LOGIN_FAILURE:
             case EventType.ACQUIRE_TOKEN_SUCCESS:
             case EventType.ACQUIRE_TOKEN_FAILURE:
             case EventType.RESTORE_FROM_BFCACHE:
@@ -120,10 +104,9 @@ export class EventMessageUtils {
                 ) {
                     if (
                         currentStatus &&
-                        currentStatus !== InteractionStatus.Login &&
                         currentStatus !== InteractionStatus.AcquireToken
                     ) {
-                        // Prevent this event from clearing any status other than login or acquireToken
+                        // Prevent this event from clearing any status other than acquireToken
                         break;
                     }
                     return InteractionStatus.None;

package/src/event/EventType.ts

@@ -6,22 +6,15 @@
 export const EventType = {
     INITIALIZE_START: "msal:initializeStart",
     INITIALIZE_END: "msal:initializeEnd",
-    ACCOUNT_ADDED: "msal:accountAdded",
-    ACCOUNT_REMOVED: "msal:accountRemoved",
     ACTIVE_ACCOUNT_CHANGED: "msal:activeAccountChanged",
-    LOGIN_START: "msal:loginStart",
     LOGIN_SUCCESS: "msal:loginSuccess",
-    LOGIN_FAILURE: "msal:loginFailure",
     ACQUIRE_TOKEN_START: "msal:acquireTokenStart",
+    BROKERED_REQUEST_START: "msal:brokeredRequestStart",
     ACQUIRE_TOKEN_SUCCESS: "msal:acquireTokenSuccess",
+    BROKERED_REQUEST_SUCCESS: "msal:brokeredRequestSuccess",
     ACQUIRE_TOKEN_FAILURE: "msal:acquireTokenFailure",
+    BROKERED_REQUEST_FAILURE: "msal:brokeredRequestFailure",
     ACQUIRE_TOKEN_NETWORK_START: "msal:acquireTokenFromNetworkStart",
-    SSO_SILENT_START: "msal:ssoSilentStart",
-    SSO_SILENT_SUCCESS: "msal:ssoSilentSuccess",
-    SSO_SILENT_FAILURE: "msal:ssoSilentFailure",
-    ACQUIRE_TOKEN_BY_CODE_START: "msal:acquireTokenByCodeStart",
-    ACQUIRE_TOKEN_BY_CODE_SUCCESS: "msal:acquireTokenByCodeSuccess",
-    ACQUIRE_TOKEN_BY_CODE_FAILURE: "msal:acquireTokenByCodeFailure",
     HANDLE_REDIRECT_START: "msal:handleRedirectStart",
     HANDLE_REDIRECT_END: "msal:handleRedirectEnd",
     POPUP_OPENED: "msal:popupOpened",