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

…tion-library-for-js into fix-sourcemap-errors
AzureAD · Aug 28, 2023 · 5987c09 · 5987c09
2 parents 0310631 + b4924fa
commit 5987c09
Show file tree

Hide file tree

Showing 57 changed files with 376 additions and 365 deletions.
diff --git a/change/@azure-msal-browser-92ef9413-83ad-47e0-b288-482620515dd8.json b/change/@azure-msal-browser-92ef9413-83ad-47e0-b288-482620515dd8.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Remove isEmpty helper API",
+  "packageName": "@azure/msal-browser",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@azure-msal-common-3a0c94d6-26be-4e2c-80e0-844974ccff3b.json b/change/@azure-msal-common-3a0c94d6-26be-4e2c-80e0-844974ccff3b.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Remove isEmpty helper API",
+  "packageName": "@azure/msal-common",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@azure-msal-node-73fcce3c-bfe0-43c3-bc3e-1ab4295a7200.json b/change/@azure-msal-node-73fcce3c-bfe0-43c3-bc3e-1ab4295a7200.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Remove isEmpty helper API",
+  "packageName": "@azure/msal-node",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@azure-msal-node-877cc7a7-7e44-47fb-bbf2-a08d7b010cde.json b/change/@azure-msal-node-877cc7a7-7e44-47fb-bbf2-a08d7b010cde.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "close loopback server on error #6387",
+  "packageName": "@azure/msal-node",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@azure-msal-node-fd9abab4-f755-4c59-8e63-744eefaee29b.json b/change/@azure-msal-node-fd9abab4-f755-4c59-8e63-744eefaee29b.json
@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "feat(msal-node): change all relative imports to .js #6399",
+  "packageName": "@azure/msal-node",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/lib/msal-browser/src/cache/BrowserCacheManager.ts b/lib/msal-browser/src/cache/BrowserCacheManager.ts
@@ -1556,7 +1556,7 @@ export class BrowserCacheManager extends CacheManager {
                 JSON.stringify(ccsCredential),
                 true
             );
