@azure/msal-common 14.6.0 → 14.6.2-alpha.0

package/dist/index.cjs

@@ -1,4 +1,4 @@
-/*! @azure/msal-common v14.6.0 2024-01-09 */
+/*! @azure/msal-common v14.6.2-alpha.0 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.0";
+const version = "14.6.2-alpha.0";
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1035,46 +1035,52 @@ 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.
@@ -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({
@@ -2514,496 +2520,30 @@ class UrlString {
  */
 const rawMetdataJSON = {
     endpointMetadata: {
-        "https://login.microsoftonline.com/common/": {
-            token_endpoint: "https://login.microsoftonline.com/common/oauth2/v2.0/token",
-            token_endpoint_auth_methods_supported: [
-                "client_secret_post",
-                "private_key_jwt",
-                "client_secret_basic",
-            ],
-            jwks_uri: "https://login.microsoftonline.com/common/discovery/v2.0/keys",
-            response_modes_supported: ["query", "fragment", "form_post"],
-            subject_types_supported: ["pairwise"],
-            id_token_signing_alg_values_supported: ["RS256"],
-            response_types_supported: [
-                "code",
-                "id_token",
-                "code id_token",
-                "id_token token",
-            ],
-            scopes_supported: ["openid", "profile", "email", "offline_access"],
-            issuer: "https://login.microsoftonline.com/{tenantid}/v2.0",
-            request_uri_parameter_supported: false,
-            userinfo_endpoint: "https://graph.microsoft.com/oidc/userinfo",
-            authorization_endpoint: "https://login.microsoftonline.com/common/oauth2/v2.0/authorize",
-            device_authorization_endpoint: "https://login.microsoftonline.com/common/oauth2/v2.0/devicecode",
-            http_logout_supported: true,
-            frontchannel_logout_supported: true,
-            end_session_endpoint: "https://login.microsoftonline.com/common/oauth2/v2.0/logout",
-            claims_supported: [
-                "sub",
-                "iss",
-                "cloud_instance_name",
-                "cloud_instance_host_name",
-                "cloud_graph_host_name",
-                "msgraph_host",
-                "aud",
-                "exp",
-                "iat",
-                "auth_time",
-                "acr",
-                "nonce",
-                "preferred_username",
-                "name",
-                "tid",
-                "ver",
-                "at_hash",
-                "c_hash",
-                "email",
-            ],
-            kerberos_endpoint: "https://login.microsoftonline.com/common/kerberos",
-            tenant_region_scope: null,
-            cloud_instance_name: "microsoftonline.com",
-            cloud_graph_host_name: "graph.windows.net",
-            msgraph_host: "graph.microsoft.com",
-            rbac_url: "https://pas.windows.net",
-        },
-        "https://login.chinacloudapi.cn/common/": {
-            token_endpoint: "https://login.chinacloudapi.cn/common/oauth2/v2.0/token",
-            token_endpoint_auth_methods_supported: [
-                "client_secret_post",
-                "private_key_jwt",
-                "client_secret_basic",
-            ],
-            jwks_uri: "https://login.chinacloudapi.cn/common/discovery/v2.0/keys",
-            response_modes_supported: ["query", "fragment", "form_post"],
-            subject_types_supported: ["pairwise"],
-            id_token_signing_alg_values_supported: ["RS256"],
-            response_types_supported: [
-                "code",
-                "id_token",
-                "code id_token",
-                "id_token token",
-            ],
-            scopes_supported: ["openid", "profile", "email", "offline_access"],
-            issuer: "https://login.partner.microsoftonline.cn/{tenantid}/v2.0",
-            request_uri_parameter_supported: false,
-            userinfo_endpoint: "https://microsoftgraph.chinacloudapi.cn/oidc/userinfo",
-            authorization_endpoint: "https://login.chinacloudapi.cn/common/oauth2/v2.0/authorize",
-            device_authorization_endpoint: "https://login.chinacloudapi.cn/common/oauth2/v2.0/devicecode",
-            http_logout_supported: true,
-            frontchannel_logout_supported: true,
-            end_session_endpoint: "https://login.chinacloudapi.cn/common/oauth2/v2.0/logout",
-            claims_supported: [
-                "sub",
-                "iss",
-                "cloud_instance_name",
-                "cloud_instance_host_name",
-                "cloud_graph_host_name",
-                "msgraph_host",
-                "aud",
-                "exp",
-                "iat",
-                "auth_time",
-                "acr",
-                "nonce",
-                "preferred_username",
-                "name",
-                "tid",
-                "ver",
-                "at_hash",
-                "c_hash",
-                "email",
-            ],
-            kerberos_endpoint: "https://login.chinacloudapi.cn/common/kerberos",
-            tenant_region_scope: null,
-            cloud_instance_name: "partner.microsoftonline.cn",
-            cloud_graph_host_name: "graph.chinacloudapi.cn",
-            msgraph_host: "microsoftgraph.chinacloudapi.cn",
-            rbac_url: "https://pas.chinacloudapi.cn",
-        },
-        "https://login.microsoftonline.us/common/": {
-            token_endpoint: "https://login.microsoftonline.us/common/oauth2/v2.0/token",
-            token_endpoint_auth_methods_supported: [
-                "client_secret_post",
-                "private_key_jwt",
-                "client_secret_basic",
-            ],
-            jwks_uri: "https://login.microsoftonline.us/common/discovery/v2.0/keys",
-            response_modes_supported: ["query", "fragment", "form_post"],
-            subject_types_supported: ["pairwise"],
-            id_token_signing_alg_values_supported: ["RS256"],
-            response_types_supported: [
-                "code",
-                "id_token",
-                "code id_token",
-                "id_token token",
-            ],
-            scopes_supported: ["openid", "profile", "email", "offline_access"],
-            issuer: "https://login.microsoftonline.us/{tenantid}/v2.0",
-            request_uri_parameter_supported: false,
-            userinfo_endpoint: "https://graph.microsoft.com/oidc/userinfo",
-            authorization_endpoint: "https://login.microsoftonline.us/common/oauth2/v2.0/authorize",
-            device_authorization_endpoint: "https://login.microsoftonline.us/common/oauth2/v2.0/devicecode",
-            http_logout_supported: true,
-            frontchannel_logout_supported: true,
-            end_session_endpoint: "https://login.microsoftonline.us/common/oauth2/v2.0/logout",
-            claims_supported: [
-                "sub",
-                "iss",
-                "cloud_instance_name",
-                "cloud_instance_host_name",
-                "cloud_graph_host_name",
-                "msgraph_host",
-                "aud",
-                "exp",
-                "iat",
-                "auth_time",
-                "acr",
-                "nonce",
-                "preferred_username",
-                "name",
-                "tid",
-                "ver",
-                "at_hash",
-                "c_hash",
-                "email",
-            ],
-            kerberos_endpoint: "https://login.microsoftonline.us/common/kerberos",
-            tenant_region_scope: null,
-            cloud_instance_name: "microsoftonline.us",
-            cloud_graph_host_name: "graph.windows.net",
-            msgraph_host: "graph.microsoft.com",
-            rbac_url: "https://pasff.usgovcloudapi.net",
-        },
-        "https://login.microsoftonline.com/consumers/": {
-            token_endpoint: "https://login.microsoftonline.com/consumers/oauth2/v2.0/token",
-            token_endpoint_auth_methods_supported: [
-                "client_secret_post",
-                "private_key_jwt",
-                "client_secret_basic",
-            ],
-            jwks_uri: "https://login.microsoftonline.com/consumers/discovery/v2.0/keys",
-            response_modes_supported: ["query", "fragment", "form_post"],
-            subject_types_supported: ["pairwise"],
-            id_token_signing_alg_values_supported: ["RS256"],
-            response_types_supported: [
-                "code",
-                "id_token",
-                "code id_token",
-                "id_token token",
-            ],
-            scopes_supported: ["openid", "profile", "email", "offline_access"],
-            issuer: "https://login.microsoftonline.com/9188040d-6c67-4c5b-b112-36a304b66dad/v2.0",
-            request_uri_parameter_supported: false,
-            userinfo_endpoint: "https://graph.microsoft.com/oidc/userinfo",
-            authorization_endpoint: "https://login.microsoftonline.com/consumers/oauth2/v2.0/authorize",
-            device_authorization_endpoint: "https://login.microsoftonline.com/consumers/oauth2/v2.0/devicecode",
-            http_logout_supported: true,
-            frontchannel_logout_supported: true,
-            end_session_endpoint: "https://login.microsoftonline.com/consumers/oauth2/v2.0/logout",
-            claims_supported: [
-                "sub",
-                "iss",
-                "cloud_instance_name",
-                "cloud_instance_host_name",
-                "cloud_graph_host_name",
-                "msgraph_host",
-                "aud",
-                "exp",
-                "iat",
-                "auth_time",
-                "acr",
-                "nonce",
-                "preferred_username",
-                "name",
-                "tid",
-                "ver",
-                "at_hash",
-                "c_hash",
-                "email",
-            ],
-            kerberos_endpoint: "https://login.microsoftonline.com/consumers/kerberos",
-            tenant_region_scope: null,
-            cloud_instance_name: "microsoftonline.com",
-            cloud_graph_host_name: "graph.windows.net",
-            msgraph_host: "graph.microsoft.com",
-            rbac_url: "https://pas.windows.net",
-        },
-        "https://login.chinacloudapi.cn/consumers/": {
-            token_endpoint: "https://login.chinacloudapi.cn/consumers/oauth2/v2.0/token",
-            token_endpoint_auth_methods_supported: [
-                "client_secret_post",
-                "private_key_jwt",
-                "client_secret_basic",
-            ],
-            jwks_uri: "https://login.chinacloudapi.cn/consumers/discovery/v2.0/keys",
-            response_modes_supported: ["query", "fragment", "form_post"],
-            subject_types_supported: ["pairwise"],
-            id_token_signing_alg_values_supported: ["RS256"],
-            response_types_supported: [
-                "code",
-                "id_token",
-                "code id_token",
-                "id_token token",
-            ],
-            scopes_supported: ["openid", "profile", "email", "offline_access"],
-            issuer: "https://login.partner.microsoftonline.cn/9188040d-6c67-4c5b-b112-36a304b66dad/v2.0",
-            request_uri_parameter_supported: false,
-            userinfo_endpoint: "https://microsoftgraph.chinacloudapi.cn/oidc/userinfo",
-            authorization_endpoint: "https://login.chinacloudapi.cn/consumers/oauth2/v2.0/authorize",
-            device_authorization_endpoint: "https://login.chinacloudapi.cn/consumers/oauth2/v2.0/devicecode",
-            http_logout_supported: true,
-            frontchannel_logout_supported: true,
-            end_session_endpoint: "https://login.chinacloudapi.cn/consumers/oauth2/v2.0/logout",
-            claims_supported: [
-                "sub",
-                "iss",
-                "cloud_instance_name",
-                "cloud_instance_host_name",
-                "cloud_graph_host_name",
-                "msgraph_host",
-                "aud",
-                "exp",
-                "iat",
-                "auth_time",
-                "acr",
-                "nonce",
-                "preferred_username",
-                "name",
-                "tid",
-                "ver",
-                "at_hash",
-                "c_hash",
-                "email",
-            ],
-            kerberos_endpoint: "https://login.chinacloudapi.cn/consumers/kerberos",
-            tenant_region_scope: null,
-            cloud_instance_name: "partner.microsoftonline.cn",
-            cloud_graph_host_name: "graph.chinacloudapi.cn",
-            msgraph_host: "microsoftgraph.chinacloudapi.cn",
-            rbac_url: "https://pas.chinacloudapi.cn",
-        },
-        "https://login.microsoftonline.us/consumers/": {
-            token_endpoint: "https://login.microsoftonline.us/consumers/oauth2/v2.0/token",
-            token_endpoint_auth_methods_supported: [
-                "client_secret_post",
-                "private_key_jwt",
-                "client_secret_basic",
-            ],
-            jwks_uri: "https://login.microsoftonline.us/consumers/discovery/v2.0/keys",
-            response_modes_supported: ["query", "fragment", "form_post"],
-            subject_types_supported: ["pairwise"],
-            id_token_signing_alg_values_supported: ["RS256"],
-            response_types_supported: [
-                "code",
-                "id_token",
-                "code id_token",
-                "id_token token",
-            ],
-            scopes_supported: ["openid", "profile", "email", "offline_access"],
-            issuer: "https://login.microsoftonline.us/9188040d-6c67-4c5b-b112-36a304b66dad/v2.0",
-            request_uri_parameter_supported: false,
-            userinfo_endpoint: "https://graph.microsoft.com/oidc/userinfo",
-            authorization_endpoint: "https://login.microsoftonline.us/consumers/oauth2/v2.0/authorize",
-            device_authorization_endpoint: "https://login.microsoftonline.us/consumers/oauth2/v2.0/devicecode",
-            http_logout_supported: true,
-            frontchannel_logout_supported: true,
-            end_session_endpoint: "https://login.microsoftonline.us/consumers/oauth2/v2.0/logout",
-            claims_supported: [
-                "sub",
-                "iss",
-                "cloud_instance_name",
-                "cloud_instance_host_name",
-                "cloud_graph_host_name",
-                "msgraph_host",
-                "aud",
-                "exp",
-                "iat",
-                "auth_time",
-                "acr",
-                "nonce",
-                "preferred_username",
-                "name",
-                "tid",
-                "ver",
-                "at_hash",
-                "c_hash",
-                "email",
-            ],
-            kerberos_endpoint: "https://login.microsoftonline.us/consumers/kerberos",
-            tenant_region_scope: null,
-            cloud_instance_name: "microsoftonline.us",
-            cloud_graph_host_name: "graph.windows.net",
-            msgraph_host: "graph.microsoft.com",
-            rbac_url: "https://pasff.usgovcloudapi.net",
-        },
-        "https://login.microsoftonline.com/organizations/": {
-            token_endpoint: "https://login.microsoftonline.com/organizations/oauth2/v2.0/token",
-            token_endpoint_auth_methods_supported: [
-                "client_secret_post",
-                "private_key_jwt",
-                "client_secret_basic",
-            ],
-            jwks_uri: "https://login.microsoftonline.com/organizations/discovery/v2.0/keys",
-            response_modes_supported: ["query", "fragment", "form_post"],
-            subject_types_supported: ["pairwise"],
-            id_token_signing_alg_values_supported: ["RS256"],
-            response_types_supported: [
-                "code",
-                "id_token",
-                "code id_token",
-                "id_token token",
-            ],
-            scopes_supported: ["openid", "profile", "email", "offline_access"],
+        "login.microsoftonline.com": {
+            token_endpoint: "https://login.microsoftonline.com/{tenantid}/oauth2/v2.0/token",
+            jwks_uri: "https://login.microsoftonline.com/{tenantid}/discovery/v2.0/keys",
             issuer: "https://login.microsoftonline.com/{tenantid}/v2.0",
-            request_uri_parameter_supported: false,
-            userinfo_endpoint: "https://graph.microsoft.com/oidc/userinfo",
-            authorization_endpoint: "https://login.microsoftonline.com/organizations/oauth2/v2.0/authorize",
-            device_authorization_endpoint: "https://login.microsoftonline.com/organizations/oauth2/v2.0/devicecode",
-            http_logout_supported: true,
-            frontchannel_logout_supported: true,
-            end_session_endpoint: "https://login.microsoftonline.com/organizations/oauth2/v2.0/logout",
-            claims_supported: [
-                "sub",
-                "iss",
-                "cloud_instance_name",
-                "cloud_instance_host_name",
-                "cloud_graph_host_name",
-                "msgraph_host",
-                "aud",
-                "exp",
-                "iat",
-                "auth_time",
-                "acr",
-                "nonce",
-                "preferred_username",
-                "name",
-                "tid",
-                "ver",
-                "at_hash",
-                "c_hash",
-                "email",
-            ],
-            kerberos_endpoint: "https://login.microsoftonline.com/organizations/kerberos",
-            tenant_region_scope: null,
-            cloud_instance_name: "microsoftonline.com",
-            cloud_graph_host_name: "graph.windows.net",
-            msgraph_host: "graph.microsoft.com",
-            rbac_url: "https://pas.windows.net",
+            authorization_endpoint: "https://login.microsoftonline.com/{tenantid}/oauth2/v2.0/authorize",
+            end_session_endpoint: "https://login.microsoftonline.com/{tenantid}/oauth2/v2.0/logout",
         },
-        "https://login.chinacloudapi.cn/organizations/": {
-            token_endpoint: "https://login.chinacloudapi.cn/organizations/oauth2/v2.0/token",
-            token_endpoint_auth_methods_supported: [
-                "client_secret_post",
-                "private_key_jwt",
-                "client_secret_basic",
-            ],
-            jwks_uri: "https://login.chinacloudapi.cn/organizations/discovery/v2.0/keys",
-            response_modes_supported: ["query", "fragment", "form_post"],
-            subject_types_supported: ["pairwise"],
-            id_token_signing_alg_values_supported: ["RS256"],
-            response_types_supported: [
-                "code",
-                "id_token",
-                "code id_token",
-                "id_token token",
-            ],
-            scopes_supported: ["openid", "profile", "email", "offline_access"],
+        "login.chinacloudapi.cn": {
+            token_endpoint: "https://login.chinacloudapi.cn/{tenantid}/oauth2/v2.0/token",
+            jwks_uri: "https://login.chinacloudapi.cn/{tenantid}/discovery/v2.0/keys",
             issuer: "https://login.partner.microsoftonline.cn/{tenantid}/v2.0",
-            request_uri_parameter_supported: false,
-            userinfo_endpoint: "https://microsoftgraph.chinacloudapi.cn/oidc/userinfo",
-            authorization_endpoint: "https://login.chinacloudapi.cn/organizations/oauth2/v2.0/authorize",
-            device_authorization_endpoint: "https://login.chinacloudapi.cn/organizations/oauth2/v2.0/devicecode",
-            http_logout_supported: true,
-            frontchannel_logout_supported: true,
-            end_session_endpoint: "https://login.chinacloudapi.cn/organizations/oauth2/v2.0/logout",
-            claims_supported: [
-                "sub",
-                "iss",
-                "cloud_instance_name",
-                "cloud_instance_host_name",
-                "cloud_graph_host_name",
-                "msgraph_host",
-                "aud",
-                "exp",
-                "iat",
-                "auth_time",
-                "acr",
-                "nonce",
-                "preferred_username",
-                "name",
-                "tid",
-                "ver",
-                "at_hash",
-                "c_hash",
-                "email",
-            ],
-            kerberos_endpoint: "https://login.chinacloudapi.cn/organizations/kerberos",
-            tenant_region_scope: null,
-            cloud_instance_name: "partner.microsoftonline.cn",
-            cloud_graph_host_name: "graph.chinacloudapi.cn",
-            msgraph_host: "microsoftgraph.chinacloudapi.cn",
-            rbac_url: "https://pas.chinacloudapi.cn",
+            authorization_endpoint: "https://login.chinacloudapi.cn/{tenantid}/oauth2/v2.0/authorize",
+            end_session_endpoint: "https://login.chinacloudapi.cn/{tenantid}/oauth2/v2.0/logout",
         },
-        "https://login.microsoftonline.us/organizations/": {
-            token_endpoint: "https://login.microsoftonline.us/organizations/oauth2/v2.0/token",
-            token_endpoint_auth_methods_supported: [
-                "client_secret_post",
-                "private_key_jwt",
-                "client_secret_basic",
-            ],
-            jwks_uri: "https://login.microsoftonline.us/organizations/discovery/v2.0/keys",
-            response_modes_supported: ["query", "fragment", "form_post"],
-            subject_types_supported: ["pairwise"],
-            id_token_signing_alg_values_supported: ["RS256"],
-            response_types_supported: [
-                "code",
-                "id_token",
-                "code id_token",
-                "id_token token",
-            ],
-            scopes_supported: ["openid", "profile", "email", "offline_access"],
+        "login.microsoftonline.us": {
+            token_endpoint: "https://login.microsoftonline.us/{tenantid}/oauth2/v2.0/token",
+            jwks_uri: "https://login.microsoftonline.us/{tenantid}/discovery/v2.0/keys",
             issuer: "https://login.microsoftonline.us/{tenantid}/v2.0",
-            request_uri_parameter_supported: false,
-            userinfo_endpoint: "https://graph.microsoft.com/oidc/userinfo",
-            authorization_endpoint: "https://login.microsoftonline.us/organizations/oauth2/v2.0/authorize",
-            device_authorization_endpoint: "https://login.microsoftonline.us/organizations/oauth2/v2.0/devicecode",
-            http_logout_supported: true,
-            frontchannel_logout_supported: true,
-            end_session_endpoint: "https://login.microsoftonline.us/organizations/oauth2/v2.0/logout",
-            claims_supported: [
-                "sub",
-                "iss",
-                "cloud_instance_name",
-                "cloud_instance_host_name",
-                "cloud_graph_host_name",
-                "msgraph_host",
-                "aud",
-                "exp",
-                "iat",
-                "auth_time",
-                "acr",
-                "nonce",
-                "preferred_username",
-                "name",
-                "tid",
-                "ver",
-                "at_hash",
-                "c_hash",
-                "email",
-            ],
-            kerberos_endpoint: "https://login.microsoftonline.us/organizations/kerberos",
-            tenant_region_scope: null,
-            cloud_instance_name: "microsoftonline.us",
-            cloud_graph_host_name: "graph.windows.net",
-            msgraph_host: "graph.microsoft.com",
-            rbac_url: "https://pasff.usgovcloudapi.net",
+            authorization_endpoint: "https://login.microsoftonline.us/{tenantid}/oauth2/v2.0/authorize",
+            end_session_endpoint: "https://login.microsoftonline.us/{tenantid}/oauth2/v2.0/logout",
         },
     },
     instanceDiscoveryMetadata: {
         tenant_discovery_endpoint: "https://{canonicalAuthority}/v2.0/.well-known/openid-configuration",
-        "api-version": "1.1",
         metadata: [
             {
                 preferred_network: "login.microsoftonline.com",
@@ -5483,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({
@@ -5523,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) => {
@@ -5665,7 +5215,7 @@ RegionDiscovery.IMDS_OPTIONS = {
  * @internal
  */
 class Authority {
-    constructor(authority, networkInterface, cacheManager, authorityOptions, logger, performanceClient, correlationId) {
+    constructor(authority, networkInterface, cacheManager, authorityOptions, logger, correlationId, performanceClient) {
         this.canonicalAuthority = authority;
         this._canonicalAuthority.validateAsUri();
         this.networkInterface = networkInterface;
@@ -5902,6 +5452,10 @@ class Authority {
         this.updateCachedMetadata(metadataEntity, cloudDiscoverySource, {
             source: endpointSource,
         });
+        this.performanceClient?.addFields({
+            cloudDiscoverySource: cloudDiscoverySource,
+            authorityEndpointSource: endpointSource,
+        }, this.correlationId);
     }
     /**
      * Returns metadata entity from cache if it exists, otherwiser returns a new metadata entity built
@@ -6093,8 +5647,8 @@ class Authority {
      * Get OAuth endpoints for common authorities.
      */
     getEndpointMetadataFromHardcodedValues() {
-        if (this.canonicalAuthority in EndpointMetadata) {
-            return EndpointMetadata[this.canonicalAuthority];
+        if (this.hostnameAndPort in EndpointMetadata) {
+            return EndpointMetadata[this.hostnameAndPort];
         }
         return null;
     }
@@ -6486,50 +6040,36 @@ function buildStaticAuthorityOptions(authOptions) {
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-/** @internal */
-class AuthorityFactory {
-    /**
-     * Create an authority object of the correct type based on the url
-     * Performs basic authority validation - checks to see if the authority is of a valid type (i.e. aad, b2c, adfs)
-     *
-     * Also performs endpoint discovery.
-     *
-     * @param authorityUri
-     * @param networkClient
-     * @param protocolMode
-     */
-    static async createDiscoveredInstance(authorityUri, networkClient, cacheManager, authorityOptions, logger, performanceClient, correlationId) {
-        performanceClient?.addQueueMeasurement(PerformanceEvents.AuthorityFactoryCreateDiscoveredInstance, correlationId);
-        const authorityUriFinal = Authority.transformCIAMAuthority(formatAuthorityUri(authorityUri));
-        // Initialize authority and perform discovery endpoint check.
-        const acquireTokenAuthority = AuthorityFactory.createInstance(authorityUriFinal, networkClient, cacheManager, authorityOptions, logger, performanceClient, correlationId);
-        try {
-            await invokeAsync(acquireTokenAuthority.resolveEndpointsAsync.bind(acquireTokenAuthority), PerformanceEvents.AuthorityResolveEndpointsAsync, logger, performanceClient, correlationId)();
-            return acquireTokenAuthority;
-        }
-        catch (e) {
-            throw createClientAuthError(endpointResolutionError);
-        }
+/**
+ * Create an authority object of the correct type based on the url
+ * Performs basic authority validation - checks to see if the authority is of a valid type (i.e. aad, b2c, adfs)
+ *
+ * Also performs endpoint discovery.
+ *
+ * @param authorityUri
+ * @param networkClient
+ * @param protocolMode
+ * @internal
+ */
+async function createDiscoveredInstance(authorityUri, networkClient, cacheManager, authorityOptions, logger, correlationId, performanceClient) {
+    performanceClient?.addQueueMeasurement(PerformanceEvents.AuthorityFactoryCreateDiscoveredInstance, correlationId);
+    const authorityUriFinal = Authority.transformCIAMAuthority(formatAuthorityUri(authorityUri));
+    // Initialize authority and perform discovery endpoint check.
+    const acquireTokenAuthority = new Authority(authorityUriFinal, networkClient, cacheManager, authorityOptions, logger, correlationId, performanceClient);
+    try {
+        await invokeAsync(acquireTokenAuthority.resolveEndpointsAsync.bind(acquireTokenAuthority), PerformanceEvents.AuthorityResolveEndpointsAsync, logger, performanceClient, correlationId)();
+        return acquireTokenAuthority;
     }
-    /**
-     * Create an authority object of the correct type based on the url
-     * Performs basic authority validation - checks to see if the authority is of a valid type (i.e. aad, b2c, adfs)
-     *
-     * Does not perform endpoint discovery.
-     *
-     * @param authorityUrl
-     * @param networkInterface
-     * @param protocolMode
-     */
-    static createInstance(authorityUrl, networkInterface, cacheManager, authorityOptions, logger, performanceClient, correlationId) {
-        // Throw error if authority url is empty
-        if (!authorityUrl) {
-            throw createClientConfigurationError(urlEmptyError);
-        }
-        return new Authority(authorityUrl, networkInterface, cacheManager, authorityOptions, logger, performanceClient, correlationId);
+    catch (e) {
+        throw createClientAuthError(endpointResolutionError);
     }
 }
 
+var AuthorityFactory = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    createDiscoveredInstance: createDiscoveredInstance
+});
+
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -6615,7 +6155,7 @@ class BaseClient {
     async updateAuthority(cloudInstanceHostname, correlationId) {
         this.performanceClient?.addQueueMeasurement(PerformanceEvents.UpdateTokenEndpointAuthority, correlationId);
         const cloudInstanceAuthorityUri = `https://${cloudInstanceHostname}/${this.authority.tenant}/`;
-        const cloudInstanceAuthority = await AuthorityFactory.createDiscoveredInstance(cloudInstanceAuthorityUri, this.networkClient, this.cacheManager, this.authority.options, this.logger, this.performanceClient, correlationId);
+        const cloudInstanceAuthority = await createDiscoveredInstance(cloudInstanceAuthorityUri, this.networkClient, this.cacheManager, this.authority.options, this.logger, correlationId, this.performanceClient);
         this.authority = cloudInstanceAuthority;
     }
     /**
@@ -6895,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(),
@@ -7146,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;
@@ -7327,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];
@@ -7704,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];
@@ -7765,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);
         }
@@ -7963,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