@azure/msal-browser 4.0.0-alpha.0 → 4.0.2

package/src/interaction_client/NativeInteractionClient.ts

@@ -83,7 +83,6 @@ export class NativeInteractionClient extends BaseInteractionClient {
     protected silentCacheClient: SilentCacheClient;
     protected nativeStorageManager: BrowserCacheManager;
     protected skus: string;
-    protected serverTelemetryManager: ServerTelemetryManager;
 
     constructor(
         config: BrowserConfiguration,
@@ -125,9 +124,6 @@ export class NativeInteractionClient extends BaseInteractionClient {
             provider,
             correlationId
         );
-        this.serverTelemetryManager = this.initializeServerTelemetryManager(
-            this.apiId
-        );
 
         const extensionName =
             this.nativeMessageHandler.getExtensionId() ===
@@ -176,6 +172,9 @@ export class NativeInteractionClient extends BaseInteractionClient {
         );
         const reqTimestamp = TimeUtils.nowSeconds();
 
+        const serverTelemetryManager = this.initializeServerTelemetryManager(
+            this.apiId
+        );
         try {
             // initialize native request
             const nativeRequest = await this.initializeNativeRequest(request);
@@ -223,7 +222,7 @@ export class NativeInteractionClient extends BaseInteractionClient {
                         isNativeBroker: true,
                         requestId: result.requestId,
                     });
-                    this.serverTelemetryManager.clearNativeBrokerErrorCode();
+                    serverTelemetryManager.clearNativeBrokerErrorCode();
                     return result;
                 })
                 .catch((error: AuthError) => {
@@ -237,9 +236,7 @@ export class NativeInteractionClient extends BaseInteractionClient {
                 });
         } catch (e) {
             if (e instanceof NativeAuthError) {
-                this.serverTelemetryManager.setNativeBrokerErrorCode(
-                    e.errorCode
-                );
+                serverTelemetryManager.setNativeBrokerErrorCode(e.errorCode);
             }
             throw e;
         }
