@azure/msal-browser 3.23.0 → 3.25.0

package/src/index.ts

@@ -8,16 +8,16 @@
  * @module @azure/msal-browser
  */
 
-import * as BrowserUtils from "./utils/BrowserUtils";
+import * as BrowserUtils from "./utils/BrowserUtils.js";
 export { BrowserUtils };
 
 export {
     PublicClientApplication,
     createNestablePublicClientApplication,
     createStandardPublicClientApplication,
-} from "./app/PublicClientApplication";
-export { PublicClientNext } from "./app/PublicClientNext";
-export { IController } from "./controllers/IController";
+} from "./app/PublicClientApplication.js";
+export { PublicClientNext } from "./app/PublicClientNext.js";
+export { IController } from "./controllers/IController.js";
 export {
     Configuration,
     BrowserAuthOptions,
@@ -26,7 +26,7 @@ export {
     BrowserTelemetryOptions,
     BrowserConfiguration,
     DEFAULT_IFRAME_TIMEOUT_MS,
-} from "./config/Configuration";
+} from "./config/Configuration.js";
 export {
     InteractionType,
     InteractionStatus,
@@ -34,47 +34,47 @@ export {
     WrapperSKU,
     ApiId,
     CacheLookupPolicy,
-} from "./utils/BrowserConstants";
+} from "./utils/BrowserConstants.js";
 
 // Browser Errors
 export {
     BrowserAuthError,
     BrowserAuthErrorMessage,
     BrowserAuthErrorCodes,
-} from "./error/BrowserAuthError";
+} from "./error/BrowserAuthError.js";
 export {
     BrowserConfigurationAuthError,
     BrowserConfigurationAuthErrorCodes,
     BrowserConfigurationAuthErrorMessage,
-} from "./error/BrowserConfigurationAuthError";
+} from "./error/BrowserConfigurationAuthError.js";
 
 // Interfaces
 export {
     IPublicClientApplication,
     stubbedPublicClientApplication,
-} from "./app/IPublicClientApplication";
-export { INavigationClient } from "./navigation/INavigationClient";
-export { NavigationClient } from "./navigation/NavigationClient";
-export { NavigationOptions } from "./navigation/NavigationOptions";
-export { PopupRequest } from "./request/PopupRequest";
-export { RedirectRequest } from "./request/RedirectRequest";
-export { SilentRequest } from "./request/SilentRequest";
-export { SsoSilentRequest } from "./request/SsoSilentRequest";
-export { EndSessionRequest } from "./request/EndSessionRequest";
-export { EndSessionPopupRequest } from "./request/EndSessionPopupRequest";
-export { AuthorizationUrlRequest } from "./request/AuthorizationUrlRequest";
-export { AuthorizationCodeRequest } from "./request/AuthorizationCodeRequest";
-export { AuthenticationResult } from "./response/AuthenticationResult";
-export { ClearCacheRequest } from "./request/ClearCacheRequest";
-export { InitializeApplicationRequest } from "./request/InitializeApplicationRequest";
+} from "./app/IPublicClientApplication.js";
+export { INavigationClient } from "./navigation/INavigationClient.js";
+export { NavigationClient } from "./navigation/NavigationClient.js";
+export { NavigationOptions } from "./navigation/NavigationOptions.js";
+export { PopupRequest } from "./request/PopupRequest.js";
+export { RedirectRequest } from "./request/RedirectRequest.js";
+export { SilentRequest } from "./request/SilentRequest.js";
+export { SsoSilentRequest } from "./request/SsoSilentRequest.js";
+export { EndSessionRequest } from "./request/EndSessionRequest.js";
+export { EndSessionPopupRequest } from "./request/EndSessionPopupRequest.js";
+export { AuthorizationUrlRequest } from "./request/AuthorizationUrlRequest.js";
+export { AuthorizationCodeRequest } from "./request/AuthorizationCodeRequest.js";
+export { AuthenticationResult } from "./response/AuthenticationResult.js";
+export { ClearCacheRequest } from "./request/ClearCacheRequest.js";
+export { InitializeApplicationRequest } from "./request/InitializeApplicationRequest.js";
 
 // Cache
