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

…tion-library-for-js into fix-cjs-types
AzureAD · Aug 29, 2024 · 0611bde · 0611bde
2 parents a6a7ab4 + 59cf46d
commit 0611bde
Show file tree

Hide file tree

Showing 38 changed files with 436 additions and 1,284 deletions.
diff --git a/change/@azure-msal-browser-25572a0b-84d6-4cf8-897b-cb033d46a99c.json b/change/@azure-msal-browser-25572a0b-84d6-4cf8-897b-cb033d46a99c.json
diff --git a/change/@azure-msal-node-234bf880-8502-4a8e-8755-b58175525b0c.json b/change/@azure-msal-node-234bf880-8502-4a8e-8755-b58175525b0c.json
diff --git a/extensions/msal-node-extensions/CHANGELOG.json b/extensions/msal-node-extensions/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@azure/msal-node-extensions",
   "entries": [
+    {
+      "date": "Wed, 28 Aug 2024 23:06:01 GMT",
+      "version": "1.1.0",
+      "tag": "@azure/msal-node-extensions_v1.1.0",
+      "comments": {
+        "undefined": [
+          {
+            "author": "beachball",
+            "package": "@azure/msal-node-extensions",
+            "comment": "Bump @azure/msal-common to v14.14.2",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@azure/msal-node-extensions",
+            "comment": "Bump eslint-config-msal to v0.0.0",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Tue, 13 Aug 2024 23:25:09 GMT",
       "version": "1.1.0",

diff --git a/extensions/msal-node-extensions/package.json b/extensions/msal-node-extensions/package.json
@@ -64,7 +64,7 @@
     ]
   },
   "dependencies": {
-    "@azure/msal-common": "14.14.1",
+    "@azure/msal-common": "14.14.2",
     "@azure/msal-node-runtime": "^0.13.6-alpha.0",
     "keytar": "^7.8.0"
   },

diff --git a/lib/msal-angular/CHANGELOG.json b/lib/msal-angular/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@azure/msal-angular",
   "entries": [
+    {
+      "date": "Wed, 28 Aug 2024 23:06:01 GMT",
+      "version": "3.0.23",
+      "tag": "@azure/msal-angular_v3.0.23",
+      "comments": {
+        "undefined": [
+          {
+            "author": "beachball",
+            "package": "@azure/msal-angular",
+            "comment": "Bump @azure/msal-browser to v3.22.0",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@azure/msal-angular",
+            "comment": "Bump eslint-config-msal to v0.0.0",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Tue, 13 Aug 2024 23:25:09 GMT",
       "version": "3.0.23",

diff --git a/lib/msal-angular/package.json b/lib/msal-angular/package.json
@@ -50,7 +50,7 @@
     "@angular/platform-browser": "^15.1.4",
     "@angular/platform-browser-dynamic": "^15.1.4",
     "@angular/router": "^15.1.4",
-    "@azure/msal-browser": "^3.21.0",
+    "@azure/msal-browser": "^3.22.0",
     "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",
@@ -71,7 +71,7 @@
     "zone.js": "~0.11.8"
   },
   "peerDependencies": {
-    "@azure/msal-browser": "^3.21.0",
+    "@azure/msal-browser": "^3.22.0",
     "rxjs": "^7.0.0"
   }
 }
diff --git a/lib/msal-browser/CHANGELOG.json b/lib/msal-browser/CHANGELOG.json
@@ -1,6 +1,45 @@
 {
   "name": "@azure/msal-browser",
   "entries": [
+    {
+      "date": "Wed, 28 Aug 2024 23:06:01 GMT",
+      "version": "3.22.0",
+      "tag": "@azure/msal-browser_v3.22.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "[email protected]",
+            "package": "@azure/msal-browser",
+            "commit": "a7d6315a17daf27bb0887fc03a3039a7ba6f57eb",
+            "comment": "Remove retry for popup and redirect #7270"
+          },
+          {
+            "author": "[email protected]",
+            "package": "@azure/msal-browser",
+            "commit": "5477a2eec3101ef7d4da253760bf97ae639659a5",
+            "comment": "Revert 'Use high precision TS for NAA message time (#7243)'"
+          },
+          {
+            "author": "beachball",
+            "package": "@azure/msal-browser",
+            "comment": "Bump @azure/msal-common to v14.14.2",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@azure/msal-browser",
+            "comment": "Bump eslint-config-msal to v0.0.0",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@azure/msal-browser",
+            "comment": "Bump msal-test-utils to v0.0.1",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Tue, 13 Aug 2024 23:25:07 GMT",
       "version": "3.21.0",

diff --git a/lib/msal-browser/CHANGELOG.md b/lib/msal-browser/CHANGELOG.md
@@ -1,9 +1,21 @@
 # Change Log - @azure/msal-browser
 
-This log was last generated on Tue, 13 Aug 2024 23:25:07 GMT and should not be manually modified.
+This log was last generated on Wed, 28 Aug 2024 23:06:01 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 3.22.0
+
+Wed, 28 Aug 2024 23:06:01 GMT
+
+### Minor changes
+
+- Remove retry for popup and redirect #7270 ([email protected])
+- Revert 'Use high precision TS for NAA message time (#7243)' ([email protected])
+- Bump @azure/msal-common to v14.14.2
+- Bump eslint-config-msal to v0.0.0
+- Bump msal-test-utils to v0.0.1
+
 ## 3.21.0
 
 Tue, 13 Aug 2024 23:25:07 GMT

diff --git a/lib/msal-browser/apiReview/msal-browser.api.md b/lib/msal-browser/apiReview/msal-browser.api.md
@@ -235,8 +235,7 @@ declare namespace BrowserAuthErrorCodes {
         uninitializedPublicClientApplication,
         nativePromptNotSupported,
         invalidBase64String,
-        invalidPopTokenRequest,
-        failedToRetry
+        invalidPopTokenRequest
     }
 }
 export { BrowserAuthErrorCodes }
@@ -840,11 +839,6 @@ export { ExternalTokenResponse }
 // @public (undocumented)
 const failedToParseResponse = "failed_to_parse_response";
 
-// Warning: (ae-missing-release-tag) "failedToRetry" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-const failedToRetry = "failed_to_retry";
-
 // Warning: (ae-missing-release-tag) "getCurrentUri" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public
@@ -1679,7 +1673,7 @@ const userCancelled = "user_cancelled";
 // Warning: (ae-missing-release-tag) "version" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const version = "3.20.0";
+export const version = "3.22.0";
 
 // Warning: (ae-missing-release-tag) "WrapperSKU" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 // Warning: (ae-missing-release-tag) "WrapperSKU" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)

diff --git a/lib/msal-browser/package.json b/lib/msal-browser/package.json
@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/AzureAD/microsoft-authentication-library-for-js.git"
   },
-  "version": "3.21.0",
+  "version": "3.22.0",
   "description": "Microsoft Authentication Library for js",
   "keywords": [
     "implicit",
@@ -104,6 +104,6 @@
     "typescript": "^4.9.5"
   },
   "dependencies": {
-    "@azure/msal-common": "14.14.1"
+    "@azure/msal-common": "14.14.2"
   }
 }
diff --git a/lib/msal-browser/src/cache/BrowserCacheManager.ts b/lib/msal-browser/src/cache/BrowserCacheManager.ts
@@ -1552,9 +1552,6 @@ export class BrowserCacheManager extends CacheManager {
         this.removeTemporaryItem(
             this.generateCacheKey(TemporaryCacheKeys.NATIVE_REQUEST)
         );
-        this.removeTemporaryItem(
-            this.generateCacheKey(TemporaryCacheKeys.REDIRECT_REQUEST)
-        );
         this.setInteractionInProgress(false);
     }
 
@@ -1616,98 +1613,6 @@ export class BrowserCacheManager extends CacheManager {
         this.setInteractionInProgress(false);
     }
 
-    /**
-     * Create request retry key to cache retry status
-     */
-    generateRequestRetriedKey(): string {
-        return `${Constants.CACHE_PREFIX}.${TemporaryCacheKeys.REQUEST_RETRY}.${this.clientId}`;
-    }
-
-    /**
-     * Gets the request retry value from the cache
-     */
-    getRequestRetried(): number | null {
-        const requestRetriedKey = this.generateRequestRetriedKey();
-        const cachedRetryNumber = this.getTemporaryCache(requestRetriedKey);
-        if (!cachedRetryNumber) {
-            return null;
-        }
-        return parseInt(cachedRetryNumber);
-    }
-
-    /**
-     * Sets the request retry value to "retried" in the cache
-     */
-    setRequestRetried(): void {
-        this.logger.trace("BrowserCacheManager.setRequestRetried called");
-        const requestRetriedKey = this.generateRequestRetriedKey();
-        this.setTemporaryCache(requestRetriedKey, "1", false);
-    }
-
-    /**
-     * Removes all request retry values in the cache
-     */
-    removeRequestRetried(): void {
-        const requestRetriedKey = this.generateRequestRetriedKey();
-        this.removeTemporaryItem(requestRetriedKey);
-    }
-
-    /**
-     * Caches the redirectRequest in the cache
-     * @param redirectRequest
-     */
-    cacheRedirectRequest(redirectRequest: RedirectRequest): void {
-        this.logger.trace("BrowserCacheManager.cacheRedirectRequest called");
-        const { ...restParams } = redirectRequest;
-        delete restParams.onRedirectNavigate;
-        const encodedValue = JSON.stringify(restParams);
-
-        this.setTemporaryCache(
-            TemporaryCacheKeys.REDIRECT_REQUEST,
-            encodedValue,
-            true
-        );
-    }
-
-    /**
-     * Gets redirect request from the cache. Logs an error and returns undefined if nothing is found.
-     */
-    getCachedRedirectRequest(): RedirectRequest | undefined {
-        this.logger.trace(
-            "BrowserCacheManager.getCachedRedirectRequest called"
-        );
-        const cachedRedirectRequest = this.getTemporaryCache(
-            TemporaryCacheKeys.REDIRECT_REQUEST,
-            true
-        );
-        if (!cachedRedirectRequest) {
-            this.logger.error(`No cached redirect request found.`);
-        } else {
-            this.removeTemporaryItem(
-                this.generateCacheKey(TemporaryCacheKeys.REDIRECT_REQUEST)
-            );
-            let parsedRequest: RedirectRequest;
-            try {
-                parsedRequest = JSON.parse(
-                    cachedRedirectRequest
-                ) as RedirectRequest;
-            } catch (e) {
-                this.logger.errorPii(
-                    `Attempted to parse: ${cachedRedirectRequest}`
-                );
-                this.logger.error(
-                    `Parsing cached redirect request threw with error: ${e}`
-                );
-                return;
-            }
-
-            if (parsedRequest) {
-                return parsedRequest;
-            }
-        }
-        return;
-    }
-
     cacheCodeRequest(authCodeRequest: CommonAuthorizationCodeRequest): void {
         this.logger.trace("BrowserCacheManager.cacheCodeRequest called");
 

diff --git a/lib/msal-browser/src/error/BrowserAuthError.ts b/lib/msal-browser/src/error/BrowserAuthError.ts
@@ -92,8 +92,6 @@ export const BrowserAuthErrorMessages = {
         "Invalid base64 encoded string.",
     [BrowserAuthErrorCodes.invalidPopTokenRequest]:
         "Invalid PoP token request. The request should not have both a popKid value and signPopToken set to true.",
-    [BrowserAuthErrorCodes.failedToRetry]:
-        "Unable to retry failed auth code redemption due to usage of the onRedirectNavigate request parameter. Please set onRedirectNavigate on the PublicClientApplication configuration instead or call loginRedirect again.",
 };
 
 /**

diff --git a/lib/msal-browser/src/error/BrowserAuthErrorCodes.ts b/lib/msal-browser/src/error/BrowserAuthErrorCodes.ts
@@ -56,4 +56,3 @@ export const uninitializedPublicClientApplication =
 export const nativePromptNotSupported = "native_prompt_not_supported";
 export const invalidBase64String = "invalid_base64_string";
 export const invalidPopTokenRequest = "invalid_pop_token_request";
-export const failedToRetry = "failed_to_retry";