-        } else if (!StringUtils.isEmpty(loginHint)) {
+        } else if (loginHint) {
             const ccsCredential: CcsCredential = {
                 credential: loginHint,
                 type: CcsCredentialType.UPN,
@@ -1576,16 +1576,14 @@ export class BrowserCacheManager extends CacheManager {
     resetRequestCache(state: string): void {
         this.logger.trace("BrowserCacheManager.resetRequestCache called");
         // check state and remove associated cache items
-        if (!StringUtils.isEmpty(state)) {
+        if (state) {
             this.getKeys().forEach((key) => {
                 if (key.indexOf(state) !== -1) {
                     this.removeItem(key);
                 }
             });
-        }
 
-        // delete generic interactive request parameters
-        if (state) {
+            // delete generic interactive request parameters
             this.removeItem(this.generateStateKey(state));
             this.removeItem(this.generateNonceKey(state));
             this.removeItem(this.generateAuthorityKey(state));
@@ -1709,7 +1707,7 @@ export class BrowserCacheManager extends CacheManager {
         );
 
         // Get cached authority and use if no authority is cached with request.
-        if (StringUtils.isEmpty(parsedRequest.authority)) {
+        if (!parsedRequest.authority) {
             const authorityCacheKey: string = this.generateAuthorityKey(state);
             const cachedAuthority = this.getTemporaryCache(authorityCacheKey);
             if (!cachedAuthority) {

diff --git a/lib/msal-browser/src/error/BrowserAuthError.ts b/lib/msal-browser/src/error/BrowserAuthError.ts
@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { AuthError, StringUtils } from "@azure/msal-common";
+import { AuthError } from "@azure/msal-common";
 
 /**
  * BrowserAuthErrorMessage class containing string constants used by error codes and messages.
@@ -297,7 +297,7 @@ export class BrowserAuthError extends AuthError {
      */
     static createPopupWindowError(errDetail?: string): BrowserAuthError {
         let errorMessage = BrowserAuthErrorMessage.popupWindowError.desc;
-        errorMessage = !StringUtils.isEmpty(errDetail)
+        errorMessage = errDetail
             ? `${errorMessage} Details: ${errDetail}`
             : errorMessage;
         return new BrowserAuthError(

diff --git a/lib/msal-browser/src/interaction_client/BaseInteractionClient.ts b/lib/msal-browser/src/interaction_client/BaseInteractionClient.ts
@@ -15,12 +15,12 @@ import {
     ServerTelemetryManager,
     ServerTelemetryRequest,
     ClientConfigurationError,
-    StringUtils,
     Authority,
     AuthorityOptions,
     AuthorityFactory,
     IPerformanceClient,
     PerformanceEvents,
+    StringUtils,
 } from "@azure/msal-common";
 import { BrowserConfiguration } from "../config/Configuration";
 import { BrowserCacheManager } from "../cache/BrowserCacheManager";

diff --git a/lib/msal-browser/src/interaction_client/PopupClient.ts b/lib/msal-browser/src/interaction_client/PopupClient.ts
@@ -15,7 +15,6 @@ import {
     ProtocolUtils,
     ServerAuthorizationCodeResponse,
     PerformanceEvents,
-    StringUtils,
     IPerformanceClient,
     Logger,
     ICrypto,
@@ -542,7 +541,7 @@ export class PopupClient extends StandardInteractionClient {
      */
     initiateAuthRequest(requestUrl: string, params: PopupParams): Window {
         // Check that request url is not empty.
-        if (!StringUtils.isEmpty(requestUrl)) {
+        if (requestUrl) {
             this.logger.infoPii(`Navigate to: ${requestUrl}`);
             // Open the popup window to requestUrl.
             return this.openPopup(requestUrl, params);
@@ -602,7 +601,7 @@ export class PopupClient extends StandardInteractionClient {
                 } catch (e) {}
 
                 // Don't process blank pages or cross domain
-                if (StringUtils.isEmpty(href) || href === "about:blank") {
+                if (!href || href === "about:blank") {
                     return;
                 }
 
@@ -687,7 +686,7 @@ export class PopupClient extends StandardInteractionClient {
                 } catch (e) {}
 
                 // Don't process blank pages or cross domain
-                if (StringUtils.isEmpty(href) || href === "about:blank") {
+                if (!href || href === "about:blank") {
                     return;
                 }
 

diff --git a/lib/msal-browser/src/interaction_client/SilentIframeClient.ts b/lib/msal-browser/src/interaction_client/SilentIframeClient.ts
@@ -6,7 +6,6 @@
 import {
     ICrypto,
     Logger,
-    StringUtils,
     PromptValue,
     CommonAuthorizationCodeRequest,
     AuthorizationCodeClient,
@@ -82,9 +81,9 @@ export class SilentIframeClient extends StandardInteractionClient {
         );
         // Check that we have some SSO data
         if (
-            StringUtils.isEmpty(request.loginHint) &&
-            StringUtils.isEmpty(request.sid) &&
-            (!request.account || StringUtils.isEmpty(request.account.username))
+            !request.loginHint &&
+            !request.sid &&
+            (!request.account || !request.account.username)
         ) {
             this.logger.warning(
                 "No user hint provided. The authorization server may need more information to complete this request."

diff --git a/lib/msal-browser/src/interaction_client/StandardInteractionClient.ts b/lib/msal-browser/src/interaction_client/StandardInteractionClient.ts
@@ -17,7 +17,6 @@ import {
     CommonEndSessionRequest,
     ProtocolUtils,
     ResponseMode,
-    StringUtils,
     IdTokenClaims,
     AccountInfo,
     AzureCloudOptions,
@@ -463,7 +462,7 @@ export abstract class StandardInteractionClient extends BaseInteractionClient {
         }
 
         // Check for ADAL/MSAL v1 SSO
-        if (StringUtils.isEmpty(validatedRequest.loginHint) && !account) {
+        if (!validatedRequest.loginHint && !account) {
             const legacyLoginHint = this.browserStorage.getLegacyLoginHint();
             if (legacyLoginHint) {
                 validatedRequest.loginHint = legacyLoginHint;

diff --git a/lib/msal-browser/src/interaction_handler/InteractionHandler.ts b/lib/msal-browser/src/interaction_handler/InteractionHandler.ts
@@ -5,7 +5,6 @@
 
 import {
     AuthorizationCodePayload,
-    StringUtils,
     CommonAuthorizationCodeRequest,
     AuthorizationCodeClient,
     AuthorityFactory,
@@ -69,7 +68,7 @@ export class InteractionHandler {
         );
         this.logger.verbose("InteractionHandler.handleCodeResponse called");
         // Check that location hash isn't empty.
-        if (StringUtils.isEmpty(locationHash)) {
+        if (!locationHash) {
             throw BrowserAuthError.createEmptyHashError();
         }
 

diff --git a/lib/msal-browser/src/interaction_handler/RedirectHandler.ts b/lib/msal-browser/src/interaction_handler/RedirectHandler.ts
@@ -5,7 +5,6 @@
 
 import {
     AuthorizationCodeClient,
-    StringUtils,
     CommonAuthorizationCodeRequest,
     ICrypto,
     Authority,
@@ -64,7 +63,7 @@ export class RedirectHandler extends InteractionHandler {
     ): Promise<void> {
         this.logger.verbose("RedirectHandler.initiateAuthRequest called");
         // Navigate if valid URL
-        if (!StringUtils.isEmpty(requestUrl)) {
+        if (requestUrl) {
             // Cache start page, returns to this page after redirectUri if navigateToLoginRequestUrl is true
             if (params.redirectStartPage) {
                 this.logger.verbose(
@@ -152,7 +151,7 @@ export class RedirectHandler extends InteractionHandler {
         this.logger.verbose("RedirectHandler.handleCodeResponse called");
 
         // Check that location hash isn't empty.
-        if (StringUtils.isEmpty(locationHash)) {
+        if (!locationHash) {
             throw BrowserAuthError.createEmptyHashError();
         }
 

diff --git a/lib/msal-browser/src/interaction_handler/SilentHandler.ts b/lib/msal-browser/src/interaction_handler/SilentHandler.ts
@@ -5,7 +5,6 @@
 
 import {
     UrlString,
-    StringUtils,
     CommonAuthorizationCodeRequest,
     AuthorizationCodeClient,
     Constants,
@@ -60,7 +59,7 @@ export class SilentHandler extends InteractionHandler {
             this.authCodeRequest.correlationId
         );
 
-        if (StringUtils.isEmpty(requestUrl)) {
+        if (!requestUrl) {
             // Throw error if request URL is empty.
             this.logger.info("Navigate url is empty");
             throw BrowserAuthError.createEmptyNavigationUriError();
@@ -125,7 +124,7 @@ export class SilentHandler extends InteractionHandler {
                         : Constants.EMPTY_STRING;
                 } catch (e) {}
 
-                if (StringUtils.isEmpty(href) || href === "about:blank") {
+                if (!href || href === "about:blank") {
                     return;
                 }
 

diff --git a/lib/msal-browser/src/utils/BrowserProtocolUtils.ts b/lib/msal-browser/src/utils/BrowserProtocolUtils.ts
@@ -5,7 +5,6 @@
 
 import { InteractionType } from "./BrowserConstants";
 import {
-    StringUtils,
     ClientAuthError,
     ICrypto,
     RequestStateObject,
@@ -28,7 +27,7 @@ export class BrowserProtocolUtils {
         browserCrypto: ICrypto,
         state: string
     ): BrowserStateObject | null {
-        if (StringUtils.isEmpty(state)) {
+        if (!state) {
             return null;
         }
 

diff --git a/lib/msal-common/src/account/AuthToken.ts b/lib/msal-common/src/account/AuthToken.ts
@@ -18,7 +18,7 @@ export class AuthToken {
     // Claims inside token
     claims: TokenClaims;
     constructor(rawToken: string, crypto: ICrypto) {
-        if (StringUtils.isEmpty(rawToken)) {
+        if (!rawToken) {
             throw ClientAuthError.createTokenNullOrEmptyError(rawToken);
         }
 

diff --git a/lib/msal-common/src/account/ClientInfo.ts b/lib/msal-common/src/account/ClientInfo.ts
@@ -4,7 +4,6 @@
  */
 
 import { ClientAuthError } from "../error/ClientAuthError";
-import { StringUtils } from "../utils/StringUtils";
 import { ICrypto } from "../crypto/ICrypto";
 import { Separators, Constants } from "../utils/Constants";
 
@@ -25,7 +24,7 @@ export function buildClientInfo(
     rawClientInfo: string,
     crypto: ICrypto
 ): ClientInfo {
-    if (StringUtils.isEmpty(rawClientInfo)) {
+    if (!rawClientInfo) {
         throw ClientAuthError.createClientInfoEmptyError();
     }
 
@@ -46,7 +45,7 @@ export function buildClientInfo(
 export function buildClientInfoFromHomeAccountId(
     homeAccountId: string
 ): ClientInfo {
-    if (StringUtils.isEmpty(homeAccountId)) {
+    if (!homeAccountId) {
         throw ClientAuthError.createClientInfoDecodingError(
             "Home account ID was empty."
         );

diff --git a/lib/msal-common/src/authority/AuthorityFactory.ts b/lib/msal-common/src/authority/AuthorityFactory.ts
@@ -6,7 +6,6 @@
 import { Authority } from "./Authority";
 import { ClientConfigurationError } from "../error/ClientConfigurationError";
 import { INetworkModule } from "../network/INetworkModule";
-import { StringUtils } from "../utils/StringUtils";
 import { ClientAuthError } from "../error/ClientAuthError";
 import { ICacheManager } from "../cache/interface/ICacheManager";
 import { AuthorityOptions } from "./AuthorityOptions";
@@ -90,7 +89,7 @@ export class AuthorityFactory {
         correlationId?: string
     ): Authority {
         // Throw error if authority url is empty
-        if (StringUtils.isEmpty(authorityUrl)) {
+        if (!authorityUrl) {
             throw ClientConfigurationError.createUrlEmptyError();
         }
 

diff --git a/lib/msal-common/src/cache/entities/AccessTokenEntity.ts b/lib/msal-common/src/cache/entities/AccessTokenEntity.ts
@@ -6,7 +6,6 @@
 import { CredentialEntity } from "./CredentialEntity";
 import { CredentialType, AuthenticationScheme } from "../../utils/Constants";
 import { TimeUtils } from "../../utils/TimeUtils";
-import { StringUtils } from "../../utils/StringUtils";
 import { ICrypto } from "../../crypto/ICrypto";
 import { TokenClaims } from "../../account/TokenClaims";
 import { AuthToken } from "../../account/AuthToken";
@@ -101,9 +100,7 @@ export class AccessTokenEntity extends CredentialEntity {
         atEntity.target = scopes;
         atEntity.userAssertionHash = userAssertionHash;
 
-        atEntity.tokenType = StringUtils.isEmpty(tokenType)
-            ? AuthenticationScheme.BEARER
-            : tokenType;
+        atEntity.tokenType = tokenType || AuthenticationScheme.BEARER;
 
         if (requestedClaims) {
             atEntity.requestedClaims = requestedClaims;

diff --git a/lib/msal-common/src/cache/entities/AccountEntity.ts b/lib/msal-common/src/cache/entities/AccountEntity.ts
@@ -7,7 +7,6 @@ import { Separators, CacheAccountType, Constants } from "../../utils/Constants";
 import { Authority } from "../../authority/Authority";
 import { ICrypto } from "../../crypto/ICrypto";
 import { buildClientInfo } from "../../account/ClientInfo";
-import { StringUtils } from "../../utils/StringUtils";
 import { AccountInfo } from "../../account/AccountInfo";
 import { ClientAuthError } from "../../error/ClientAuthError";
 import { AuthorityType } from "../../authority/AuthorityType";
@@ -239,10 +238,7 @@ export class AccountEntity {
         if (serverClientInfo) {
             try {
                 const clientInfo = buildClientInfo(serverClientInfo, cryptoObj);
-                if (
-                    !StringUtils.isEmpty(clientInfo.uid) &&
-                    !StringUtils.isEmpty(clientInfo.utid)
-                ) {
+                if (clientInfo.uid && clientInfo.utid) {
                     return `${clientInfo.uid}${Separators.CLIENT_INFO_SEPARATOR}${clientInfo.utid}`;
                 }
             } catch (e) {}

diff --git a/lib/msal-common/src/client/AuthorizationCodeClient.ts b/lib/msal-common/src/client/AuthorizationCodeClient.ts
@@ -651,7 +651,7 @@ export class AuthorizationCodeClient extends BaseClient {
         }
 
         if (
-            !StringUtils.isEmpty(request.claims) ||
+            request.claims ||
             (this.config.authOptions.clientCapabilities &&
                 this.config.authOptions.clientCapabilities.length > 0)
         ) {

diff --git a/lib/msal-common/src/logger/Logger.ts b/lib/msal-common/src/logger/Logger.ts
@@ -3,7 +3,6 @@
  * Licensed under the MIT License.
  */
 
-import { StringUtils } from "../utils/StringUtils";
 import { LoggerOptions } from "../config/ClientConfiguration";
 import { Constants } from "../utils/Constants";
 
@@ -126,14 +125,9 @@ export class Logger {
         const timestamp = new Date().toUTCString();
 
         // Add correlationId to logs if set, correlationId provided on log messages take precedence
-        let logHeader: string;
-        if (!StringUtils.isEmpty(options.correlationId)) {
-            logHeader = `[${timestamp}] : [${options.correlationId}]`;
-        } else if (!StringUtils.isEmpty(this.correlationId)) {
-            logHeader = `[${timestamp}] : [${this.correlationId}]`;
-        } else {
-            logHeader = `[${timestamp}]`;
-        }
+        const logHeader = `[${timestamp}] : [${
+            options.correlationId || this.correlationId || ""
+        }]`;
 
         const log = `${logHeader} : ${this.packageName}@${
             this.packageVersion