-export { LoadTokenOptions } from "./cache/TokenCache";
-export { ITokenCache } from "./cache/ITokenCache";
+export { LoadTokenOptions } from "./cache/TokenCache.js";
+export { ITokenCache } from "./cache/ITokenCache.js";
 
 // Storage
-export { MemoryStorage } from "./cache/MemoryStorage";
-export { BrowserStorage } from "./cache/BrowserStorage";
+export { MemoryStorage } from "./cache/MemoryStorage.js";
+export { BrowserStorage } from "./cache/BrowserStorage.js";
 
 // Events
 export {
@@ -84,23 +84,23 @@ export {
     EventCallbackFunction,
     EventMessageUtils,
     PopupEvent,
-} from "./event/EventMessage";
-export { EventType } from "./event/EventType";
+} from "./event/EventMessage.js";
+export { EventType } from "./event/EventType.js";
 
 export {
     SignedHttpRequest,
     SignedHttpRequestOptions,
-} from "./crypto/SignedHttpRequest";
+} from "./crypto/SignedHttpRequest.js";
 
 export {
     PopupWindowAttributes,
     PopupSize,
     PopupPosition,
-} from "./request/PopupWindowAttributes";
+} from "./request/PopupWindowAttributes.js";
 
 // Telemetry
-export { BrowserPerformanceClient } from "./telemetry/BrowserPerformanceClient";
-export { BrowserPerformanceMeasurement } from "./telemetry/BrowserPerformanceMeasurement";
+export { BrowserPerformanceClient } from "./telemetry/BrowserPerformanceClient.js";
+export { BrowserPerformanceMeasurement } from "./telemetry/BrowserPerformanceMeasurement.js";
 
 // Common Object Formats
 export {
@@ -154,6 +154,6 @@ export {
     TenantProfile,
     IPerformanceClient,
     StubPerformanceClient,
-} from "@azure/msal-common";
+} from "@azure/msal-common/browser";
 
-export { version } from "./packageMetadata";
+export { version } from "./packageMetadata.js";

package/src/interaction_client/BaseInteractionClient.ts

