@azure/msal-common 15.13.3 → 16.0.0-beta.0

package/src/telemetry/performance/PerformanceEvents.ts

@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+/**
+ * Time spent sending/waiting for the response of a request to the token endpoint
+ */
+export const NetworkClientSendPostRequestAsync =
+    "networkClientSendPostRequestAsync";
+export const RefreshTokenClientExecutePostToTokenEndpoint =
+    "refreshTokenClientExecutePostToTokenEndpoint";
+export const AuthorizationCodeClientExecutePostToTokenEndpoint =
+    "authorizationCodeClientExecutePostToTokenEndpoint";
+
+/**
+ * Time spent on the network for refresh token acquisition
+ */
+export const RefreshTokenClientExecuteTokenRequest =
+    "refreshTokenClientExecuteTokenRequest";
+
+/**
+ * Time taken for acquiring refresh token , records RT size
+ */
+export const RefreshTokenClientAcquireToken = "refreshTokenClientAcquireToken";
+
+/**
+ * Time taken for acquiring cached refresh token
+ */
+export const RefreshTokenClientAcquireTokenWithCachedRefreshToken =
+    "refreshTokenClientAcquireTokenWithCachedRefreshToken";
+
+/**
+ * Helper function to create token request body in RefreshTokenClient (msal-common).
+ */
+export const RefreshTokenClientCreateTokenRequestBody =
+    "refreshTokenClientCreateTokenRequestBody";
+
+export const SilentFlowClientGenerateResultFromCacheRecord =
+    "silentFlowClientGenerateResultFromCacheRecord";
+
+/**
+ * getAuthCodeUrl API (msal-browser and msal-node).
+ */
+export const GetAuthCodeUrl = "getAuthCodeUrl";
+
+/**
+ * Functions from InteractionHandler (msal-browser)
+ */
+export const HandleCodeResponseFromServer = "handleCodeResponseFromServer";
+
+/**
+ * APIs in Authorization Code Client (msal-common)
+ */
+export const AuthClientExecuteTokenRequest = "authClientExecuteTokenRequest";
+export const AuthClientCreateTokenRequestBody =
+    "authClientCreateTokenRequestBody";
+export const UpdateTokenEndpointAuthority = "updateTokenEndpointAuthority";
+
+/**
+ * Generate functions in PopTokenGenerator (msal-common)
+ */
+export const PopTokenGenerateCnf = "popTokenGenerateCnf";
+
+/**
+ * handleServerTokenResponse API in ResponseHandler (msal-common)
+ */
+export const HandleServerTokenResponse = "handleServerTokenResponse";
+
+/**
+ * Authority functions
+ */
+export const AuthorityResolveEndpointsAsync = "authorityResolveEndpointsAsync";
+export const AuthorityGetCloudDiscoveryMetadataFromNetwork =
+    "authorityGetCloudDiscoveryMetadataFromNetwork";
+export const AuthorityUpdateCloudDiscoveryMetadata =
+    "authorityUpdateCloudDiscoveryMetadata";
+export const AuthorityGetEndpointMetadataFromNetwork =
+    "authorityGetEndpointMetadataFromNetwork";
+export const AuthorityUpdateEndpointMetadata =
+    "authorityUpdateEndpointMetadata";
+export const AuthorityUpdateMetadataWithRegionalInformation =
+    "authorityUpdateMetadataWithRegionalInformation";
+
+/**
+ * Region Discovery functions
+ */
+export const RegionDiscoveryDetectRegion = "regionDiscoveryDetectRegion";
+export const RegionDiscoveryGetRegionFromIMDS =
+    "regionDiscoveryGetRegionFromIMDS";
+export const RegionDiscoveryGetCurrentVersion =
+    "regionDiscoveryGetCurrentVersion";
+
+/**
+ * Cache operations
+ */
+export const CacheManagerGetRefreshToken = "cacheManagerGetRefreshToken";
+export const SetUserData = "setUserData";

package/src/telemetry/performance/StubPerformanceClient.ts

