plugin-data-source-mssql 2.0.5 → 2.0.6

package/dist/tedious/node_modules/@azure/msal-node/src/client/BaseClient.ts

@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import {
+    ClientConfiguration,
+    buildClientConfiguration,
+    CommonClientConfiguration,
+    INetworkModule,
+    NetworkRequestOptions,
+    Logger,
+    ICrypto,
+    CacheManager,
+    ServerTelemetryManager,
+    Authority,
+    CcsCredential,
+    TokenProtocol,
+    RequestThumbprint,
+    ServerAuthorizationTokenResponse,
+    NetworkResponse,
+    BaseAuthRequest,
+    StubPerformanceClient,
+} from "@azure/msal-common/node";
+import { version, name } from "../packageMetadata.js";
+
+/**
+ * Base application class which will construct requests to send to and handle responses from the Microsoft STS using the authorization code flow.
+ * @internal
+ */
+export abstract class BaseClient {
+    // Logger object
+    public logger: Logger;
+
+    // Application config
+    protected config: CommonClientConfiguration;
+
+    // Crypto Interface
+    protected cryptoUtils: ICrypto;
+
+    // Storage Interface
+    protected cacheManager: CacheManager;
+
+    // Network Interface
+    protected networkClient: INetworkModule;
+
+    // Server Telemetry Manager
+    protected serverTelemetryManager: ServerTelemetryManager | null;
+
+    // Default authority object
+    public authority: Authority;
+
+    protected performanceClient: StubPerformanceClient;
+
+    protected constructor(configuration: ClientConfiguration) {
+        // Set the configuration
+        this.config = buildClientConfiguration(configuration);
+
+        // Initialize the logger
+        this.logger = new Logger(this.config.loggerOptions, name, version);
+
+        // Initialize crypto
+        this.cryptoUtils = this.config.cryptoInterface;
+
+        // Initialize storage interface
+        this.cacheManager = this.config.storageInterface;
+
+        // Set the network interface
+        this.networkClient = this.config.networkInterface;
+
+        // Set TelemetryManager
+        this.serverTelemetryManager = this.config.serverTelemetryManager;
+
+        // set Authority
+        this.authority = this.config.authOptions.authority;
+
+        this.performanceClient = new StubPerformanceClient();
+    }
+
+    /**
+     * Creates default headers for requests to token endpoint
+     */
+    protected createTokenRequestHeaders(
+        ccsCred?: CcsCredential
+    ): Record<string, string> {
+        return TokenProtocol.createTokenRequestHeaders(
+            this.logger,
+            false,
+            ccsCred
+        );
+    }
+
+    /**
+     * Http post to token endpoint
+     * @param tokenEndpoint
+     * @param queryString
+     * @param headers
+     * @param thumbprint
+     */
+    protected async executePostToTokenEndpoint(
+        tokenEndpoint: string,
+        queryString: string,
+        headers: Record<string, string>,
+        thumbprint: RequestThumbprint,
+        correlationId: string
+    ): Promise<NetworkResponse<ServerAuthorizationTokenResponse>> {
+        return TokenProtocol.executePostToTokenEndpoint(
+            tokenEndpoint,
+            queryString,
+            headers,
+            thumbprint,
+            correlationId,
+            this.cacheManager,
+            this.networkClient,
+            this.logger,
+            this.performanceClient,
+            this.serverTelemetryManager
+        );
+    }
+
+    /**
+     * Wraps sendPostRequestAsync with necessary preflight and postflight logic
+     * @param thumbprint - Request thumbprint for throttling
+     * @param tokenEndpoint - Endpoint to make the POST to
+     * @param options - Body and Headers to include on the POST request
+     * @param correlationId - CorrelationId for telemetry
+     */
+    async sendPostRequest<T extends ServerAuthorizationTokenResponse>(
+        thumbprint: RequestThumbprint,
+        tokenEndpoint: string,
+        options: NetworkRequestOptions,
+        correlationId: string
+    ): Promise<NetworkResponse<T>> {
+        return TokenProtocol.sendPostRequest<T>(
+            thumbprint,
+            tokenEndpoint,
+            options,
+            correlationId,
+            this.cacheManager,
+            this.networkClient,
+            this.logger,
+            this.performanceClient
+        );
+    }
+
+    /**
+     * Creates query string for the /token request
+     * @param request
+     */
+    createTokenQueryParameters(request: BaseAuthRequest): string {
+        return TokenProtocol.createTokenQueryParameters(
+            request,
+            this.config.authOptions.clientId,
+            this.config.authOptions.redirectUri,
+            this.performanceClient
+        );
+    }
+}

