Merge branch 'dev' into update-browser-api-extr

AzureAD · Aug 28, 2024 · 53fd55e · 53fd55e
2 parents 8329fd9 + a7d6315
commit 53fd55e
Show file tree

Hide file tree

Showing 18 changed files with 231 additions and 1,240 deletions.
diff --git a/change/@azure-msal-browser-85cc015e-a981-4a3a-931b-39e4ef1c980c.json b/change/@azure-msal-browser-85cc015e-a981-4a3a-931b-39e4ef1c980c.json
@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "Remove retry for popup and redirect #7270",
+  "packageName": "@azure/msal-browser",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@azure-msal-common-dd361954-4720-4d1f-a6a2-4750c47d3673.json b/change/@azure-msal-common-dd361954-4720-4d1f-a6a2-4750c47d3673.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Remove PerformanceEvent for PopupTokenHelper #7270",
+  "packageName": "@azure/msal-common",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@azure-msal-node-cd98a92a-846b-47bc-894b-873d04f9e2d7.json b/change/@azure-msal-node-cd98a92a-846b-47bc-894b-873d04f9e2d7.json
@@ -0,0 +1,7 @@
+{
+  "type": "none",
+  "comment": "Format fix #7270",
+  "packageName": "@azure/msal-node",
+  "email": "[email protected]",
+  "dependentChangeType": "none"
+}
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

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";