@azure/msal-browser 4.27.0 → 5.0.0-beta.0

package/src/config/Configuration.ts

@@ -8,10 +8,8 @@ import {
     LoggerOptions,
     INetworkModule,
     DEFAULT_SYSTEM_OPTIONS,
-    Constants,
     ProtocolMode,
     OIDCOptions,
-    ServerResponseType,
     LogLevel,
     StubbedNetworkModule,
     AzureCloudInstance,
@@ -22,15 +20,12 @@ import {
     IPerformanceClient,
     StubPerformanceClient,
     Logger,
+    Constants,
 } from "@azure/msal-common/browser";
-import {
-    BrowserCacheLocation,
-    BrowserConstants,
-} from "../utils/BrowserConstants.js";
+import { BrowserCacheLocation } from "../utils/BrowserConstants.js";
 import { INavigationClient } from "../navigation/INavigationClient.js";
 import { NavigationClient } from "../navigation/NavigationClient.js";
 import { FetchClient } from "../network/FetchClient.js";
-import * as BrowserUtils from "../utils/BrowserUtils.js";
 
 // Default timeout for popup windows and iframes in milliseconds
 export const DEFAULT_POPUP_TIMEOUT_MS = 60000;
@@ -70,18 +65,11 @@ export type BrowserAuthOptions = {
      * The redirect URI where the window navigates after a successful logout.
      */
     postLogoutRedirectUri?: string | null;
-    /**
-     * Boolean indicating whether to navigate to the original request URL after the auth server navigates to the redirect URL.
-     */
-    navigateToLoginRequestUrl?: boolean;
+
     /**
      * Array of capabilities which will be added to the claims.access_token.xms_cc request property on every network request.
      */
     clientCapabilities?: Array<string>;
-    /**
-     * Enum that represents the protocol that msal follows. Used for configuring proper endpoints.
-     */
-    protocolMode?: ProtocolMode;
     /**
      * Enum that configures options for the OIDC protocol mode.
      */
@@ -90,16 +78,6 @@ export type BrowserAuthOptions = {
      * Enum that represents the Azure Cloud to use.
      */
     azureCloudOptions?: AzureCloudOptions;
-    /**
-     * Flag of whether to use the local metadata cache
-     */
-    skipAuthorityMetadataCache?: boolean;
-    /**
-     * App supports nested app auth or not; defaults to
-     *
-     * @deprecated This flag is deprecated and will be removed in the next major version. createNestablePublicClientApplication should be used instead.
-     */
-    supportsNestedAppAuth?: boolean;
     /**
      * Callback that will be passed the url that MSAL will navigate to in redirect flows. Returning false in the callback will stop navigation.
      */
@@ -108,11 +86,6 @@ export type BrowserAuthOptions = {
      * Flag of whether the STS will send back additional parameters to specify where the tokens should be retrieved from.
      */
     instanceAware?: boolean;
-    /**
-     * Flag of whether to encode query parameters
-     * @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;
 };
 
 /** @internal */
@@ -136,31 +109,6 @@ export type CacheOptions = {
      * Used to specify the number of days cache entries written by previous versions of MSAL.js should be retained in the browser. Defaults to 5 days.
      */
     cacheRetentionDays?: number;
-    /**
-     * Used to specify the temporaryCacheLocation user wants to set. Valid values are "localStorage", "sessionStorage" and "memoryStorage".
-     * @deprecated This option is deprecated and will be removed in the next major version.
-     */
-    temporaryCacheLocation?: BrowserCacheLocation | string;
-    /**
-     * If set, MSAL stores the auth request state required for validation of the auth flows in the browser cookies. By default this flag is set to false.
-     * @deprecated This option is deprecated and will be removed in the next major version.
-     */
-    storeAuthStateInCookie?: boolean;
-    /**
-     * If set, MSAL sets the "Secure" flag on cookies so they can only be sent over HTTPS. By default this flag is set to true.
-     * @deprecated This option will be removed in the next major version and all cookies set will include the Secure attribute.
-     */
-    secureCookies?: boolean;
-    /**
-     * If set, MSAL will attempt to migrate cache entries from older versions on initialization. By default this flag is set to true if cacheLocation is localStorage, otherwise false.
-     * @deprecated This option is deprecated and will be removed in the next major version.
-     */
-    cacheMigrationEnabled?: boolean;
-    /**
-     * Flag that determines whether access tokens are stored based on requested claims
-     * @deprecated This option is deprecated and will be removed in the next major version.
-     */
-    claimsBasedCachingEnabled?: boolean;
 };
 
 export type BrowserSystemOptions = SystemOptions & {
@@ -177,30 +125,21 @@ export type BrowserSystemOptions = SystemOptions & {
      */
     navigationClient?: INavigationClient;
     /**
-     * Sets the timeout for waiting for a response hash in a popup. Will take precedence over loadFrameTimeout if both are set.
-     */
-    windowHashTimeout?: number;
-    /**
-     * Sets the timeout for waiting for a response hash in an iframe. Will take precedence over loadFrameTimeout if both are set.
-     */
-    iframeHashTimeout?: number;
-    /**
-     * Sets the timeout for waiting for a response hash in an iframe or popup
+     * Sets the timeout for waiting for response from a popup using BroadcastChannel
      */
-    loadFrameTimeout?: number;
+    popupBridgeTimeout?: number;
     /**
-     * Maximum time the library should wait for a frame to load
-     * @deprecated This was previously needed for older browsers which are no longer supported by MSAL.js. This option will be removed in the next major version
+     * Sets the timeout for waiting for response from an iframe using BroadcastChannel
      */
-    navigateFrameWait?: number;
+    iframeBridgeTimeout?: number;
     /**
      * Time to wait for redirection to occur before resolving promise
      */
     redirectNavigationTimeout?: number;
     /**
-     * Sets whether popups are opened asynchronously. By default, this flag is set to false. When set to false, blank popups are opened before anything else happens. When set to true, popups are opened when making the network request.
+     * Sets whether popups are opened and navigated to later. By default, this flag is set to true. When set to true, blank popups are opened and navigates to login domain. When set to false, popups are opened directly to the login domain.
      */
-    asyncPopups?: boolean;
+    navigatePopups?: boolean;
     /**
      * Flag to enable redirect opertaions when the app is rendered in an iframe (to support scenarios such as embedded B2C login).
      */
@@ -209,18 +148,14 @@ export type BrowserSystemOptions = SystemOptions & {
      * Flag to enable native broker support (e.g. acquiring tokens from WAM on Windows, MacBroker on Mac)
      */
     allowPlatformBroker?: boolean;
-    /**
-     * Flag to enable native broker support through DOM APIs in Edge
-     */
-    allowPlatformBrokerWithDOM?: boolean;
     /**
      * Sets the timeout for waiting for the native broker handshake to resolve
      */
     nativeBrokerHandshakeTimeout?: number;
     /**
-     * Sets the interval length in milliseconds for polling the location attribute in popup windows (default is 30ms)
+     * Enum that represents the protocol that msal follows. Used for configuring proper endpoints.
      */
-    pollIntervalMilliseconds?: number;
+    protocolMode?: ProtocolMode;
 };
 
 /**
@@ -287,19 +222,19 @@ export function buildConfiguration(
 ): BrowserConfiguration {
     // Default auth options for browser
     const DEFAULT_AUTH_OPTIONS: InternalAuthOptions = {
-        clientId: Constants.EMPTY_STRING,
+        clientId: "",
         authority: `${Constants.DEFAULT_AUTHORITY}`,
         knownAuthorities: [],
-        cloudDiscoveryMetadata: Constants.EMPTY_STRING,
-        authorityMetadata: Constants.EMPTY_STRING,
+        cloudDiscoveryMetadata: "",
+        authorityMetadata: "",
         redirectUri:
-            typeof window !== "undefined" ? BrowserUtils.getCurrentUri() : "",
-        postLogoutRedirectUri: Constants.EMPTY_STRING,
-        navigateToLoginRequestUrl: true,
+            typeof window !== "undefined" && window.location
+                ? window.location.href.split("?")[0].split("#")[0]
+                : "",
+        postLogoutRedirectUri: "",
         clientCapabilities: [],
-        protocolMode: ProtocolMode.AAD,
         OIDCOptions: {
-            serverResponseType: ServerResponseType.FRAGMENT,
+            responseMode: Constants.ResponseMode.FRAGMENT,
             defaultScopes: [
                 Constants.OPENID_SCOPE,
                 Constants.PROFILE_SCOPE,
@@ -308,28 +243,15 @@ export function buildConfiguration(
         },
         azureCloudOptions: {
             azureCloudInstance: AzureCloudInstance.None,
-            tenant: Constants.EMPTY_STRING,
+            tenant: "",
         },
-        skipAuthorityMetadataCache: false,
-        supportsNestedAppAuth: false,
         instanceAware: false,
-        encodeExtraQueryParams: false,
     };
 
     // Default cache options for browser
     const DEFAULT_CACHE_OPTIONS: Required<CacheOptions> = {
         cacheLocation: BrowserCacheLocation.SessionStorage,
         cacheRetentionDays: 5,
-        temporaryCacheLocation: BrowserCacheLocation.SessionStorage,
-        storeAuthStateInCookie: false,
-        secureCookies: false,
-        // Default cache migration to true if cache location is localStorage since entries are preserved across tabs/windows. Migration has little to no benefit in sessionStorage and memoryStorage
-        cacheMigrationEnabled:
-            userInputCache &&
-            userInputCache.cacheLocation === BrowserCacheLocation.LocalStorage
-                ? true
-                : false,
-        claimsBasedCachingEnabled: false,
     };
 
     // Default logger options for browser
@@ -350,22 +272,18 @@ export function buildConfiguration(
             ? new FetchClient()
             : StubbedNetworkModule,
         navigationClient: new NavigationClient(),
-        loadFrameTimeout: 0,
-        // If loadFrameTimeout is provided, use that as default.
-        windowHashTimeout:
-            userInputSystem?.loadFrameTimeout || DEFAULT_POPUP_TIMEOUT_MS,
-        iframeHashTimeout:
-            userInputSystem?.loadFrameTimeout || DEFAULT_IFRAME_TIMEOUT_MS,
-        navigateFrameWait: 0,
+        popupBridgeTimeout:
+            userInputSystem?.popupBridgeTimeout || DEFAULT_POPUP_TIMEOUT_MS,
+        iframeBridgeTimeout:
+            userInputSystem?.iframeBridgeTimeout || DEFAULT_IFRAME_TIMEOUT_MS,
         redirectNavigationTimeout: DEFAULT_REDIRECT_TIMEOUT_MS,
-        asyncPopups: false,
         allowRedirectInIframe: false,
+        navigatePopups: true,
         allowPlatformBroker: false,
-        allowPlatformBrokerWithDOM: false,
         nativeBrokerHandshakeTimeout:
             userInputSystem?.nativeBrokerHandshakeTimeout ||
             DEFAULT_NATIVE_BROKER_HANDSHAKE_TIMEOUT_MS,
-        pollIntervalMilliseconds: BrowserConstants.DEFAULT_POLL_INTERVAL_MS,
+        protocolMode: ProtocolMode.AAD,
     };
 
     const providedSystemOptions: Required<BrowserSystemOptions> = {
@@ -376,15 +294,15 @@ export function buildConfiguration(
 
     const DEFAULT_TELEMETRY_OPTIONS: Required<BrowserTelemetryOptions> = {
         application: {
-            appName: Constants.EMPTY_STRING,
-            appVersion: Constants.EMPTY_STRING,
+            appName: "",
+            appVersion: "",
         },
         client: new StubPerformanceClient(),
     };
 
     // Throw an error if user has set OIDCOptions without being in OIDC protocol mode
     if (
-        userInputAuth?.protocolMode !== ProtocolMode.OIDC &&
+        userInputSystem?.protocolMode !== ProtocolMode.OIDC &&
         userInputAuth?.OIDCOptions
     ) {
         const logger = new Logger(providedSystemOptions.loggerOptions);
@@ -393,14 +311,15 @@ export function buildConfiguration(
                 createClientConfigurationError(
                     ClientConfigurationErrorCodes.cannotSetOIDCOptions
                 )
-            )
+            ),
+            ""
         );
     }
 
     // Throw an error if user has set allowPlatformBroker to true with OIDC protocol mode
     if (
-        userInputAuth?.protocolMode &&
-        userInputAuth.protocolMode === ProtocolMode.OIDC &&
+        userInputSystem?.protocolMode &&
+        userInputSystem.protocolMode === ProtocolMode.OIDC &&
         providedSystemOptions?.allowPlatformBroker
     ) {
         throw createClientConfigurationError(

package/src/controllers/IController.ts

@@ -3,125 +3,6 @@
  * Licensed under the MIT License.
  */
 
-import {
-    AccountInfo,
-    Logger,
-    PerformanceCallbackFunction,
-    IPerformanceClient,
-    AccountFilter,
-} from "@azure/msal-common/browser";
-import { RedirectRequest } from "../request/RedirectRequest.js";
-import { PopupRequest } from "../request/PopupRequest.js";
-import { SilentRequest } from "../request/SilentRequest.js";
-import { SsoSilentRequest } from "../request/SsoSilentRequest.js";
-import { EndSessionRequest } from "../request/EndSessionRequest.js";
-import { ApiId, WrapperSKU } from "../utils/BrowserConstants.js";
-import { INavigationClient } from "../navigation/INavigationClient.js";
-import { EndSessionPopupRequest } from "../request/EndSessionPopupRequest.js";
-import { ITokenCache } from "../cache/ITokenCache.js";
-import { AuthorizationCodeRequest } from "../request/AuthorizationCodeRequest.js";
-import { BrowserConfiguration } from "../config/Configuration.js";
-import { AuthenticationResult } from "../response/AuthenticationResult.js";
-import { EventCallbackFunction } from "../event/EventMessage.js";
-import { ClearCacheRequest } from "../request/ClearCacheRequest.js";
-import { InitializeApplicationRequest } from "../request/InitializeApplicationRequest.js";
-import { EventType } from "../event/EventType.js";
+import { IPublicClientApplication } from "../app/IPublicClientApplication.js";
 
-export interface IController {
-    // TODO: Make request mandatory in the next major version?
-    initialize(
-        request?: InitializeApplicationRequest,
-        isBroker?: boolean
-    ): Promise<void>;
-
-    acquireTokenPopup(request: PopupRequest): Promise<AuthenticationResult>;
-
-    acquireTokenRedirect(request: RedirectRequest): Promise<void>;
-
-    acquireTokenSilent(
-        silentRequest: SilentRequest
-    ): Promise<AuthenticationResult>;
-
-    acquireTokenByCode(
-        request: AuthorizationCodeRequest
-    ): Promise<AuthenticationResult>;
-
-    acquireTokenNative(
-        request: PopupRequest | SilentRequest | SsoSilentRequest,
-        apiId: ApiId,
-        accountId?: string
-    ): Promise<AuthenticationResult>;
-
-    addEventCallback(
-        callback: EventCallbackFunction,
-        eventTypes?: Array<EventType>
-    ): string | null;
-
-    removeEventCallback(callbackId: string): void;
-
-    addPerformanceCallback(callback: PerformanceCallbackFunction): string;
-
-    removePerformanceCallback(callbackId: string): boolean;
-
-    enableAccountStorageEvents(): void;
-
-    disableAccountStorageEvents(): void;
-
-    getAccount(accountFilter: AccountFilter): AccountInfo | null;
-
-    getAccountByHomeId(homeAccountId: string): AccountInfo | null;
-
-    getAccountByLocalId(localId: string): AccountInfo | null;
-
-    getAccountByUsername(userName: string): AccountInfo | null;
-
-    getAllAccounts(accountFilter?: AccountFilter): AccountInfo[];
-
-    handleRedirectPromise(hash?: string): Promise<AuthenticationResult | null>;
-
-    loginPopup(request?: PopupRequest): Promise<AuthenticationResult>;
-
-    loginRedirect(request?: RedirectRequest): Promise<void>;
-
-    logout(logoutRequest?: EndSessionRequest): Promise<void>;
-
-    logoutRedirect(logoutRequest?: EndSessionRequest): Promise<void>;
-
-    logoutPopup(logoutRequest?: EndSessionPopupRequest): Promise<void>;
-
-    clearCache(logoutRequest?: ClearCacheRequest): Promise<void>;
-
-    ssoSilent(request: SsoSilentRequest): Promise<AuthenticationResult>;
-
-    getTokenCache(): ITokenCache;
-
-    getLogger(): Logger;
-
-    setLogger(logger: Logger): void;
-
-    setActiveAccount(account: AccountInfo | null): void;
-
-    getActiveAccount(): AccountInfo | null;
-
-    initializeWrapperLibrary(sku: WrapperSKU, version: string): void;
-
-    setNavigationClient(navigationClient: INavigationClient): void;
-
-    /** @internal */
-    getConfiguration(): BrowserConfiguration;
-
-    hydrateCache(
-        result: AuthenticationResult,
-        request:
-            | SilentRequest
-            | SsoSilentRequest
-            | RedirectRequest
-            | PopupRequest
-    ): Promise<void>;
-
-    /** @internal */
-    isBrowserEnv(): boolean;
-
-    /** @internal */
-    getPerformanceClient(): IPerformanceClient;
-}
+export type IController = IPublicClientApplication;