package/dist/tedious/node_modules/@azure/msal-node/src/client/ClientApplication.ts

@@ -19,25 +19,20 @@ import {
     CommonRefreshTokenRequest,
     CommonAuthorizationCodeRequest,
     CommonAuthorizationUrlRequest,
-    CommonUsernamePasswordRequest,
-    AuthenticationScheme,
-    ResponseMode,
     AuthorityOptions,
-    OIDC_DEFAULT_SCOPES,
     AzureRegionConfiguration,
     AuthError,
     AzureCloudOptions,
     AuthorizationCodePayload,
-    Constants,
-    StringUtils,
     createClientAuthError,
     ClientAuthErrorCodes,
     buildStaticAuthorityOptions,
     ClientAssertion as ClientAssertionType,
     getClientAssertion,
     ClientAssertionCallback,
-    CacheOutcome,
+    Constants,
     ClientAuthError,
+    StubPerformanceClient,
 } from "@azure/msal-common/node";
 import {
     Configuration,
@@ -55,6 +50,7 @@ import { RefreshTokenRequest } from "../request/RefreshTokenRequest.js";
 import { SilentFlowRequest } from "../request/SilentFlowRequest.js";
 import { version, name } from "../packageMetadata.js";
 import { UsernamePasswordRequest } from "../request/UsernamePasswordRequest.js";
+import { CommonUsernamePasswordRequest } from "../request/CommonUsernamePasswordRequest.js";
 import { NodeAuthError } from "../error/NodeAuthError.js";
 import { UsernamePasswordClient } from "./UsernamePasswordClient.js";
 import { getAuthCodeRequestUrl } from "../protocol/Authorize.js";
@@ -125,12 +121,12 @@ export abstract class ClientApplication {
      * `acquireTokenByCode(AuthorizationCodeRequest)`.
      */
     async getAuthCodeUrl(request: AuthorizationUrlRequest): Promise<string> {
-        this.logger.info("getAuthCodeUrl called", request.correlationId);
+        this.logger.info("getAuthCodeUrl called", request.correlationId || "");
         const validRequest: CommonAuthorizationUrlRequest = {
             ...request,
             ...(await this.initializeBaseRequest(request)),
-            responseMode: request.responseMode || ResponseMode.QUERY,
-            authenticationScheme: AuthenticationScheme.BEARER,
+            responseMode: request.responseMode || Constants.ResponseMode.QUERY,
+            authenticationScheme: Constants.AuthenticationScheme.BEARER,
             state: request.state || "",
             nonce: request.nonce || "",
         };
@@ -161,9 +157,15 @@ export abstract class ClientApplication {
         request: AuthorizationCodeRequest,
         authCodePayLoad?: AuthorizationCodePayload
     ): Promise<AuthenticationResult> {
-        this.logger.info("acquireTokenByCode called");
+        this.logger.info(
+            "acquireTokenByCode called",
+            request.correlationId || ""
+        );
         if (request.state && authCodePayLoad) {
-            this.logger.info("acquireTokenByCode - validating state");
+            this.logger.info(
+                "acquireTokenByCode - validating state",
+                request.correlationId || ""
+            );
             this.validateState(request.state, authCodePayLoad.state || "");
             // eslint-disable-next-line no-param-reassign
             authCodePayLoad = { ...authCodePayLoad, state: "" };
@@ -171,7 +173,7 @@ export abstract class ClientApplication {
         const validRequest: CommonAuthorizationCodeRequest = {
             ...request,
             ...(await this.initializeBaseRequest(request)),
-            authenticationScheme: AuthenticationScheme.BEARER,
+            authenticationScheme: Constants.AuthenticationScheme.BEARER,
         };
 
         const serverTelemetryManager = this.initializeServerTelemetryManager(
@@ -192,7 +194,8 @@ export abstract class ClientApplication {
                 serverTelemetryManager
             );
             const authorizationCodeClient = new AuthorizationCodeClient(
-                authClientConfig
+                authClientConfig,
+                new StubPerformanceClient()
             );
             this.logger.verbose(
                 "Auth code client created",
@@ -224,12 +227,12 @@ export abstract class ClientApplication {
     ): Promise<AuthenticationResult | null> {
         this.logger.info(
             "acquireTokenByRefreshToken called",
-            request.correlationId
+            request.correlationId || ""
         );
         const validRequest: CommonRefreshTokenRequest = {
             ...request,
             ...(await this.initializeBaseRequest(request)),
-            authenticationScheme: AuthenticationScheme.BEARER,
+            authenticationScheme: Constants.AuthenticationScheme.BEARER,
         };
 
         const serverTelemetryManager = this.initializeServerTelemetryManager(
@@ -251,7 +254,8 @@ export abstract class ClientApplication {
                     serverTelemetryManager
                 );
             const refreshTokenClient = new RefreshTokenClient(
-                refreshTokenClientConfig
+                refreshTokenClientConfig,
+                new StubPerformanceClient()
             );
             this.logger.verbose(
                 "Refresh token client created",
@@ -307,7 +311,10 @@ export abstract class ClientApplication {
                     validRequest.redirectUri || "",
                     serverTelemetryManager
                 );
-            const silentFlowClient = new SilentFlowClient(clientConfiguration);
+            const silentFlowClient = new SilentFlowClient(
+                clientConfiguration,
+                new StubPerformanceClient()
+            );
             this.logger.verbose(
                 "Silent flow client created",
                 validRequest.correlationId
@@ -327,7 +334,8 @@ export abstract class ClientApplication {
                         ClientAuthErrorCodes.tokenRefreshRequired
                 ) {
                     const refreshTokenClient = new RefreshTokenClient(
-                        clientConfiguration
+                        clientConfiguration,
+                        new StubPerformanceClient()
                     );
                     return refreshTokenClient.acquireTokenByRefreshToken(
                         validRequest,
@@ -355,16 +363,18 @@ export abstract class ClientApplication {
                 ...validRequest,
                 scopes: validRequest.scopes?.length
                     ? validRequest.scopes
-                    : [...OIDC_DEFAULT_SCOPES],
+                    : [...Constants.OIDC_DEFAULT_SCOPES],
             });
 
-        if (cacheOutcome === CacheOutcome.PROACTIVELY_REFRESHED) {
+        if (cacheOutcome === Constants.CacheOutcome.PROACTIVELY_REFRESHED) {
             this.logger.info(
-                "ClientApplication:acquireCachedTokenSilent - Cached access token's refreshOn property has been exceeded'. It's not expired, but must be refreshed."
+                "ClientApplication:acquireCachedTokenSilent - Cached access token's refreshOn property has been exceeded'. It's not expired, but must be refreshed.",
+                validRequest.correlationId
             );
             // refresh the access token in the background
             const refreshTokenClient = new RefreshTokenClient(
-                clientConfiguration
+                clientConfiguration,
+                new StubPerformanceClient()
             );
 
             try {
@@ -397,7 +407,7 @@ export abstract class ClientApplication {
     ): Promise<AuthenticationResult | null> {
         this.logger.info(
             "acquireTokenByUsernamePassword called",
-            request.correlationId
+            request.correlationId || ""
         );
         const validRequest: CommonUsernamePasswordRequest = {
             ...request,
@@ -442,7 +452,7 @@ export abstract class ClientApplication {
      * Gets the token cache for the application.
      */
     getTokenCache(): TokenCache {
-        this.logger.info("getTokenCache called");
+        this.logger.info("getTokenCache called", "");
         return this.tokenCache;
     }
 
@@ -511,6 +521,7 @@ export abstract class ClientApplication {
                 authority: discoveredAuthority,
                 clientCapabilities: this.config.auth.clientCapabilities,
                 redirectUri,
+                isMcp: this.config.auth.isMcp,
             },
             loggerOptions: {
                 logLevel: this.config.system.loggerOptions.logLevel,
@@ -519,10 +530,6 @@ export abstract class ClientApplication {
                     this.config.system.loggerOptions.piiLoggingEnabled,
                 correlationId: requestCorrelationId,
             },
-            cacheOptions: {
-                claimsBasedCachingEnabled:
-                    this.config.cache.claimsBasedCachingEnabled,
-            },
             cryptoInterface: this.cryptoProvider,
             networkInterface: this.config.system.networkClient,
             storageInterface: this.storage,
@@ -536,8 +543,8 @@ export abstract class ClientApplication {
             libraryInfo: {
                 sku: NodeConstants.MSAL_SKU,
                 version: version,
-                cpu: process.arch || Constants.EMPTY_STRING,
-                os: process.platform || Constants.EMPTY_STRING,
+                cpu: process.arch || "",
+                os: process.platform || "",
             },
             telemetry: this.config.telemetry,
             persistencePlugin: this.config.cache.cachePlugin,
@@ -579,43 +586,31 @@ export abstract class ClientApplication {
     protected async initializeBaseRequest(
         authRequest: Partial<BaseAuthRequest>
     ): Promise<BaseAuthRequest> {
-        this.logger.verbose(
-            "initializeRequestScopes called",
-            authRequest.correlationId
-        );
+        const correlationId =
+            authRequest.correlationId || this.cryptoProvider.createNewGuid();
+        this.logger.verbose("initializeRequestScopes called", correlationId);
         // Default authenticationScheme to Bearer, log that POP isn't supported yet
         if (
             authRequest.authenticationScheme &&
-            authRequest.authenticationScheme === AuthenticationScheme.POP
+            authRequest.authenticationScheme ===
+                Constants.AuthenticationScheme.POP
         ) {
             this.logger.verbose(
                 "Authentication Scheme 'pop' is not supported yet, setting Authentication Scheme to 'Bearer' for request",
-                authRequest.correlationId
+                correlationId
             );
         }
 
-        authRequest.authenticationScheme = AuthenticationScheme.BEARER;
-
-        // Set requested claims hash if claims-based caching is enabled and claims were requested
-        if (
-            this.config.cache.claimsBasedCachingEnabled &&
-            authRequest.claims &&
-            // Checks for empty stringified object "{}" which doesn't qualify as requested claims
-            !StringUtils.isEmptyObj(authRequest.claims)
-        ) {
-            authRequest.requestedClaimsHash =
-                await this.cryptoProvider.hashString(authRequest.claims);
-        }
+        authRequest.authenticationScheme =
+            Constants.AuthenticationScheme.BEARER;
 
         return {
             ...authRequest,
             scopes: [
                 ...((authRequest && authRequest.scopes) || []),
-                ...OIDC_DEFAULT_SCOPES,
+                ...Constants.OIDC_DEFAULT_SCOPES,
             ],
-            correlationId:
-                (authRequest && authRequest.correlationId) ||
-                this.cryptoProvider.createNewGuid(),
+            correlationId,
             authority: authRequest.authority || this.config.auth.authority,
         };
     }
@@ -661,13 +656,11 @@ export abstract class ClientApplication {
         );
 
         const authorityOptions: AuthorityOptions = {
-            protocolMode: this.config.auth.protocolMode,
+            protocolMode: this.config.system.protocolMode,
             knownAuthorities: this.config.auth.knownAuthorities,
             cloudDiscoveryMetadata: this.config.auth.cloudDiscoveryMetadata,
             authorityMetadata: this.config.auth.authorityMetadata,
             azureRegionConfiguration,
-            skipAuthorityMetadataCache:
-                this.config.auth.skipAuthorityMetadataCache,
         };
 
         return AuthorityFactory.createDiscoveredInstance(
@@ -676,7 +669,8 @@ export abstract class ClientApplication {
             this.storage,
             authorityOptions,
             this.logger,
-            requestCorrelationId
+            requestCorrelationId,
+            new StubPerformanceClient()
         );
     }
 

package/dist/tedious/node_modules/@azure/msal-node/src/client/ClientAssertion.ts

@@ -6,14 +6,13 @@
 import jwt from "jsonwebtoken";
 import {
     TimeUtils,
-    Constants,
     createClientAuthError,
-    ClientAuthErrorCodes,
-    EncodingTypes,
+    Constants,
 } from "@azure/msal-common/node";
 import { CryptoProvider } from "../crypto/CryptoProvider.js";
 import { EncodingUtils } from "../utils/EncodingUtils.js";
 import { JwtConstants } from "../utils/Constants.js";
+import * as NodeClientAuthErrorCodes from "../error/ClientAuthErrorCodes.js";
 
 /**
  * Client assertion of type jwt-bearer used in confidential client flows
@@ -117,7 +116,7 @@ export class ClientAssertion {
             return this.jwt;
         }
 
-        throw createClientAuthError(ClientAuthErrorCodes.invalidAssertion);
+        throw createClientAuthError(NodeClientAuthErrorCodes.invalidAssertion);
     }
 
     /**
@@ -146,7 +145,7 @@ export class ClientAssertion {
         Object.assign(header, {
             [thumbprintHeader]: EncodingUtils.base64EncodeUrl(
                 this.thumbprint,
-                EncodingTypes.HEX
+                Constants.EncodingTypes.HEX
             ),
         } as Partial<jwt.JwtHeader>);
 
@@ -195,7 +194,7 @@ export class ClientAssertion {
         let matches;
         while ((matches = regexToFindCerts.exec(publicCertificate)) !== null) {
             // matches[1] represents the first parens capture group in the regex.
-            certs.push(matches[1].replace(/\r*\n/g, Constants.EMPTY_STRING));
+            certs.push(matches[1].replace(/\r*\n/g, ""));
         }
 
         return certs;

package/dist/tedious/node_modules/@azure/msal-node/src/client/ClientCredentialClient.ts

@@ -6,19 +6,12 @@
 import {
     AccessTokenEntity,
     AuthenticationResult,
-    AuthenticationScheme,
     Authority,
-    BaseClient,
     CacheManager,
-    CacheOutcome,
     ClientAuthErrorCodes,
     ClientConfiguration,
-    CommonClientCredentialRequest,
     Constants,
     CredentialFilter,
-    CredentialType,
-    DEFAULT_TOKEN_RENEWAL_OFFSET_SEC,
-    GrantType,
     IAppTokenProvider,
     ICrypto,
     RequestParameterBuilder,
@@ -36,11 +29,13 @@ import {
     getClientAssertion,
     UrlUtils,
 } from "@azure/msal-common/node";
+import { ApiId } from "../utils/Constants.js";
 import {
     ManagedIdentityConfiguration,
     ManagedIdentityNodeConfiguration,
 } from "../config/Configuration.js";
-import { ApiId } from "../utils/Constants.js";
+import { CommonClientCredentialRequest } from "../request/CommonClientCredentialRequest.js";
+import { BaseClient } from "./BaseClient.js";
 
 /**
  * OAuth2.0 client credential grant
@@ -80,9 +75,13 @@ export class ClientCredentialClient extends BaseClient {
 
         if (cachedAuthenticationResult) {
             // if the token is not expired but must be refreshed; get a new one in the background
-            if (lastCacheOutcome === CacheOutcome.PROACTIVELY_REFRESHED) {
+            if (
+                lastCacheOutcome ===
+                Constants.CacheOutcome.PROACTIVELY_REFRESHED
+            ) {
                 this.logger.info(
-                    "ClientCredentialClient:getCachedAuthenticationResult - Cached access token's refreshOn property has been exceeded'. It's not expired, but must be refreshed."
+                    "ClientCredentialClient:getCachedAuthenticationResult - Cached access token's refreshOn property has been exceeded'. It's not expired, but must be refreshed.",
+                    request.correlationId
                 );
 
                 // refresh the access token in the background
@@ -111,12 +110,13 @@ export class ClientCredentialClient extends BaseClient {
         authority: Authority,
         cacheManager: CacheManager,
         serverTelemetryManager?: ServerTelemetryManager | null
-    ): Promise<[AuthenticationResult | null, CacheOutcome]> {
+    ): Promise<[AuthenticationResult | null, Constants.CacheOutcome]> {
         const clientConfiguration = config as ClientConfiguration;
         const managedIdentityConfiguration =
             config as ManagedIdentityNodeConfiguration;
 
-        let lastCacheOutcome: CacheOutcome = CacheOutcome.NOT_APPLICABLE;
+        let lastCacheOutcome: Constants.CacheOutcome =
+            Constants.CacheOutcome.NOT_APPLICABLE;
 
         // read the user-supplied cache into memory, if applicable
         let cacheContext;
@@ -155,9 +155,9 @@ export class ClientCredentialClient extends BaseClient {
         // must refresh due to non-existent access_token
         if (!cachedAccessToken) {
             serverTelemetryManager?.setCacheOutcome(
-                CacheOutcome.NO_CACHED_ACCESS_TOKEN
+                Constants.CacheOutcome.NO_CACHED_ACCESS_TOKEN
             );
-            return [null, CacheOutcome.NO_CACHED_ACCESS_TOKEN];
+            return [null, Constants.CacheOutcome.NO_CACHED_ACCESS_TOKEN];
         }
 
         // must refresh due to the expires_in value
@@ -165,13 +165,13 @@ export class ClientCredentialClient extends BaseClient {
             TimeUtils.isTokenExpired(
                 cachedAccessToken.expiresOn,
                 clientConfiguration.systemOptions?.tokenRenewalOffsetSeconds ||
-                    DEFAULT_TOKEN_RENEWAL_OFFSET_SEC
+                    Constants.DEFAULT_TOKEN_RENEWAL_OFFSET_SEC
             )
         ) {
             serverTelemetryManager?.setCacheOutcome(
-                CacheOutcome.CACHED_ACCESS_TOKEN_EXPIRED
+                Constants.CacheOutcome.CACHED_ACCESS_TOKEN_EXPIRED
             );
-            return [null, CacheOutcome.CACHED_ACCESS_TOKEN_EXPIRED];
+            return [null, Constants.CacheOutcome.CACHED_ACCESS_TOKEN_EXPIRED];
         }
 
         // must refresh (in the background) due to the refresh_in value
@@ -179,9 +179,9 @@ export class ClientCredentialClient extends BaseClient {
             cachedAccessToken.refreshOn &&
             TimeUtils.isTokenExpired(cachedAccessToken.refreshOn.toString(), 0)
         ) {
-            lastCacheOutcome = CacheOutcome.PROACTIVELY_REFRESHED;
+            lastCacheOutcome = Constants.CacheOutcome.PROACTIVELY_REFRESHED;
             serverTelemetryManager?.setCacheOutcome(
-                CacheOutcome.PROACTIVELY_REFRESHED
+                Constants.CacheOutcome.PROACTIVELY_REFRESHED
             );
         }
 
@@ -197,7 +197,8 @@ export class ClientCredentialClient extends BaseClient {
                     appMetadata: null,
                 },
                 true,
-                request
+                request,
+                this.performanceClient
             ),
             lastCacheOutcome,
         ];
@@ -214,10 +215,10 @@ export class ClientCredentialClient extends BaseClient {
         correlationId: string
     ): AccessTokenEntity | null {
         const accessTokenFilter: CredentialFilter = {
-            homeAccountId: Constants.EMPTY_STRING,
+            homeAccountId: "",
             environment:
                 authority.canonicalAuthorityUrlComponents.HostNameAndPort,
-            credentialType: CredentialType.ACCESS_TOKEN,
+            credentialType: Constants.CredentialType.ACCESS_TOKEN,
             clientId: id,
             realm: authority.tenant,
             target: ScopeSet.createSearchScopes(scopeSet.asArray()),
@@ -251,7 +252,10 @@ export class ClientCredentialClient extends BaseClient {
         let reqTimestamp: number;
 
         if (this.appTokenProvider) {
-            this.logger.info("Using appTokenProvider extensibility.");
+            this.logger.info(
+                "Using appTokenProvider extensibility.",
+                request.correlationId
+            );
 
             const appTokenPropviderParameters = {
                 correlationId: request.correlationId,
@@ -269,7 +273,7 @@ export class ClientCredentialClient extends BaseClient {
                 access_token: appTokenProviderResult.accessToken,
                 expires_in: appTokenProviderResult.expiresInSeconds,
                 refresh_in: appTokenProviderResult.refreshInSeconds,
-                token_type: AuthenticationScheme.BEARER,
+                token_type: Constants.AuthenticationScheme.BEARER,
             };
         } else {
             const queryParametersString =
@@ -295,7 +299,8 @@ export class ClientCredentialClient extends BaseClient {
             };
 
             this.logger.info(
-                "Sending token request to endpoint: " + authority.tokenEndpoint
+                "Sending token request to endpoint: " + authority.tokenEndpoint,
+                request.correlationId
             );
 
             reqTimestamp = TimeUtils.nowSeconds();
@@ -316,12 +321,14 @@ export class ClientCredentialClient extends BaseClient {
             this.cacheManager,
             this.cryptoUtils,
             this.logger,
+            this.performanceClient,
             this.config.serializableCache,
             this.config.persistencePlugin
         );
 
         responseHandler.validateTokenResponse(
             serverTokenResponse,
+            request.correlationId,
             refreshAccessToken
         );
 
@@ -354,7 +361,7 @@ export class ClientCredentialClient extends BaseClient {
 
         RequestParameterBuilder.addGrantType(
             parameters,
-            GrantType.CLIENT_CREDENTIALS_GRANT
+            Constants.GrantType.CLIENT_CREDENTIALS_GRANT
         );
 
         RequestParameterBuilder.addLibraryInfo(