@azure/msal-common 9.0.2 → 9.1.1

package/dist/index.cjs.js

@@ -1,4 +1,4 @@
-/*! @azure/msal-common v9.0.2 2023-01-09 */
+/*! @azure/msal-common v9.1.1 2023-01-19 */
 'use strict';
 'use strict';
 
@@ -1422,7 +1422,7 @@ var Logger = /** @class */ (function () {
 
 /* eslint-disable header/header */
 var name = "@azure/msal-common";
-var version = "9.0.2";
+var version = "9.1.1";
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1521,12 +1521,12 @@ var CredentialEntity = /** @class */ (function () {
     CredentialEntity.getCredentialType = function (key) {
         var separator = Separators.CACHE_KEY_SEPARATOR;
         // Match host names like "login.microsoftonline.com", "https://accounts.google.com:4000", etc.
-        var domainRe = "(https?:\\/\\/)?([\\w-]+\\.)*([\\w-]{1,63})(\\.(\\w{2,3}))(\\:[0-9]{4,5})?";
+        var domainRe = "(https?:\\/\\/)?([\\w-]+\\.)*([\\w-]{1,63})(\\.(\\w{2,63}))(\\:[0-9]{4,5})?";
         for (var _i = 0, _a = Object.keys(exports.CredentialType); _i < _a.length; _i++) {
             var credKey = _a[_i];
             var credVal = exports.CredentialType[credKey].toLowerCase();
             // Verify credential type is preceded by a valid host name (environment)
-            if (key.toLowerCase().search("(?<=" + separator + domainRe + ")" + separator + credVal + separator) !== -1) {
+            if (key.toLowerCase().search("" + separator + domainRe + separator + credVal + separator) !== -1) {
                 return exports.CredentialType[credKey];
             }
         }
@@ -6014,6 +6014,7 @@ exports.PerformanceEvents = void 0;
      * Time taken for acquiring cached refresh token
      */
     PerformanceEvents["RefreshTokenClientAcquireTokenWithCachedRefreshToken"] = "refreshTokenClientAcquireTokenWithCachedRefreshToken";
+    PerformanceEvents["AcquireTokenByCodeAsync"] = "acquireTokenByCodeAsync";
     PerformanceEvents["GetEndpointMetadataFromNetwork"] = "getEndpointMetadataFromNetwork";
     PerformanceEvents["GetCloudDiscoveryMetadataFromNetworkMeasurement"] = "getCloudDiscoveryMetadataFromNetworkMeasurement";
     PerformanceEvents["HandleRedirectPromiseMeasurement"] = "handleRedirectPromiseMeasurement";
@@ -6715,6 +6716,9 @@ var OnBehalfOfClient = /** @class */ (function (_super) {
             parameterBuilder.addClientAssertion(clientAssertion.assertion);
             parameterBuilder.addClientAssertionType(clientAssertion.assertionType);
         }
+        if (request.claims || (this.config.authOptions.clientCapabilities && this.config.authOptions.clientCapabilities.length > 0)) {
+            parameterBuilder.addClaims(request.claims, this.config.authOptions.clientCapabilities);
+        }
         return parameterBuilder.createQueryString();
     };
     return OnBehalfOfClient;
@@ -8374,7 +8378,32 @@ var PerformanceClient = /** @class */ (function () {
         this.eventsByCorrelationId = new Map();
         this.staticFieldsByCorrelationId = new Map();
         this.measurementsById = new Map();
+        this.countersByCorrelationId = new Map();
     }
+    /**
+     * Starts and returns an platform-specific implementation of IPerformanceMeasurement.
+     * Note: this function can be changed to abstract at the next major version bump.
+     *
+     * @param {string} measureName
+     * @param {string} correlationId
+     * @returns {IPerformanceMeasurement}
+     */
+    /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
+    PerformanceClient.prototype.startPerformanceMeasurement = function (measureName, correlationId) {
+        return {};
+    };
+    /**
+     * Starts and returns an platform-specific implementation of IPerformanceMeasurement.
+     * Note: this incorrectly-named function will be removed at the next major version bump.
+     *
+     * @param {string} measureName
+     * @param {string} correlationId
+     * @returns {IPerformanceMeasurement}
+     */
+    /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
+    PerformanceClient.prototype.startPerformanceMeasuremeant = function (measureName, correlationId) {
+        return {};
+    };
     /**
      * Starts measuring performance for a given operation. Returns a function that should be used to end the measurement.
      *
@@ -8390,9 +8419,19 @@ var PerformanceClient = /** @class */ (function () {
         if (!correlationId) {
             this.logger.info("PerformanceClient: No correlation id provided for " + measureName + ", generating", eventCorrelationId);
         }
+        // Duplicate code to address spelling error will be removed at the next major version bump.
         this.logger.trace("PerformanceClient: Performance measurement started for " + measureName, eventCorrelationId);
-        var performanceMeasurement = this.startPerformanceMeasurement(measureName, eventCorrelationId);
-        performanceMeasurement.startMeasurement();
+        var validMeasurement;
+        var performanceMeasuremeant = this.startPerformanceMeasuremeant(measureName, eventCorrelationId);
+        if (performanceMeasuremeant.startMeasurement) {
+            performanceMeasuremeant.startMeasurement();
+            validMeasurement = performanceMeasuremeant;
+        }
+        else {
+            var performanceMeasurement = this.startPerformanceMeasurement(measureName, eventCorrelationId);
+            performanceMeasurement.startMeasurement();
+            validMeasurement = performanceMeasurement;
+        }
         var inProgressEvent = {
             eventId: this.generateId(),
             status: exports.PerformanceEventStatus.InProgress,
@@ -8411,7 +8450,7 @@ var PerformanceClient = /** @class */ (function () {
             appVersion: (_b = this.applicationTelemetry) === null || _b === void 0 ? void 0 : _b.appVersion,
         };
         this.addStaticFields(staticFields, eventCorrelationId);
-        this.cacheMeasurement(inProgressEvent, performanceMeasurement);
+        this.cacheMeasurement(inProgressEvent, validMeasurement);
         // Return the event and functions the caller can use to properly end/flush the measurement
         return {
             endMeasurement: function (event) {
@@ -8431,7 +8470,10 @@ var PerformanceClient = /** @class */ (function () {
             addStaticFields: function (fields) {
                 return _this.addStaticFields(fields, inProgressEvent.correlationId);
             },
-            measurement: performanceMeasurement,
+            increment: function (counters) {
+                return _this.increment(counters, inProgressEvent.correlationId);
+            },
+            measurement: validMeasurement,
             event: inProgressEvent
         };
     };
@@ -8482,6 +8524,26 @@ var PerformanceClient = /** @class */ (function () {
             this.staticFieldsByCorrelationId.set(correlationId, fields);
         }
     };
+    /**
+     * Increment counters to be emitted when the measurements are flushed
+     * @param counters {Counters}
+     * @param correlationId {string} correlation identifier
+     */
+    PerformanceClient.prototype.increment = function (counters, correlationId) {
+        var existing = this.countersByCorrelationId.get(correlationId);
+        if (!existing) {
+            this.logger.trace("PerformanceClient: Setting counters");
+            this.countersByCorrelationId.set(correlationId, __assign({}, counters));
+            return;
+        }
+        this.logger.trace("PerformanceClient: Updating counters");
+        for (var counter in counters) {
+            if (!existing.hasOwnProperty(counter)) {
+                existing[counter] = 0;
+            }
+            existing[counter] += counters[counter];
+        }
+    };
     /**
      * Upserts event into event cache.
      * First key is the correlation id, second key is the event id.
@@ -8522,8 +8584,10 @@ var PerformanceClient = /** @class */ (function () {
         var _this = this;
         this.logger.trace("PerformanceClient: Performance measurements flushed for " + measureName, correlationId);
         var eventsForCorrelationId = this.eventsByCorrelationId.get(correlationId);
+        var staticFields = this.staticFieldsByCorrelationId.get(correlationId);
+        var counters = this.countersByCorrelationId.get(correlationId);
         if (eventsForCorrelationId) {
-            this.discardMeasurements(correlationId);
+            this.discardCache(correlationId);
             /*
              * Manually end incomplete submeasurements to ensure there arent orphaned/never ending events.
              * Incomplete submeasurements are likely an instrumentation bug that should be fixed.
@@ -8574,8 +8638,7 @@ var PerformanceClient = /** @class */ (function () {
                     }
                     return previous;
                 }, topLevelEvent);
-                var staticFields = this.staticFieldsByCorrelationId.get(correlationId);
-                var finalEvent = __assign(__assign({}, eventToEmit), staticFields);
+                var finalEvent = __assign(__assign(__assign({}, eventToEmit), staticFields), counters);
                 this.emitEvents([finalEvent], eventToEmit.correlationId);
             }
             else {
@@ -8595,6 +8658,18 @@ var PerformanceClient = /** @class */ (function () {
         this.logger.trace("PerformanceClient: Performance measurements discarded", correlationId);
         this.eventsByCorrelationId.delete(correlationId);
     };
+    /**
+     * Removes cache for a given correlation id.
+     *
+     * @param {string} correlation identifier
+     */
+    PerformanceClient.prototype.discardCache = function (correlationId) {
+        this.discardMeasurements(correlationId);
+        this.logger.trace("PerformanceClient: Static fields discarded", correlationId);
+        this.staticFieldsByCorrelationId.delete(correlationId);
+        this.logger.trace("PerformanceClient: Counters discarded", correlationId);
+        this.countersByCorrelationId.delete(correlationId);
+    };
     /**
      * Registers a callback function to receive performance events.
      *
@@ -8664,6 +8739,9 @@ var StubPerformanceClient = /** @class */ (function (_super) {
     StubPerformanceClient.prototype.generateId = function () {
         return "callback-id";
     };
+    StubPerformanceClient.prototype.startPerformanceMeasuremeant = function () {
+        return new StubPerformanceMeasurement();
+    };
     StubPerformanceClient.prototype.startPerformanceMeasurement = function () {
         return new StubPerformanceMeasurement();
     };