Merge branch 'dev' of https://github.com/AzureAD/microsoft-authentica…

…tion-library-for-js into lalimas/browsercachingupdates

change/@azure-msal-browser-8b9a5a83-4741-4713-8aa4-4b4cd1fce136.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix typos #5531",
+  "packageName": "@azure/msal-browser",
+  "email": "bmahal@microsoft.com",
+  "dependentChangeType": "patch"
+}

change/@azure-msal-browser-f537622d-9856-4148-b525-46daa087795e.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Log number of accounts in trace mode. #5529",
+  "packageName": "@azure/msal-browser",
+  "email": "kshabelko@microsoft.com",
+  "dependentChangeType": "patch"
+}

change/@azure-msal-common-fd3e0f2f-07fa-4c4f-8c07-622199816ab9.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix typos #5531",
+  "packageName": "@azure/msal-common",
+  "email": "bmahal@microsoft.com",
+  "dependentChangeType": "patch"
+}

lerna.json

@@ -1,5 +1,4 @@
 {
-  "lerna": "3.16.4",
   "command": {
     "run": {
       "scope": [

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

@@ -177,7 +177,7 @@ export class PublicClientApplication extends ClientApplication implements IPubli
      */
     protected async acquireTokenSilentAsync(request: SilentRequest, account: AccountInfo): Promise<AuthenticationResult>{
         this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_START, InteractionType.Silent, request);
-        const astsAsyncMeasurement = this.performanceClient.startMeasurement(PerformanceEvents.AcquireTokenSilentAsync, request.correlationId);
+        const atsAsyncMeasurement = this.performanceClient.startMeasurement(PerformanceEvents.AcquireTokenSilentAsync, request.correlationId);
 
         let result: Promise<AuthenticationResult>;
         if (NativeMessageHandler.isNativeAvailable(this.config, this.logger, this.nativeExtensionProvider, request.authenticationScheme) && account.nativeAccountId) {
@@ -242,7 +242,7 @@ export class PublicClientApplication extends ClientApplication implements IPubli
 
         return result.then((response) => {
             this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, InteractionType.Silent, response);
-            astsAsyncMeasurement.endMeasurement({
+            atsAsyncMeasurement.endMeasurement({
                 success: true,
                 fromCache: response.fromCache,
                 isNativeBroker: response.fromNativeBroker,
@@ -251,7 +251,7 @@ export class PublicClientApplication extends ClientApplication implements IPubli
             return response;
         }).catch((tokenRenewalError: AuthError) => {
             this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, InteractionType.Silent, null, tokenRenewalError);
-            astsAsyncMeasurement.endMeasurement({
+            atsAsyncMeasurement.endMeasurement({
                 errorCode: tokenRenewalError.errorCode,
                 subErrorCode: tokenRenewalError.subError,
                 success: false

lib/msal-browser/src/cache/BrowserCacheManager.ts

@@ -403,33 +403,33 @@ export class BrowserCacheManager extends CacheManager {
     getActiveAccount(): AccountInfo | null {
         const activeAccountKeyFilters = this.generateCacheKey(PersistentCacheKeys.ACTIVE_ACCOUNT_FILTERS);
         const activeAccountValueFilters = this.getItem(activeAccountKeyFilters);
-        if (!activeAccountValueFilters) { 
+        if (!activeAccountValueFilters) {
             // if new active account cache type isn't found, it's an old version, so look for that instead
-            this.logger.trace("No active account filters cache schema found, looking for legacy schema");
+            this.logger.trace("BrowserCacheManager.getActiveAccount: No active account filters cache schema found, looking for legacy schema");
             const activeAccountKeyLocal = this.generateCacheKey(PersistentCacheKeys.ACTIVE_ACCOUNT);
             const activeAccountValueLocal = this.getItem(activeAccountKeyLocal);
             if(!activeAccountValueLocal) {
-                this.logger.trace("No active account found");
+                this.logger.trace("BrowserCacheManager.getActiveAccount: No active account found");
                 return null;
             }
             const activeAccount = this.getAccountInfoByFilter({localAccountId: activeAccountValueLocal})[0] || null;
             if(activeAccount) {
-                this.logger.trace("Legacy active account cache schema found");
-                this.logger.trace("Adding active account filters cache schema");
+                this.logger.trace("BrowserCacheManager.getActiveAccount: Legacy active account cache schema found");
+                this.logger.trace("BrowserCacheManager.getActiveAccount: Adding active account filters cache schema");
                 this.setActiveAccount(activeAccount);
                 return activeAccount;
             }
             return null;
         }
         const activeAccountValueObj = this.validateAndParseJson(activeAccountValueFilters) as AccountInfo;
         if(activeAccountValueObj) {
-            this.logger.trace("Active account filters schema found");
+            this.logger.trace("BrowserCacheManager.getActiveAccount: Active account filters schema found");
             return this.getAccountInfoByFilter({
                 homeAccountId: activeAccountValueObj.homeAccountId,
                 localAccountId: activeAccountValueObj.localAccountId
             })[0] || null;
         }
-        this.logger.trace("No active account found");
+        this.logger.trace("BrowserCacheManager.getActiveAccount: No active account found");
         return null;
     }
 
@@ -461,6 +461,8 @@ export class BrowserCacheManager extends CacheManager {
      */
     getAccountInfoByFilter(accountFilter: Partial<Omit<AccountInfo, "idTokenClaims"|"name">>): AccountInfo[] {
         const allAccounts = this.getAllAccounts();
+        this.logger.trace(`BrowserCacheManager.getAccountInfoByFilter: total ${allAccounts.length} accounts found`);
+
         return allAccounts.filter((accountObj) => {
             if (accountFilter.username && accountFilter.username.toLowerCase() !== accountObj.username.toLowerCase()) {
                 return false;
@@ -1069,10 +1071,10 @@ export class BrowserCacheManager extends CacheManager {
     getRedirectRequestContext(): string | null {
         return this.getTemporaryCache(TemporaryCacheKeys.REDIRECT_CONTEXT, true);
     }
-     
+
     /**
      * Sets application id as the redirect context during AcquireTokenRedirect flow.
-     * @param value 
+     * @param value
      */
     setRedirectRequestContext(value: string): void {
         this.setTemporaryCache(TemporaryCacheKeys.REDIRECT_CONTEXT, value, true);

lib/msal-browser/src/telemetry/BrowserPerformanceClient.ts

@@ -19,7 +19,7 @@ export class BrowserPerformanceClient extends PerformanceClient implements IPerf
         this.guidGenerator = new GuidGenerator(this.browserCrypto);
     }
 
-    startPerformanceMeasuremeant(measureName: string, correlationId: string): IPerformanceMeasurement {
+    startPerformanceMeasurement(measureName: string, correlationId: string): IPerformanceMeasurement {
         return new BrowserPerformanceMeasurement(measureName, correlationId);
     }