@@ -50,25 +50,9 @@ export class StubPerformanceClient implements IPerformanceClient {
                 startTimeMs: Date.now(),
                 correlationId: correlationId || "",
             },
-            measurement: new StubPerformanceMeasurement(),
         };
     }
 
-    startPerformanceMeasurement(): IPerformanceMeasurement {
-        return new StubPerformanceMeasurement();
-    }
-    calculateQueuedTime(): number {
-        return 0;
-    }
-
-    addQueueMeasurement(): void {
-        return;
-    }
-
-    setPreQueueTime(): void {
-        return;
-    }
-
     endMeasurement(): PerformanceEvent | null {
         return null;
     }

package/src/telemetry/server/ServerTelemetryManager.ts

@@ -3,14 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import {
-    SERVER_TELEM_CONSTANTS,
-    Separators,
-    CacheOutcome,
-    Constants,
-    RegionDiscoverySources,
-    RegionDiscoveryOutcomes,
-} from "../../utils/Constants.js";
+import * as Constants from "../../utils/Constants.js";
 import { CacheManager } from "../../cache/CacheManager.js";
 import { AuthError } from "../../error/AuthError.js";
 import { ServerTelemetryRequest } from "./ServerTelemetryRequest.js";
@@ -89,9 +82,10 @@ export class ServerTelemetryManager {
     private wrapperSKU: String;
     private wrapperVer: String;
     private regionUsed: string | undefined;
-    private regionSource: RegionDiscoverySources | undefined;
-    private regionOutcome: RegionDiscoveryOutcomes | undefined;
-    private cacheOutcome: CacheOutcome = CacheOutcome.NOT_APPLICABLE;
+    private regionSource: Constants.RegionDiscoverySources | undefined;
+    private regionOutcome: Constants.RegionDiscoveryOutcomes | undefined;
+    private cacheOutcome: Constants.CacheOutcome =
+        Constants.CacheOutcome.NOT_APPLICABLE;
 
     constructor(
         telemetryRequest: ServerTelemetryRequest,
@@ -100,12 +94,12 @@ export class ServerTelemetryManager {
         this.cacheManager = cacheManager;
         this.apiId = telemetryRequest.apiId;
         this.correlationId = telemetryRequest.correlationId;
-        this.wrapperSKU = telemetryRequest.wrapperSKU || Constants.EMPTY_STRING;
-        this.wrapperVer = telemetryRequest.wrapperVer || Constants.EMPTY_STRING;
+        this.wrapperSKU = telemetryRequest.wrapperSKU || "";
+        this.wrapperVer = telemetryRequest.wrapperVer || "";
 
         this.telemetryCacheKey =
-            SERVER_TELEM_CONSTANTS.CACHE_KEY +
-            Separators.CACHE_KEY_SEPARATOR +
+            Constants.SERVER_TELEM_CACHE_KEY +
+            Constants.CACHE_KEY_SEPARATOR +
             telemetryRequest.clientId;
     }
 
@@ -113,26 +107,26 @@ export class ServerTelemetryManager {
      * API to add MSER Telemetry to request
      */
     generateCurrentRequestHeaderValue(): string {
-        const request = `${this.apiId}${SERVER_TELEM_CONSTANTS.VALUE_SEPARATOR}${this.cacheOutcome}`;
+        const request = `${this.apiId}${Constants.SERVER_TELEM_VALUE_SEPARATOR}${this.cacheOutcome}`;
         const platformFieldsArr = [this.wrapperSKU, this.wrapperVer];
         const nativeBrokerErrorCode = this.getNativeBrokerErrorCode();
         if (nativeBrokerErrorCode?.length) {
             platformFieldsArr.push(`broker_error=${nativeBrokerErrorCode}`);
         }
         const platformFields = platformFieldsArr.join(
-            SERVER_TELEM_CONSTANTS.VALUE_SEPARATOR
+            Constants.SERVER_TELEM_VALUE_SEPARATOR
         );
         const regionDiscoveryFields = this.getRegionDiscoveryFields();
         const requestWithRegionDiscoveryFields = [
             request,
             regionDiscoveryFields,
-        ].join(SERVER_TELEM_CONSTANTS.VALUE_SEPARATOR);
+        ].join(Constants.SERVER_TELEM_VALUE_SEPARATOR);
 
         return [
-            SERVER_TELEM_CONSTANTS.SCHEMA_VERSION,
+            Constants.SERVER_TELEM_SCHEMA_VERSION,
             requestWithRegionDiscoveryFields,
             platformFields,
-        ].join(SERVER_TELEM_CONSTANTS.CATEGORY_SEPARATOR);
+        ].join(Constants.SERVER_TELEM_CATEGORY_SEPARATOR);
     }
 
     /**
@@ -144,28 +138,28 @@ export class ServerTelemetryManager {
         const maxErrors = ServerTelemetryManager.maxErrorsToSend(lastRequests);
         const failedRequests = lastRequests.failedRequests
             .slice(0, 2 * maxErrors)
-            .join(SERVER_TELEM_CONSTANTS.VALUE_SEPARATOR);
+            .join(Constants.SERVER_TELEM_VALUE_SEPARATOR);
         const errors = lastRequests.errors
             .slice(0, maxErrors)
-            .join(SERVER_TELEM_CONSTANTS.VALUE_SEPARATOR);
+            .join(Constants.SERVER_TELEM_VALUE_SEPARATOR);
         const errorCount = lastRequests.errors.length;
 
         // Indicate whether this header contains all data or partial data
         const overflow =
             maxErrors < errorCount
-                ? SERVER_TELEM_CONSTANTS.OVERFLOW_TRUE
-                : SERVER_TELEM_CONSTANTS.OVERFLOW_FALSE;
+                ? Constants.SERVER_TELEM_OVERFLOW_TRUE
+                : Constants.SERVER_TELEM_OVERFLOW_FALSE;
         const platformFields = [errorCount, overflow].join(
-            SERVER_TELEM_CONSTANTS.VALUE_SEPARATOR
+            Constants.SERVER_TELEM_VALUE_SEPARATOR
         );
 
         return [
-            SERVER_TELEM_CONSTANTS.SCHEMA_VERSION,
+            Constants.SERVER_TELEM_SCHEMA_VERSION,
             lastRequests.cacheHits,
             failedRequests,
             errors,
             platformFields,
-        ].join(SERVER_TELEM_CONSTANTS.CATEGORY_SEPARATOR);
+        ].join(Constants.SERVER_TELEM_CATEGORY_SEPARATOR);
     }
 
     /**
@@ -176,7 +170,7 @@ export class ServerTelemetryManager {
         const lastRequests = this.getLastRequests();
         if (
             lastRequests.errors.length >=
-            SERVER_TELEM_CONSTANTS.MAX_CACHED_ERRORS
+            Constants.SERVER_TELEM_MAX_CACHED_ERRORS
         ) {
             // Remove a cached error to make room, first in first out
             lastRequests.failedRequests.shift(); // apiId
@@ -199,7 +193,7 @@ export class ServerTelemetryManager {
                 lastRequests.errors.push(error.toString());
             }
         } else {
-            lastRequests.errors.push(SERVER_TELEM_CONSTANTS.UNKNOWN_ERROR);
+            lastRequests.errors.push(Constants.SERVER_TELEM_UNKNOWN_ERROR);
         }
 
         this.cacheManager.setServerTelemetry(
@@ -236,7 +230,8 @@ export class ServerTelemetryManager {
             cacheHits: 0,
         };
         const lastRequests = this.cacheManager.getServerTelemetry(
-            this.telemetryCacheKey
+            this.telemetryCacheKey,
+            this.correlationId
         ) as ServerTelemetryEntity;
 
         return lastRequests || initialValue;
@@ -287,14 +282,10 @@ export class ServerTelemetryManager {
         const errorCount = serverTelemetryEntity.errors.length;
         for (i = 0; i < errorCount; i++) {
             // failedRequests parameter contains pairs of apiId and correlationId, multiply index by 2 to preserve pairs
-            const apiId =
-                serverTelemetryEntity.failedRequests[2 * i] ||
-                Constants.EMPTY_STRING;
+            const apiId = serverTelemetryEntity.failedRequests[2 * i] || "";
             const correlationId =
-                serverTelemetryEntity.failedRequests[2 * i + 1] ||
-                Constants.EMPTY_STRING;
-            const errorCode =
-                serverTelemetryEntity.errors[i] || Constants.EMPTY_STRING;
+                serverTelemetryEntity.failedRequests[2 * i + 1] || "";
+            const errorCode = serverTelemetryEntity.errors[i] || "";
 
             // Count number of characters that would be added to header, each character is 1 byte. Add 3 at the end to account for separators
             dataSize +=
@@ -303,7 +294,7 @@ export class ServerTelemetryManager {
                 errorCode.length +
                 3;
 
-            if (dataSize < SERVER_TELEM_CONSTANTS.MAX_LAST_HEADER_BYTES) {
+            if (dataSize < Constants.SERVER_TELEM_MAX_LAST_HEADER_BYTES) {
                 // Adding this entry to the header would still keep header size below the limit
                 maxErrors += 1;
             } else {
@@ -322,11 +313,9 @@ export class ServerTelemetryManager {
     getRegionDiscoveryFields(): string {
         const regionDiscoveryFields: string[] = [];
 
-        regionDiscoveryFields.push(this.regionUsed || Constants.EMPTY_STRING);
-        regionDiscoveryFields.push(this.regionSource || Constants.EMPTY_STRING);
-        regionDiscoveryFields.push(
-            this.regionOutcome || Constants.EMPTY_STRING
-        );
+        regionDiscoveryFields.push(this.regionUsed || "");
+        regionDiscoveryFields.push(this.regionSource || "");
+        regionDiscoveryFields.push(this.regionOutcome || "");
 
         return regionDiscoveryFields.join(",");
     }
@@ -348,7 +337,7 @@ export class ServerTelemetryManager {
     /**
      * Set cache outcome
      */
-    setCacheOutcome(cacheOutcome: CacheOutcome): void {
+    setCacheOutcome(cacheOutcome: Constants.CacheOutcome): void {
         this.cacheOutcome = cacheOutcome;
     }
 

package/src/url/UrlString.ts

@@ -9,8 +9,7 @@ import {
 } from "../error/ClientConfigurationError.js";
 import { StringUtils } from "../utils/StringUtils.js";
 import { IUri } from "./IUri.js";
-import { AADAuthorityConstants, Constants } from "../utils/Constants.js";
-import * as UrlUtils from "../utils/UrlUtils.js";
+import * as Constants from "../utils/Constants.js";
 
 /**
  * Url object class which can perform various transformations on url strings.
@@ -126,8 +125,8 @@ export class UrlString {
         if (
             tenantId &&
             pathArray.length !== 0 &&
-            (pathArray[0] === AADAuthorityConstants.COMMON ||
-                pathArray[0] === AADAuthorityConstants.ORGANIZATIONS)
+            (pathArray[0] === Constants.AADAuthority.COMMON ||
+                pathArray[0] === Constants.AADAuthority.ORGANIZATIONS)
         ) {
             pathArray[0] = tenantId;
         }
@@ -215,12 +214,4 @@ export class UrlString {
                 urlObject.PathSegments.join("/")
         );
     }
-
-    /**
-     * Check if the hash of the URL string contains known properties
-     * @deprecated This API will be removed in a future version
-     */
-    static hashContainsKnownProperties(response: string): boolean {
-        return !!UrlUtils.getDeserializedResponse(response);
-    }
 }

package/src/utils/Constants.ts

@@ -3,82 +3,70 @@
  * Licensed under the MIT License.
  */
 
-export const Constants = {
-    LIBRARY_NAME: "MSAL.JS",
-    SKU: "msal.js.common",
-    // default authority
-    DEFAULT_AUTHORITY: "https://login.microsoftonline.com/common/",
-    DEFAULT_AUTHORITY_HOST: "login.microsoftonline.com",
-    DEFAULT_COMMON_TENANT: "common",
-    // ADFS String
-    ADFS: "adfs",
-    DSTS: "dstsv2",
-    // Default AAD Instance Discovery Endpoint
-    AAD_INSTANCE_DISCOVERY_ENDPT:
-        "https://login.microsoftonline.com/common/discovery/instance?api-version=1.1&authorization_endpoint=",
-    // CIAM URL
-    CIAM_AUTH_URL: ".ciamlogin.com",
-    AAD_TENANT_DOMAIN_SUFFIX: ".onmicrosoft.com",
-    // Resource delimiter - used for certain cache entries
-    RESOURCE_DELIM: "|",
-    // Placeholder for non-existent account ids/objects
-    NO_ACCOUNT: "NO_ACCOUNT",
-    // Claims
-    CLAIMS: "claims",
-    // Consumer UTID
-    CONSUMER_UTID: "9188040d-6c67-4c5b-b112-36a304b66dad",
-    // Default scopes
-    OPENID_SCOPE: "openid",
-    PROFILE_SCOPE: "profile",
-    OFFLINE_ACCESS_SCOPE: "offline_access",
-    EMAIL_SCOPE: "email",
-    CODE_GRANT_TYPE: "authorization_code",
-    RT_GRANT_TYPE: "refresh_token",
-    S256_CODE_CHALLENGE_METHOD: "S256",
-    URL_FORM_CONTENT_TYPE: "application/x-www-form-urlencoded;charset=utf-8",
-    AUTHORIZATION_PENDING: "authorization_pending",
-    NOT_DEFINED: "not_defined",
-    EMPTY_STRING: "",
-    NOT_APPLICABLE: "N/A",
-    NOT_AVAILABLE: "Not Available",
-    FORWARD_SLASH: "/",
-    IMDS_ENDPOINT: "http://169.254.169.254/metadata/instance/compute/location",
-    IMDS_VERSION: "2020-06-01",
-    IMDS_TIMEOUT: 2000,
-    AZURE_REGION_AUTO_DISCOVER_FLAG: "TryAutoDetect",
-    REGIONAL_AUTH_PUBLIC_CLOUD_SUFFIX: "login.microsoft.com",
-    KNOWN_PUBLIC_CLOUDS: [
-        "login.microsoftonline.com",
-        "login.windows.net",
-        "login.microsoft.com",
-        "sts.windows.net",
-    ],
-    SHR_NONCE_VALIDITY: 240,
-    INVALID_INSTANCE: "invalid_instance",
-};
-
-export const HttpStatus = {
-    SUCCESS: 200,
-    SUCCESS_RANGE_START: 200,
-    SUCCESS_RANGE_END: 299,
-    REDIRECT: 302,
-    CLIENT_ERROR: 400,
-    CLIENT_ERROR_RANGE_START: 400,
-    BAD_REQUEST: 400,
-    UNAUTHORIZED: 401,
-    NOT_FOUND: 404,
-    REQUEST_TIMEOUT: 408,
-    GONE: 410,
-    TOO_MANY_REQUESTS: 429,
-    CLIENT_ERROR_RANGE_END: 499,
-    SERVER_ERROR: 500,
-    SERVER_ERROR_RANGE_START: 500,
-    SERVICE_UNAVAILABLE: 503,
-    GATEWAY_TIMEOUT: 504,
-    SERVER_ERROR_RANGE_END: 599,
-    MULTI_SIDED_ERROR: 600,
-} as const;
-export type HttpStatus = (typeof HttpStatus)[keyof typeof HttpStatus];
+export const SKU = "msal.js.common";
+// default authority
+export const DEFAULT_AUTHORITY = "https://login.microsoftonline.com/common/";
+export const DEFAULT_AUTHORITY_HOST = "login.microsoftonline.com";
+export const DEFAULT_COMMON_TENANT = "common";
+// ADFS String
+export const ADFS = "adfs";
+export const DSTS = "dstsv2";
+// Default AAD Instance Discovery Endpoint
+export const AAD_INSTANCE_DISCOVERY_ENDPT = `${DEFAULT_AUTHORITY}discovery/instance?api-version=1.1&authorization_endpoint=`;
+// CIAM URL
+export const CIAM_AUTH_URL = ".ciamlogin.com";
+export const AAD_TENANT_DOMAIN_SUFFIX = ".onmicrosoft.com";
+// Resource delimiter - used for certain cache entries
+export const RESOURCE_DELIM = "|";
+// Consumer UTID
+export const CONSUMER_UTID = "9188040d-6c67-4c5b-b112-36a304b66dad";
+// Default scopes
+export const OPENID_SCOPE = "openid";
+export const PROFILE_SCOPE = "profile";
+export const OFFLINE_ACCESS_SCOPE = "offline_access";
+export const EMAIL_SCOPE = "email";
+export const CODE_GRANT_TYPE = "authorization_code";
+export const S256_CODE_CHALLENGE_METHOD = "S256";
+export const URL_FORM_CONTENT_TYPE =
+    "application/x-www-form-urlencoded;charset=utf-8";
+export const AUTHORIZATION_PENDING = "authorization_pending";
+export const NOT_APPLICABLE = "N/A";
+export const NOT_AVAILABLE = "Not Available";
+export const FORWARD_SLASH = "/";
+export const IMDS_ENDPOINT =
+    "http://169.254.169.254/metadata/instance/compute/location";
+export const IMDS_VERSION = "2020-06-01";
+export const IMDS_TIMEOUT = 2000;
+export const AZURE_REGION_AUTO_DISCOVER_FLAG = "TryAutoDetect";
+export const REGIONAL_AUTH_PUBLIC_CLOUD_SUFFIX = "login.microsoft.com";
+export const KNOWN_PUBLIC_CLOUDS = [
+    "login.microsoftonline.com",
+    "login.windows.net",
+    "login.microsoft.com",
+    "sts.windows.net",
+];
+export const SHR_NONCE_VALIDITY = 240;
+export const INVALID_INSTANCE = "invalid_instance";
+
+export const HTTP_SUCCESS: number = 200;
+export const HTTP_SUCCESS_RANGE_START: number = 200;
+export const HTTP_SUCCESS_RANGE_END: number = 299;
+export const HTTP_REDIRECT: number = 302;
+export const HTTP_CLIENT_ERROR: number = 400;
+export const HTTP_CLIENT_ERROR_RANGE_START: number = 400;
+export const HTTP_BAD_REQUEST: number = 400;
+export const HTTP_UNAUTHORIZED: number = 401;
+export const HTTP_NOT_FOUND: number = 404;
+export const HTTP_REQUEST_TIMEOUT: number = 408;
+export const HTTP_GONE: number = 410;
+export const HTTP_TOO_MANY_REQUESTS: number = 429;
+export const HTTP_CLIENT_ERROR_RANGE_END: number = 499;
+export const HTTP_SERVER_ERROR: number = 500;
+export const HTTP_SERVER_ERROR_RANGE_START: number = 500;
+export const HTTP_SERVICE_UNAVAILABLE: number = 503;
+export const HTTP_GATEWAY_TIMEOUT: number = 504;
+export const HTTP_SERVER_ERROR_RANGE_END: number = 599;
+export const HTTP_MULTI_SIDED_ERROR: number = 600;
 
 export const HttpMethod = {
     GET: "GET",
@@ -87,12 +75,12 @@ export const HttpMethod = {
 export type HttpMethod = (typeof HttpMethod)[keyof typeof HttpMethod];
 
 export const OIDC_DEFAULT_SCOPES = [
-    Constants.OPENID_SCOPE,
-    Constants.PROFILE_SCOPE,
-    Constants.OFFLINE_ACCESS_SCOPE,
+    OPENID_SCOPE,
+    PROFILE_SCOPE,
+    OFFLINE_ACCESS_SCOPE,
 ];
 
-export const OIDC_SCOPES = [...OIDC_DEFAULT_SCOPES, Constants.EMAIL_SCOPE];
+export const OIDC_SCOPES = [...OIDC_DEFAULT_SCOPES, EMAIL_SCOPE];
 
 /**
  * Request header names
@@ -121,13 +109,12 @@ export type PersistentCacheKeys =
 /**
  * String constants related to AAD Authority
  */
-export const AADAuthorityConstants = {
+export const AADAuthority = {
     COMMON: "common",
     ORGANIZATIONS: "organizations",
     CONSUMERS: "consumers",
 } as const;
-export type AADAuthorityConstants =
-    (typeof AADAuthorityConstants)[keyof typeof AADAuthorityConstants];
+export type AADAuthority = (typeof AADAuthority)[keyof typeof AADAuthority];
 
 /**
  * Claims request keys
@@ -172,17 +159,6 @@ export const OAuthResponseType = {
 export type OAuthResponseType =
     (typeof OAuthResponseType)[keyof typeof OAuthResponseType];
 
-/**
- * allowed values for server response type
- * @deprecated Use ResponseMode instead
- */
-export const ServerResponseType = {
-    QUERY: "query",
-    FRAGMENT: "fragment",
-} as const;
-export type ServerResponseType =
-    (typeof ServerResponseType)[keyof typeof ServerResponseType];
-
 /**
  * allowed values for response_mode
  */
@@ -210,23 +186,16 @@ export type GrantType = (typeof GrantType)[keyof typeof GrantType];
 /**
  * Account types in Cache
  */
-export const CacheAccountType = {
-    MSSTS_ACCOUNT_TYPE: "MSSTS",
-    ADFS_ACCOUNT_TYPE: "ADFS",
-    MSAV1_ACCOUNT_TYPE: "MSA",
-    GENERIC_ACCOUNT_TYPE: "Generic", // NTLM, Kerberos, FBA, Basic etc
-} as const;
-export type CacheAccountType =
-    (typeof CacheAccountType)[keyof typeof CacheAccountType];
+export const CACHE_ACCOUNT_TYPE_MSSTS: string = "MSSTS";
+export const CACHE_ACCOUNT_TYPE_ADFS: string = "ADFS";
+export const CACHE_ACCOUNT_TYPE_MSAV1: string = "MSA";
+export const CACHE_ACCOUNT_TYPE_GENERIC: string = "Generic";
 
 /**
  * Separators used in cache
  */
-export const Separators = {
-    CACHE_KEY_SEPARATOR: "-",
-    CLIENT_INFO_SEPARATOR: ".",
-} as const;
-export type Separators = (typeof Separators)[keyof typeof Separators];
+export const CACHE_KEY_SEPARATOR: string = "-";
+export const CLIENT_INFO_SEPARATOR: string = ".";
 
 /**
  * Credential Type stored in the cache
@@ -259,14 +228,12 @@ export type CacheType = (typeof CacheType)[keyof typeof CacheType];
 /**
  * More Cache related constants
  */
-export const APP_METADATA = "appmetadata";
-export const CLIENT_INFO = "client_info";
-export const THE_FAMILY_ID = "1";
+export const APP_METADATA: string = "appmetadata";
+export const CLIENT_INFO: string = "client_info";
+export const THE_FAMILY_ID: string = "1";
 
-export const AUTHORITY_METADATA_CONSTANTS = {
-    CACHE_KEY: "authority-metadata",
-    REFRESH_TIME_SECONDS: 3600 * 24, // 24 Hours
-};
+export const AUTHORITY_METADATA_CACHE_KEY: string = "authority-metadata";
+export const AUTHORITY_METADATA_REFRESH_TIME_SECONDS: number = 3600 * 24; // 24 Hours
 
 export const AuthorityMetadataSource = {
     CONFIG: "config",
@@ -277,18 +244,16 @@ export const AuthorityMetadataSource = {
 export type AuthorityMetadataSource =
     (typeof AuthorityMetadataSource)[keyof typeof AuthorityMetadataSource];
 
-export const SERVER_TELEM_CONSTANTS = {
-    SCHEMA_VERSION: 5,
-    MAX_CUR_HEADER_BYTES: 80, // ESTS limit is 100B, set to 80 to provide a 20B buffer
-    MAX_LAST_HEADER_BYTES: 330, // ESTS limit is 350B, set to 330 to provide a 20B buffer,
-    MAX_CACHED_ERRORS: 50, // Limit the number of errors that can be stored to prevent uncontrolled size gains
-    CACHE_KEY: "server-telemetry",
-    CATEGORY_SEPARATOR: "|",
-    VALUE_SEPARATOR: ",",
-    OVERFLOW_TRUE: "1",
-    OVERFLOW_FALSE: "0",
-    UNKNOWN_ERROR: "unknown_error",
-};
+export const SERVER_TELEM_SCHEMA_VERSION: number = 5;
+export const SERVER_TELEM_MAX_CUR_HEADER_BYTES: number = 80; // ESTS limit is 100B, set to 80 to provide a 20B buffer
+export const SERVER_TELEM_MAX_LAST_HEADER_BYTES: number = 330; // ESTS limit is 350B, set to 330 to provide a 20B buffer,
+export const SERVER_TELEM_MAX_CACHED_ERRORS: number = 50; // Limit the number of errors that can be stored to prevent uncontrolled size gains
+export const SERVER_TELEM_CACHE_KEY: string = "server-telemetry";
+export const SERVER_TELEM_CATEGORY_SEPARATOR: string = "|";
+export const SERVER_TELEM_VALUE_SEPARATOR: string = ",";
+export const SERVER_TELEM_OVERFLOW_TRUE: string = "1";
+export const SERVER_TELEM_OVERFLOW_FALSE: string = "0";
+export const SERVER_TELEM_UNKNOWN_ERROR: string = "unknown_error";
 
 /**
  * Type of the authentication request
@@ -304,21 +269,19 @@ export type AuthenticationScheme =
 /**
  * Constants related to throttling
  */
-export const ThrottlingConstants = {
-    // Default time to throttle RequestThumbprint in seconds
-    DEFAULT_THROTTLE_TIME_SECONDS: 60,
-    // Default maximum time to throttle in seconds, overrides what the server sends back
-    DEFAULT_MAX_THROTTLE_TIME_SECONDS: 3600,
-    // Prefix for storing throttling entries
-    THROTTLING_PREFIX: "throttling",
-    // Value assigned to the x-ms-lib-capability header to indicate to the server the library supports throttling
-    X_MS_LIB_CAPABILITY_VALUE: "retry-after, h429",
-};
+export const DEFAULT_THROTTLE_TIME_SECONDS: number = 60;
+// Default maximum time to throttle in seconds, overrides what the server sends back
+export const DEFAULT_MAX_THROTTLE_TIME_SECONDS: number = 3600;
+// Prefix for storing throttling entries
+export const THROTTLING_PREFIX: string = "throttling";
+// Value assigned to the x-ms-lib-capability header to indicate to the server the library supports throttling
+export const X_MS_LIB_CAPABILITY_VALUE: string = "retry-after, h429";
 
-export const Errors = {
-    INVALID_GRANT_ERROR: "invalid_grant",
-    CLIENT_MISMATCH_ERROR: "client_mismatch",
-};
+/**
+ * Errors
+ */
+export const INVALID_GRANT_ERROR: string = "invalid_grant";
+export const CLIENT_MISMATCH_ERROR: string = "client_mismatch";
 
 /**
  * Password grant parameters