@@ -346,9 +343,9 @@ export class NativeInteractionClient extends BaseInteractionClient {
         } catch (e) {
             // Only throw fatal errors here to allow application to fallback to regular redirect. Otherwise proceed and the error will be thrown in handleRedirectPromise
             if (e instanceof NativeAuthError) {
-                this.serverTelemetryManager.setNativeBrokerErrorCode(
-                    e.errorCode
-                );
+                const serverTelemetryManager =
+                    this.initializeServerTelemetryManager(this.apiId);
+                serverTelemetryManager.setNativeBrokerErrorCode(e.errorCode);
                 if (isFatalNativeAuthError(e)) {
                     throw e;
                 }
@@ -443,7 +440,9 @@ export class NativeInteractionClient extends BaseInteractionClient {
             );
             this.browserStorage.setInteractionInProgress(false);
             const res = await result;
-            this.serverTelemetryManager.clearNativeBrokerErrorCode();
+            const serverTelemetryManager =
+                this.initializeServerTelemetryManager(this.apiId);
+            serverTelemetryManager.clearNativeBrokerErrorCode();
             return res;
         } catch (e) {
             this.browserStorage.setInteractionInProgress(false);
@@ -530,7 +529,7 @@ export class NativeInteractionClient extends BaseInteractionClient {
 
         // cache accounts and tokens in the appropriate storage
         await this.cacheAccount(baseAccount);
-        this.cacheNativeTokens(
+        await this.cacheNativeTokens(
             response,
             request,
             homeAccountIdentifier,
@@ -724,7 +723,7 @@ export class NativeInteractionClient extends BaseInteractionClient {
      */
     async cacheAccount(accountEntity: AccountEntity): Promise<void> {
         // Store the account info and hence `nativeAccountId` in browser cache
-        await this.browserStorage.setAccount(accountEntity);
+        await this.browserStorage.setAccount(accountEntity, this.correlationId);
 
         // Remove any existing cached tokens for this account in browser storage
         this.browserStorage.removeAccountContext(accountEntity).catch((e) => {
@@ -752,7 +751,7 @@ export class NativeInteractionClient extends BaseInteractionClient {
         responseAccessToken: string,
         tenantId: string,
         reqTimestamp: number
-    ): void {
+    ): Promise<void> {
         const cachedIdToken: IdTokenEntity | null =
             CacheHelpers.createIdTokenEntity(
                 homeAccountIdentifier,
@@ -794,8 +793,9 @@ export class NativeInteractionClient extends BaseInteractionClient {
             accessToken: cachedAccessToken,
         };
 
-        void this.nativeStorageManager.saveCacheRecord(
+        return this.nativeStorageManager.saveCacheRecord(
             nativeCacheRecord,
+            this.correlationId,
             request.storeInCache
         );
     }

package/src/interaction_client/PopupClient.ts

@@ -227,15 +227,16 @@ export class PopupClient extends StandardInteractionClient {
                 account: validRequest.account,
             });
 
-            const isNativeBroker = NativeMessageHandler.isNativeAvailable(
-                this.config,
-                this.logger,
-                this.nativeMessageHandler,
-                request.authenticationScheme
-            );
+            const isPlatformBroker =
+                NativeMessageHandler.isPlatformBrokerAvailable(
+                    this.config,
+                    this.logger,
+                    this.nativeMessageHandler,
+                    request.authenticationScheme
+                );
             // Start measurement for server calls with native brokering enabled
             let fetchNativeAccountIdMeasurement;
-            if (isNativeBroker) {
+            if (isPlatformBroker) {
                 fetchNativeAccountIdMeasurement =
                     this.performanceClient.startMeasurement(
                         PerformanceEvents.FetchAccountIdWithNativeBroker,
@@ -246,7 +247,7 @@ export class PopupClient extends StandardInteractionClient {
             // Create acquire token url.
             const navigateUrl = await authClient.getAuthCodeUrl({
                 ...validRequest,
-                nativeBroker: isNativeBroker,
+                platformBroker: isPlatformBroker,
             });
 
             // Create popup interaction handler.

package/src/interaction_client/RedirectClient.ts

@@ -170,7 +170,7 @@ export class RedirectClient extends StandardInteractionClient {
             // Create acquire token url.
             const navigateUrl = await authClient.getAuthCodeUrl({
                 ...validRequest,
-                nativeBroker: NativeMessageHandler.isNativeAvailable(
+                platformBroker: NativeMessageHandler.isPlatformBrokerAvailable(
                     this.config,
                     this.logger,
                     this.nativeMessageHandler,

package/src/interaction_client/SilentIframeClient.ts

@@ -239,7 +239,7 @@ export class SilentIframeClient extends StandardInteractionClient {
             correlationId
         )({
             ...silentRequest,
-            nativeBroker: NativeMessageHandler.isNativeAvailable(
+            platformBroker: NativeMessageHandler.isPlatformBrokerAvailable(
                 this.config,
                 this.logger,
                 this.nativeMessageHandler,

package/src/packageMetadata.ts

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

package/src/request/AuthorizationUrlRequest.ts

@@ -10,7 +10,7 @@ import { CommonAuthorizationUrlRequest } from "@azure/msal-common/browser";
  */
 export type AuthorizationUrlRequest = Omit<
     CommonAuthorizationUrlRequest,
-    "state" | "nonce" | "requestedClaimsHash" | "nativeBroker"
+    "state" | "nonce" | "requestedClaimsHash" | "platformBroker"
 > & {
     state: string;
     nonce: string;

package/src/request/PopupRequest.ts

@@ -46,7 +46,7 @@ export type PopupRequest = Partial<
         | "codeChallenge"
         | "codeChallengeMethod"
         | "requestedClaimsHash"
-        | "nativeBroker"
+        | "platformBroker"
     >
 > & {
     scopes: Array<string>;

package/src/request/RedirectRequest.ts

@@ -44,7 +44,7 @@ export type RedirectRequest = Partial<
         | "codeChallenge"
         | "codeChallengeMethod"
         | "requestedClaimsHash"
-        | "nativeBroker"
+        | "platformBroker"
     >
 > & {
     scopes: Array<string>;

package/src/request/SsoSilentRequest.ts

@@ -40,7 +40,7 @@ export type SsoSilentRequest = Partial<
         | "codeChallenge"
         | "codeChallengeMethod"
         | "requestedClaimsHash"
-        | "nativeBroker"
+        | "platformBroker"
     >
 > & {
     tokenBodyParameters?: StringDict;

package/src/utils/BrowserUtils.ts

@@ -67,7 +67,9 @@ export function isInPopup(): boolean {
  * Returns current window URL as redirect uri
  */
 export function getCurrentUri(): string {
-    return window.location.href.split("?")[0].split("#")[0];
+    return typeof window !== "undefined" && window.location
+        ? window.location.href.split("?")[0].split("#")[0]
+        : "";
 }
 
 /**