@@ -21,22 +21,23 @@ import {
     PerformanceEvents,
     AzureCloudOptions,
     invokeAsync,
-} from "@azure/msal-common";
-import { BrowserConfiguration } from "../config/Configuration";
-import { BrowserCacheManager } from "../cache/BrowserCacheManager";
-import { EventHandler } from "../event/EventHandler";
-import { EndSessionRequest } from "../request/EndSessionRequest";
-import { RedirectRequest } from "../request/RedirectRequest";
-import { PopupRequest } from "../request/PopupRequest";
-import { SsoSilentRequest } from "../request/SsoSilentRequest";
-import { version } from "../packageMetadata";
-import { BrowserConstants } from "../utils/BrowserConstants";
-import * as BrowserUtils from "../utils/BrowserUtils";
-import { INavigationClient } from "../navigation/INavigationClient";
-import { NativeMessageHandler } from "../broker/nativeBroker/NativeMessageHandler";
-import { AuthenticationResult } from "../response/AuthenticationResult";
-import { ClearCacheRequest } from "../request/ClearCacheRequest";
-import { createNewGuid } from "../crypto/BrowserCrypto";
+    StringDict,
+} from "@azure/msal-common/browser";
+import { BrowserConfiguration } from "../config/Configuration.js";
+import { BrowserCacheManager } from "../cache/BrowserCacheManager.js";
+import { EventHandler } from "../event/EventHandler.js";
+import { EndSessionRequest } from "../request/EndSessionRequest.js";
+import { RedirectRequest } from "../request/RedirectRequest.js";
+import { PopupRequest } from "../request/PopupRequest.js";
+import { SsoSilentRequest } from "../request/SsoSilentRequest.js";
+import { version } from "../packageMetadata.js";
+import { BrowserConstants } from "../utils/BrowserConstants.js";
+import * as BrowserUtils from "../utils/BrowserUtils.js";
+import { INavigationClient } from "../navigation/INavigationClient.js";
+import { NativeMessageHandler } from "../broker/nativeBroker/NativeMessageHandler.js";
+import { AuthenticationResult } from "../response/AuthenticationResult.js";
+import { ClearCacheRequest } from "../request/ClearCacheRequest.js";
+import { createNewGuid } from "../crypto/BrowserCrypto.js";
 
 export abstract class BaseInteractionClient {
     protected config: BrowserConfiguration;
@@ -177,15 +178,26 @@ export abstract class BaseInteractionClient {
 
     /**
      * Used to get a discovered version of the default authority.
-     * @param requestAuthority
-     * @param requestAzureCloudOptions
-     * @param account
+     * @param params {
+     *         requestAuthority?: string;
+     *         requestAzureCloudOptions?: AzureCloudOptions;
+     *         requestExtraQueryParameters?: StringDict;
+     *         account?: AccountInfo;
+     *        }
      */
-    protected async getDiscoveredAuthority(
-        requestAuthority?: string,
-        requestAzureCloudOptions?: AzureCloudOptions,
-        account?: AccountInfo
-    ): Promise<Authority> {
+    protected async getDiscoveredAuthority(params: {
+        requestAuthority?: string;
+        requestAzureCloudOptions?: AzureCloudOptions;
+        requestExtraQueryParameters?: StringDict;
+        account?: AccountInfo;
+    }): Promise<Authority> {
+        const { account } = params;
+        const instanceAwareEQ =
+            params.requestExtraQueryParameters &&
+            params.requestExtraQueryParameters.hasOwnProperty("instance_aware")
+                ? params.requestExtraQueryParameters["instance_aware"]
+                : undefined;
+
         this.performanceClient.addQueueMeasurement(
             PerformanceEvents.StandardInteractionClientGetDiscoveredAuthority,
             this.correlationId
@@ -201,14 +213,25 @@ export abstract class BaseInteractionClient {
         };
 
         // build authority string based on auth params, precedence - azureCloudInstance + tenant >> authority
-        const userAuthority = requestAuthority
-            ? requestAuthority
-            : this.config.auth.authority;
+        const resolvedAuthority =
+            params.requestAuthority || this.config.auth.authority;
+        const resolvedInstanceAware = instanceAwareEQ?.length
+            ? instanceAwareEQ === "true"
+            : this.config.auth.instanceAware;
+
+        const userAuthority =
+            account && resolvedInstanceAware
+                ? this.config.auth.authority.replace(
+                      UrlString.getDomainFromUrl(resolvedAuthority),
+                      account.environment
+                  )
+                : resolvedAuthority;
 
         // fall back to the authority from config
         const builtAuthority = Authority.generateAuthority(
             userAuthority,
-            requestAzureCloudOptions || this.config.auth.azureCloudOptions
+            params.requestAzureCloudOptions ||
+                this.config.auth.azureCloudOptions
         );
         const discoveredAuthority = await invokeAsync(
             AuthorityFactory.createDiscoveredInstance,

package/src/interaction_client/HybridSpaAuthorizationCodeClient.ts

@@ -6,7 +6,7 @@
 import {
     AuthorizationCodeClient,
     ClientConfiguration,
-} from "@azure/msal-common";
+} from "@azure/msal-common/browser";
 
 export class HybridSpaAuthorizationCodeClient extends AuthorizationCodeClient {
     constructor(config: ClientConfiguration) {

package/src/interaction_client/NativeInteractionClient.ts

@@ -37,44 +37,44 @@ import {
     buildAccountToCache,
     InProgressPerformanceEvent,
     ServerTelemetryManager,
-} from "@azure/msal-common";
-import { BaseInteractionClient } from "./BaseInteractionClient";
-import { BrowserConfiguration } from "../config/Configuration";
-import { BrowserCacheManager } from "../cache/BrowserCacheManager";
-import { EventHandler } from "../event/EventHandler";
-import { PopupRequest } from "../request/PopupRequest";
-import { SilentRequest } from "../request/SilentRequest";
-import { SsoSilentRequest } from "../request/SsoSilentRequest";
-import { NativeMessageHandler } from "../broker/nativeBroker/NativeMessageHandler";
+} from "@azure/msal-common/browser";
+import { BaseInteractionClient } from "./BaseInteractionClient.js";
+import { BrowserConfiguration } from "../config/Configuration.js";
+import { BrowserCacheManager } from "../cache/BrowserCacheManager.js";
+import { EventHandler } from "../event/EventHandler.js";
+import { PopupRequest } from "../request/PopupRequest.js";
+import { SilentRequest } from "../request/SilentRequest.js";
+import { SsoSilentRequest } from "../request/SsoSilentRequest.js";
+import { NativeMessageHandler } from "../broker/nativeBroker/NativeMessageHandler.js";
 import {
     NativeExtensionMethod,
     ApiId,
     TemporaryCacheKeys,
     NativeConstants,
     BrowserConstants,
-} from "../utils/BrowserConstants";
+} from "../utils/BrowserConstants.js";
 import {
     NativeExtensionRequestBody,
     NativeTokenRequest,
-} from "../broker/nativeBroker/NativeRequest";
-import { MATS, NativeResponse } from "../broker/nativeBroker/NativeResponse";
+} from "../broker/nativeBroker/NativeRequest.js";
+import { MATS, NativeResponse } from "../broker/nativeBroker/NativeResponse.js";
 import {
     NativeAuthError,
     NativeAuthErrorCodes,
     createNativeAuthError,
     isFatalNativeAuthError,
-} from "../error/NativeAuthError";
-import { RedirectRequest } from "../request/RedirectRequest";
-import { NavigationOptions } from "../navigation/NavigationOptions";
-import { INavigationClient } from "../navigation/INavigationClient";
+} from "../error/NativeAuthError.js";
+import { RedirectRequest } from "../request/RedirectRequest.js";
+import { NavigationOptions } from "../navigation/NavigationOptions.js";
+import { INavigationClient } from "../navigation/INavigationClient.js";
 import {
     createBrowserAuthError,
     BrowserAuthErrorCodes,
-} from "../error/BrowserAuthError";
-import { SilentCacheClient } from "./SilentCacheClient";
-import { AuthenticationResult } from "../response/AuthenticationResult";
-import { base64Decode } from "../encode/Base64Decode";
-import { version } from "../packageMetadata";
+} from "../error/BrowserAuthError.js";
+import { SilentCacheClient } from "./SilentCacheClient.js";
+import { AuthenticationResult } from "../response/AuthenticationResult.js";
+import { base64Decode } from "../encode/Base64Decode.js";
+import { version } from "../packageMetadata.js";
 
 const BrokerServerParamKeys = {
     BROKER_CLIENT_ID: "brk_client_id",
@@ -505,7 +505,9 @@ export class NativeInteractionClient extends BaseInteractionClient {
         }
 
         // Get the preferred_cache domain for the given authority
-        const authority = await this.getDiscoveredAuthority(request.authority);
+        const authority = await this.getDiscoveredAuthority({
+            requestAuthority: request.authority,
+        });
 
         const baseAccount = buildAccountToCache(
             this.browserStorage,
@@ -905,18 +907,19 @@ export class NativeInteractionClient extends BaseInteractionClient {
             "NativeInteractionClient - initializeNativeRequest called"
         );
 
-        const authority = request.authority || this.config.auth.authority;
+        const requestAuthority =
+            request.authority || this.config.auth.authority;
 
         if (request.account) {
             // validate authority
-            await this.getDiscoveredAuthority(
-                authority,
-                request.azureCloudOptions,
-                request.account
-            );
+            await this.getDiscoveredAuthority({
+                requestAuthority,
+                requestAzureCloudOptions: request.azureCloudOptions,
+                account: request.account,
+            });
         }
 
-        const canonicalAuthority = new UrlString(authority);
+        const canonicalAuthority = new UrlString(requestAuthority);
         canonicalAuthority.validateAsUri();
 
         // scopes are expected to be received by the native broker as "scope" and will be added to the request below. Other properties that should be dropped from the request to the native broker can be included in the object destructuring here.