From fd3a83dcd81bdbc75e6804066ce2b6a08443e0b6 Mon Sep 17 00:00:00 2001 From: Senthamil Sindhu Date: Tue, 25 Jun 2024 15:37:08 -0700 Subject: [PATCH] Fix enableAadDataPlane feature flag behavior --- src/Common/CosmosClient.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Common/CosmosClient.ts b/src/Common/CosmosClient.ts index 2d3c82778..0dc2737d0 100644 --- a/src/Common/CosmosClient.ts +++ b/src/Common/CosmosClient.ts @@ -19,7 +19,10 @@ const _global = typeof self === "undefined" ? window : self; export const tokenProvider = async (requestInfo: Cosmos.RequestInfo) => { const { verb, resourceId, resourceType, headers } = requestInfo; - if (userContext.features.enableAadDataPlane || (userContext.dataPlaneRbacEnabled && userContext.apiType === "SQL")) { + if ( + (userContext.features.enableAadDataPlane && userContext.databaseAccount.properties.disableLocalAuth) || + (userContext.dataPlaneRbacEnabled && userContext.apiType === "SQL") + ) { if (!userContext.aadToken) { logConsoleError( `AAD token does not exist. Please use "Login for Entra ID" prior to performing Entra ID RBAC operations`,