@azure/msal-common 14.6.1 → 14.6.2-alpha.1

package/dist/index.cjs

@@ -1,4 +1,4 @@
-/*! @azure/msal-common v14.6.1 2024-01-23 */
+/*! @azure/msal-common v14.6.2-alpha.1 2024-01-30 */
 'use strict';
 'use strict';
 
@@ -943,7 +943,7 @@ class Logger {
 
 /* eslint-disable header/header */
 const name = "@azure/msal-common";
-const version = "14.6.1";
+const version = "14.6.2-alpha.1";
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1035,47 +1035,53 @@ var AuthToken = /*#__PURE__*/Object.freeze({
  * Licensed under the MIT License.
  */
 /**
- * Utility class which exposes functions for managing date and time operations.
+ * Utility functions for managing date and time operations.
  */
-class TimeUtils {
-    /**
-     * return the current time in Unix time (seconds).
-     */
-    static nowSeconds() {
-        // Date.getTime() returns in milliseconds.
-        return Math.round(new Date().getTime() / 1000.0);
-    }
-    /**
-     * check if a token is expired based on given UTC time in seconds.
-     * @param expiresOn
-     */
-    static isTokenExpired(expiresOn, offset) {
-        // check for access token expiry
-        const expirationSec = Number(expiresOn) || 0;
-        const offsetCurrentTimeSec = TimeUtils.nowSeconds() + offset;
-        // If current time + offset is greater than token expiration time, then token is expired.
-        return offsetCurrentTimeSec > expirationSec;
-    }
-    /**
-     * If the current time is earlier than the time that a token was cached at, we must discard the token
-     * i.e. The system clock was turned back after acquiring the cached token
-     * @param cachedAt
-     * @param offset
-     */
-    static wasClockTurnedBack(cachedAt) {
-        const cachedAtSec = Number(cachedAt);
-        return cachedAtSec > TimeUtils.nowSeconds();
-    }
-    /**
-     * Waits for t number of milliseconds
-     * @param t number
-     * @param value T
-     */
-    static delay(t, value) {
-        return new Promise((resolve) => setTimeout(() => resolve(value), t));
-    }
+/**
+ * return the current time in Unix time (seconds).
+ */
+function nowSeconds() {
+    // Date.getTime() returns in milliseconds.
+    return Math.round(new Date().getTime() / 1000.0);
+}
+/**
+ * check if a token is expired based on given UTC time in seconds.
+ * @param expiresOn
+ */
+function isTokenExpired(expiresOn, offset) {
+    // check for access token expiry
+    const expirationSec = Number(expiresOn) || 0;
+    const offsetCurrentTimeSec = nowSeconds() + offset;
+    // If current time + offset is greater than token expiration time, then token is expired.
+    return offsetCurrentTimeSec > expirationSec;
+}
+/**
+ * If the current time is earlier than the time that a token was cached at, we must discard the token
+ * i.e. The system clock was turned back after acquiring the cached token
+ * @param cachedAt
+ * @param offset
+ */
+function wasClockTurnedBack(cachedAt) {
+    const cachedAtSec = Number(cachedAt);
+    return cachedAtSec > nowSeconds();
+}
+/**
+ * Waits for t number of milliseconds
+ * @param t number
+ * @param value T
+ */
+function delay(t, value) {
+    return new Promise((resolve) => setTimeout(() => resolve(value), t));
 }
 
+var TimeUtils = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    delay: delay,
+    isTokenExpired: isTokenExpired,
+    nowSeconds: nowSeconds,
+    wasClockTurnedBack: wasClockTurnedBack
+});
+
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -1132,7 +1138,7 @@ function createAccessTokenEntity(homeAccountId, environment, accessToken, client
         homeAccountId: homeAccountId,
         credentialType: CredentialType.ACCESS_TOKEN,
         secret: accessToken,
-        cachedAt: TimeUtils.nowSeconds().toString(),
+        cachedAt: nowSeconds().toString(),
         expiresOn: expiresOn.toString(),
         extendedExpiresOn: extExpiresOn.toString(),
         environment: environment,
@@ -1376,7 +1382,7 @@ function isAuthorityMetadataEntity(key, entity) {
  * Reset the exiresAt value
  */
 function generateAuthorityMetadataExpiresAt() {
-    return (TimeUtils.nowSeconds() +
+    return (nowSeconds() +
         AUTHORITY_METADATA_CONSTANTS.REFRESH_TIME_SECONDS);
 }
 function updateAuthorityEndpointMetadata(authorityMetadata, updatedValues, fromNetwork) {
@@ -1398,7 +1404,7 @@ function updateCloudDiscoveryMetadata(authorityMetadata, updatedValues, fromNetw
  * Returns whether or not the data needs to be refreshed
  */
 function isAuthorityMetadataExpired(metadata) {
-    return metadata.expiresAt <= TimeUtils.nowSeconds();
+    return metadata.expiresAt <= nowSeconds();
 }
 
 var CacheHelpers = /*#__PURE__*/Object.freeze({
@@ -5017,6 +5023,11 @@ const invoke = (callback, eventName, logger, telemetryClient, correlationId) =>
     return (...args) => {
         logger.trace(`Executing function ${eventName}`);
         const inProgressEvent = telemetryClient?.startMeasurement(eventName, correlationId);
+        if (correlationId) {
+            // Track number of times this API is called in a single request
+            const eventCount = eventName + "CallCount";
+            telemetryClient?.incrementFields({ [eventCount]: 1 }, correlationId);
+        }
         try {
             const result = callback(...args);
             inProgressEvent?.end({
@@ -5057,6 +5068,11 @@ const invokeAsync = (callback, eventName, logger, telemetryClient, correlationId
     return (...args) => {
         logger.trace(`Executing function ${eventName}`);
         const inProgressEvent = telemetryClient?.startMeasurement(eventName, correlationId);
+        if (correlationId) {
+            // Track number of times this API is called in a single request
+            const eventCount = eventName + "CallCount";
+            telemetryClient?.incrementFields({ [eventCount]: 1 }, correlationId);
+        }
         telemetryClient?.setPreQueueTime(eventName, correlationId);
         return callback(...args)
             .then((response) => {
@@ -6419,7 +6435,7 @@ class PopTokenGenerator {
         const resourceUrlComponents = resourceUrlString?.getUrlComponents();
         return this.cryptoUtils.signJwt({
             at: payload,
-            ts: TimeUtils.nowSeconds(),
+            ts: nowSeconds(),
             m: resourceRequestMethod?.toUpperCase(),
             u: resourceUrlComponents?.HostNameAndPort,
             nonce: shrNonce || this.cryptoUtils.createNewGuid(),
@@ -6670,7 +6686,7 @@ class ResponseHandler {
                 ? reqTimestamp + refreshIn
                 : undefined;
             // non AAD scenarios can have empty realm
-            cachedAccessToken = createAccessTokenEntity(this.homeAccountIdentifier, env, serverTokenResponse.access_token, this.clientId, claimsTenantId || authority.tenant, responseScopes.printScopes(), tokenExpirationSeconds, extendedTokenExpirationSeconds, this.cryptoObj.base64Decode, refreshOnSeconds, serverTokenResponse.token_type, userAssertionHash, serverTokenResponse.key_id, request.claims, request.requestedClaimsHash);
+            cachedAccessToken = createAccessTokenEntity(this.homeAccountIdentifier, env, serverTokenResponse.access_token, this.clientId, claimsTenantId || authority.tenant || "", responseScopes.printScopes(), tokenExpirationSeconds, extendedTokenExpirationSeconds, this.cryptoObj.base64Decode, refreshOnSeconds, serverTokenResponse.token_type, userAssertionHash, serverTokenResponse.key_id, request.claims, request.requestedClaimsHash);
         }
         // refreshToken
         let cachedRefreshToken = null;
@@ -6851,7 +6867,7 @@ class AuthorizationCodeClient extends BaseClient {
         if (!request.code) {
             throw createClientAuthError(requestCannotBeMade);
         }
-        const reqTimestamp = TimeUtils.nowSeconds();
+        const reqTimestamp = nowSeconds();
         const response = await invokeAsync(this.executeTokenRequest.bind(this), PerformanceEvents.AuthClientExecuteTokenRequest, this.logger, this.performanceClient, request.correlationId)(this.authority, request);
         // Retrieve requestId from response headers
         const requestId = response.headers?.[HeaderNames.X_MS_REQUEST_ID];
@@ -7228,7 +7244,7 @@ class RefreshTokenClient extends BaseClient {
     }
     async acquireToken(request) {
         this.performanceClient?.addQueueMeasurement(PerformanceEvents.RefreshTokenClientAcquireToken, request.correlationId);
-        const reqTimestamp = TimeUtils.nowSeconds();
+        const reqTimestamp = nowSeconds();
         const response = await invokeAsync(this.executeTokenRequest.bind(this), PerformanceEvents.RefreshTokenClientExecuteTokenRequest, this.logger, this.performanceClient, request.correlationId)(request, this.authority);
         // Retrieve requestId from response headers
         const requestId = response.headers?.[HeaderNames.X_MS_REQUEST_ID];
@@ -7289,7 +7305,7 @@ class RefreshTokenClient extends BaseClient {
             throw createInteractionRequiredAuthError(noTokensFound);
         }
         if (refreshToken.expiresOn &&
-            TimeUtils.isTokenExpired(refreshToken.expiresOn, request.refreshTokenExpirationOffsetSeconds ||
+            isTokenExpired(refreshToken.expiresOn, request.refreshTokenExpirationOffsetSeconds ||
                 DEFAULT_REFRESH_TOKEN_EXPIRATION_OFFSET_SECONDS)) {
             throw createInteractionRequiredAuthError(refreshTokenExpired);
         }
@@ -7487,14 +7503,14 @@ class SilentFlowClient extends BaseClient {
             this.setCacheOutcome(CacheOutcome.NO_CACHED_ACCESS_TOKEN, request.correlationId);
             throw createClientAuthError(tokenRefreshRequired);
         }
-        else if (TimeUtils.wasClockTurnedBack(cachedAccessToken.cachedAt) ||
-            TimeUtils.isTokenExpired(cachedAccessToken.expiresOn, this.config.systemOptions.tokenRenewalOffsetSeconds)) {
+        else if (wasClockTurnedBack(cachedAccessToken.cachedAt) ||
+            isTokenExpired(cachedAccessToken.expiresOn, this.config.systemOptions.tokenRenewalOffsetSeconds)) {
             // must refresh due to the expires_in value
             this.setCacheOutcome(CacheOutcome.CACHED_ACCESS_TOKEN_EXPIRED, request.correlationId);
             throw createClientAuthError(tokenRefreshRequired);
         }
         else if (cachedAccessToken.refreshOn &&
-            TimeUtils.isTokenExpired(cachedAccessToken.refreshOn, 0)) {
+            isTokenExpired(cachedAccessToken.refreshOn, 0)) {
             // must refresh (in the background) due to the refresh_in value
             lastCacheOutcome = CacheOutcome.PROACTIVELY_REFRESHED;
             // don't throw ClientAuthError.createRefreshRequiredError(), return cached token instead