Fix organizations tenant bug in sync client (#37457)

Azure · Nov 3, 2023 · 287045c · 287045c
1 parent 2e82a92
commit 287045c
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/...ty/azure-identity/src/main/java/com/azure/identity/implementation/IdentitySyncClient.java b/...ty/azure-identity/src/main/java/com/azure/identity/implementation/IdentitySyncClient.java
@@ -361,9 +361,8 @@ public AccessToken authenticateWithAzureCli(TokenRequestContext request) {
         String tenant = IdentityUtil.resolveTenantId(tenantId, request, options);
         ValidationUtil.validateTenantIdCharacterRange(tenant, LOGGER);
 
-        if (!CoreUtils.isNullOrEmpty(tenant)) {
+        if (!CoreUtils.isNullOrEmpty(tenant) && !tenant.equals(IdentityUtil.DEFAULT_TENANT)) {
             azCommand.append(" --tenant ").append(tenant);
-
         }
 
         try {
@@ -410,7 +409,7 @@ public AccessToken authenticateWithAzureDeveloperCli(TokenRequestContext request
         String tenant = IdentityUtil.resolveTenantId(tenantId, request, options);
         ValidationUtil.validateTenantIdCharacterRange(tenant, LOGGER);
 
-        if (!CoreUtils.isNullOrEmpty(tenant)) {
+        if (!CoreUtils.isNullOrEmpty(tenant) && !tenant.equals(IdentityUtil.DEFAULT_TENANT)) {
             azdCommand.append(" --tenant-id ").append(tenant);
         }