@azure/msal-common 14.0.0-beta.0 → 14.0.0-beta.1

package/dist/error/ServerError.js

@@ -1,4 +1,4 @@
-/*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+/*! @azure/msal-common v14.0.0-beta.1 2023-07-06 */
 'use strict';
 import { AuthError } from './AuthError.js';
 

package/dist/index.cjs.js

@@ -1,4 +1,4 @@
-/*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+/*! @azure/msal-common v14.0.0-beta.1 2023-07-06 */
 'use strict';
 'use strict';
 
@@ -1296,7 +1296,7 @@ class Logger {
 
 /* eslint-disable header/header */
 const name = "@azure/msal-common";
-const version = "14.0.0-beta.0";
+const version = "14.0.0-beta.1";
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3155,6 +3155,9 @@ const DEFAULT_LOGGER_IMPLEMENTATION = {
     logLevel: exports.LogLevel.Info,
     correlationId: Constants.EMPTY_STRING,
 };
+const DEFAULT_CACHE_OPTIONS = {
+    claimsBasedCachingEnabled: false,
+};
 const DEFAULT_NETWORK_IMPLEMENTATION = {
     async sendGetRequestAsync() {
         const notImplErr = "Network interface - sendGetRequestAsync() has not been implemented";
@@ -3192,7 +3195,7 @@ const DEFAULT_TELEMETRY_OPTIONS = {
  *
  * @returns Configuration
  */
-function buildClientConfiguration({ authOptions: userAuthOptions, systemOptions: userSystemOptions, loggerOptions: userLoggerOption, storageInterface: storageImplementation, networkInterface: networkImplementation, cryptoInterface: cryptoImplementation, clientCredentials: clientCredentials, libraryInfo: libraryInfo, telemetry: telemetry, serverTelemetryManager: serverTelemetryManager, persistencePlugin: persistencePlugin, serializableCache: serializableCache, }) {
+function buildClientConfiguration({ authOptions: userAuthOptions, systemOptions: userSystemOptions, loggerOptions: userLoggerOption, cacheOptions: userCacheOptions, storageInterface: storageImplementation, networkInterface: networkImplementation, cryptoInterface: cryptoImplementation, clientCredentials: clientCredentials, libraryInfo: libraryInfo, telemetry: telemetry, serverTelemetryManager: serverTelemetryManager, persistencePlugin: persistencePlugin, serializableCache: serializableCache, }) {
     const loggerOptions = {
         ...DEFAULT_LOGGER_IMPLEMENTATION,
         ...userLoggerOption,
@@ -3201,6 +3204,7 @@ function buildClientConfiguration({ authOptions: userAuthOptions, systemOptions:
         authOptions: buildAuthOptions(userAuthOptions),
         systemOptions: { ...DEFAULT_SYSTEM_OPTIONS, ...userSystemOptions },
         loggerOptions: loggerOptions,
+        cacheOptions: { ...DEFAULT_CACHE_OPTIONS, ...userCacheOptions },
         storageInterface: storageImplementation ||
             new DefaultStorageClass(userAuthOptions.clientId, DEFAULT_CRYPTO_IMPLEMENTATION, new Logger(loggerOptions)),
         networkInterface: networkImplementation || DEFAULT_NETWORK_IMPLEMENTATION,
@@ -6170,6 +6174,12 @@ class SilentFlowClient extends BaseClient {
             this.logger.info("SilentFlowClient:acquireCachedToken - Skipping cache because forceRefresh is true.");
             throw ClientAuthError.createRefreshRequiredError();
         }
+        else if (!this.config.cacheOptions.claimsBasedCachingEnabled &&
+            !StringUtils.isEmptyObj(request.claims)) {
+            // Must refresh due to request parameters.
+            this.logger.info("SilentFlowClient:acquireCachedToken - Skipping cache because claims-based caching is disabled and claims were requested.");
+            throw ClientAuthError.createRefreshRequiredError();
+        }
         // We currently do not support silent flow for account === null use cases; This will be revisited for confidential flow usecases
         if (!request.account) {
             throw ClientAuthError.createNoAccountInSilentRequestError();
@@ -7697,37 +7707,25 @@ class Authority {
     }
     /**
      * Update the retrieved metadata with regional information.
+     * User selected Azure region will be used if configured.
      */
     async updateMetadataWithRegionalInformation(metadata) {
         this.performanceClient?.addQueueMeasurement(PerformanceEvents.AuthorityUpdateMetadataWithRegionalInformation, this.correlationId);
-        this.performanceClient?.setPreQueueTime(PerformanceEvents.RegionDiscoveryDetectRegion, this.correlationId);
-        const autodetectedRegionName = await this.regionDiscovery.detectRegion(this.authorityOptions.azureRegionConfiguration?.environmentRegion, this.regionDiscoveryMetadata);
-        const azureRegion = this.authorityOptions.azureRegionConfiguration?.azureRegion ===
-            Constants.AZURE_REGION_AUTO_DISCOVER_FLAG
-            ? autodetectedRegionName
-            : this.authorityOptions.azureRegionConfiguration?.azureRegion;
-        if (this.authorityOptions.azureRegionConfiguration?.azureRegion ===
-            Constants.AZURE_REGION_AUTO_DISCOVER_FLAG) {
-            this.regionDiscoveryMetadata.region_outcome = autodetectedRegionName
-                ? RegionDiscoveryOutcomes.AUTO_DETECTION_REQUESTED_SUCCESSFUL
-                : RegionDiscoveryOutcomes.AUTO_DETECTION_REQUESTED_FAILED;
-        }
-        else {
-            if (autodetectedRegionName) {
-                this.regionDiscoveryMetadata.region_outcome =
-                    this.authorityOptions.azureRegionConfiguration
-                        ?.azureRegion === autodetectedRegionName
-                        ? RegionDiscoveryOutcomes.CONFIGURED_MATCHES_DETECTED
-                        : RegionDiscoveryOutcomes.CONFIGURED_NOT_DETECTED;
+        const userConfiguredAzureRegion = this.authorityOptions.azureRegionConfiguration?.azureRegion;
+        if (userConfiguredAzureRegion) {
+            if (userConfiguredAzureRegion !== Constants.AZURE_REGION_AUTO_DISCOVER_FLAG) {
+                this.regionDiscoveryMetadata.region_outcome = RegionDiscoveryOutcomes.CONFIGURED_NO_AUTO_DETECTION;
+                this.regionDiscoveryMetadata.region_used = userConfiguredAzureRegion;
+                return Authority.replaceWithRegionalInformation(metadata, userConfiguredAzureRegion);
             }
-            else {
-                this.regionDiscoveryMetadata.region_outcome =
-                    RegionDiscoveryOutcomes.CONFIGURED_NO_AUTO_DETECTION;
+            this.performanceClient?.setPreQueueTime(PerformanceEvents.RegionDiscoveryDetectRegion, this.correlationId);
+            const autodetectedRegionName = await this.regionDiscovery.detectRegion(this.authorityOptions.azureRegionConfiguration?.environmentRegion, this.regionDiscoveryMetadata);
+            if (autodetectedRegionName) {
+                this.regionDiscoveryMetadata.region_outcome = RegionDiscoveryOutcomes.AUTO_DETECTION_REQUESTED_SUCCESSFUL;
+                this.regionDiscoveryMetadata.region_used = autodetectedRegionName;
+                return Authority.replaceWithRegionalInformation(metadata, autodetectedRegionName);
             }
-        }
-        if (azureRegion) {
-            this.regionDiscoveryMetadata.region_used = azureRegion;
-            return Authority.replaceWithRegionalInformation(metadata, azureRegion);
+            this.regionDiscoveryMetadata.region_outcome = RegionDiscoveryOutcomes.AUTO_DETECTION_REQUESTED_FAILED;
         }
         return metadata;
     }