Merge branch 'dev' into node-22

change/@azure-msal-browser-7b8679dc-1a5c-44b1-8f0a-bb52821145a9.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Add getAccount API to IPublicClientApplication (#7019)",
+  "packageName": "@azure/msal-browser",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@azure-msal-common-36d2e3a5-a377-457a-8f44-de8b7cfa68c2.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": " Fixed inconsistencies with cancellationToken (timeout)",
+  "packageName": "@azure/msal-common",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@azure-msal-common-e0ac26de-f149-4faf-adef-154f60c566b8.json

@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "Make performanceClient.discardMeasurements() flush aux cache data in addition to measurements #7061",
+  "packageName": "@azure/msal-common",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@azure-msal-node-09eb19fc-c2da-4430-8f1e-37987728ea16.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": " Fixed inconsistencies with cancellationToken (timeout)",
+  "packageName": "@azure/msal-node",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@azure-msal-react-5355b5e3-0c1c-4e23-ae9d-a6d96ef4285d.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Fix useIsAuthenticated returning incorrect value during useEffect update #7057",
+  "packageName": "@azure/msal-react",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

lib/msal-browser/docs/configuration.md

@@ -19,6 +19,7 @@ const msalConfig = {
         postLogoutRedirectUri: "enter_postlogout_uri_here",
         navigateToLoginRequestUrl: true,
         clientCapabilities: ["CP1"],
+        protocolMode: "AAD"
     },
     cache: {
         cacheLocation: "sessionStorage",

lib/msal-browser/docs/errors.md

@@ -409,7 +409,7 @@ msalInstance.acquireTokenSilent(); // This will also no longer throw this error
 
 ## Other
 
-Errors not thrown by MSAL, such as server errors.
+Errors not thrown by MSAL, such as server or cache errors.
 
 ### Access to fetch at [url] has been blocked by CORS policy
 
@@ -418,3 +418,16 @@ This error occurs with MSAL.js v2.x and is due to improper configuration during
 > Your Redirect URI is eligible for the Authorization Code Flow with PKCE.
 
 ![image](https://user-images.githubusercontent.com/5307810/110390912-922fa380-801b-11eb-9e2b-d7aa88ca0687.png)
+
+### cache_quota_exceeded
+
+**Error messages**:
+
+- Exceeded cache storage capacity
+
+This error occurs when MSAL.js surpasses the allotted storage limit when attempting to save token information in the [configured cache storage](./caching.md#cache-storage). See [here](https://developer.mozilla.org/en-US/docs/Web/API/Storage_API/Storage_quotas_and_eviction_criteria#web_storage) for web storage limits.
+
+**Mitigation**:
+
+1. Make sure the configured cache storage has enough capacity to allow MSAL.js to persist token payload. The amount of cache storage required depends on the number of [cached artifacts](./caching.md#cached-artifacts).
+2. Disable [claimsBasedCachingEnabled](./configuration.md#cache-config-options) cache config option. When enabled, it caches access tokens under a key containing the hash of the requested claims. Depending on the MSAL.js API usage, it may result in the vast number of access tokens persisted in the cache storage.

lib/msal-browser/src/app/IPublicClientApplication.ts

@@ -4,6 +4,7 @@
  */
 
 import {
+    AccountFilter,
     AccountInfo,
     Logger,
     PerformanceCallbackFunction,
@@ -43,6 +44,7 @@ export interface IPublicClientApplication {
     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;
@@ -113,6 +115,9 @@ export const stubbedPublicClientApplication: IPublicClientApplication = {
     getAllAccounts: () => {
         return [];
     },
+    getAccount: () => {
+        return null;
+    },
     getAccountByHomeId: () => {
         return null;
     },

lib/msal-common/src/network/INetworkModule.ts

@@ -31,7 +31,7 @@ export interface INetworkModule {
     sendGetRequestAsync<T>(
         url: string,
         options?: NetworkRequestOptions,
-        cancellationToken?: number
+        timeout?: number
     ): Promise<NetworkResponse<T>>;
 
     /**

lib/msal-common/src/telemetry/performance/PerformanceClient.ts

@@ -620,7 +620,7 @@ export abstract class PerformanceClient implements IPerformanceClient {
 
         if (isRoot) {
             queueInfo = this.getQueueInfo(event.correlationId);
-            this.discardCache(rootEvent.correlationId);
+            this.discardMeasurements(rootEvent.correlationId);
         } else {
             rootEvent.incompleteSubMeasurements?.delete(event.eventId);
         }
@@ -781,7 +781,7 @@ export abstract class PerformanceClient implements IPerformanceClient {
     }
 
     /**
-     * Removes measurements for a given correlation id.
+     * Removes measurements and aux data for a given correlation id.
      *
      * @param {string} correlationId
      */
@@ -791,15 +791,6 @@ export abstract class PerformanceClient implements IPerformanceClient {
             correlationId
         );
         this.eventsByCorrelationId.delete(correlationId);
-    }
-
-    /**
-     * Removes cache for a given correlation id.
-     *
-     * @param {string} correlationId correlation identifier
-     */
-    private discardCache(correlationId: string): void {
-        this.discardMeasurements(correlationId);
 
         this.logger.trace(
             "PerformanceClient: QueueMeasurements discarded",

lib/msal-common/src/utils/Constants.ts

@@ -64,22 +64,24 @@ export const Constants = {
 };
 
 export const HttpStatus = {
-    SUCCESS_RANGE_START: 200,
     SUCCESS: 200,
+    SUCCESS_RANGE_START: 200,
     SUCCESS_RANGE_END: 299,
     REDIRECT: 302,
+    CLIENT_ERROR: 400,
     CLIENT_ERROR_RANGE_START: 400,
     BAD_REQUEST: 400,
     UNAUTHORIZED: 401,
     NOT_FOUND: 404,
     REQUEST_TIMEOUT: 408,
     TOO_MANY_REQUESTS: 429,
     CLIENT_ERROR_RANGE_END: 499,
+    SERVER_ERROR: 500,
     SERVER_ERROR_RANGE_START: 500,
-    INTERNAL_SERVER_ERROR: 500,
     SERVICE_UNAVAILABLE: 503,
     GATEWAY_TIMEOUT: 504,
     SERVER_ERROR_RANGE_END: 599,
+    MULTI_SIDED_ERROR: 600,
 } as const;
 export type HttpStatus = (typeof HttpStatus)[keyof typeof HttpStatus];
 

lib/msal-common/test/telemetry/PerformanceClient.spec.ts

@@ -72,7 +72,10 @@ export class MockPerformanceClient
         eventName: PerformanceEvents,
         correlationId?: string | undefined
     ): void {
-        return;
+        this.preQueueTimeByCorrelationId.set(correlationId || "", {
+            name: eventName,
+            time: 12345,
+        });
     }
 
     getDurationMs(startTimeMs: number): number {
@@ -1122,4 +1125,75 @@ describe("PerformanceClient.spec.ts", () => {
             rootEvent.end({ success: true });
         });
     });
+
+    describe("discard", () => {
+        it("discards cache data", () => {
+            const mockPerfClient = new MockPerformanceClient();
+            const correlationId = "test-correlation-id";
+            const dummyCorrelationId = "dummy-correlation-id";
+
+            const rootEvent = mockPerfClient.startMeasurement(
+                PerformanceEvents.AcquireTokenSilent,
+                correlationId
+            );
+            const firstEvent = mockPerfClient.startMeasurement(
+                PerformanceEvents.AcquireTokenSilentAsync,
+                correlationId
+            );
+            mockPerfClient.setPreQueueTime(
+                PerformanceEvents.AcquireTokenSilentAsync,
+                correlationId
+            );
+            const secondEvent = mockPerfClient.startMeasurement(
+                PerformanceEvents.AcquireTokenFromCache,
+                correlationId
+            );
+            mockPerfClient.setPreQueueTime(
+                PerformanceEvents.AcquireTokenFromCache,
+                correlationId
+            );
+            secondEvent.end({ success: true });
+            firstEvent.end({ success: true });
+            rootEvent.discard();
+
+            mockPerfClient.startMeasurement(
+                PerformanceEvents.AcquireTokenSilent,
+                dummyCorrelationId
+            );
+            mockPerfClient.setPreQueueTime(
+                PerformanceEvents.AcquireTokenSilent,
+                dummyCorrelationId
+            );
+
+            expect(
+                // @ts-ignore
+                mockPerfClient.eventsByCorrelationId.has(correlationId)
+            ).toBeFalsy();
+            expect(
+                // @ts-ignore
+                mockPerfClient.preQueueTimeByCorrelationId.has(correlationId)
+            ).toBeFalsy();
+            expect(
+                // @ts-ignore
+                mockPerfClient.queueMeasurements.has(correlationId)
+            ).toBeFalsy();
+            // @ts-ignore
+            expect(mockPerfClient.eventStack.has(correlationId)).toBeFalsy();
+
+            expect(
+                // @ts-ignore
+                mockPerfClient.eventsByCorrelationId.has(dummyCorrelationId)
+            ).toBeTruthy();
+            expect(
+                // @ts-ignore
+                mockPerfClient.preQueueTimeByCorrelationId.has(
+                    dummyCorrelationId
+                )
+            ).toBeTruthy();
+            expect(
+                // @ts-ignore
+                mockPerfClient.eventStack.has(dummyCorrelationId)
+            ).toBeTruthy();
+        });
+    });
 });