From 2d754ac7a9a602c33c64a01aaf463df52444e2ea Mon Sep 17 00:00:00 2001
From: Bogdan Gavril <bogavril@microsoft.com>
Date: Tue, 11 Jul 2023 12:36:59 +0100
Subject: [PATCH] fix test

---
 src/client/Microsoft.Identity.Client/Instance/Authority.cs     | 1 -
 src/client/Microsoft.Identity.Client/Instance/CiamAuthority.cs | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/Microsoft.Identity.Client/Instance/Authority.cs b/src/client/Microsoft.Identity.Client/Instance/Authority.cs
index e93f0a99db..b0f88d088c 100644
--- a/src/client/Microsoft.Identity.Client/Instance/Authority.cs
+++ b/src/client/Microsoft.Identity.Client/Instance/Authority.cs
@@ -116,7 +116,6 @@ internal virtual string GetTenantedAuthority(string tenantId, bool forceSpecifie
                 MsalError.TenantOverrideNonAad,
                 MsalErrorMessage.TenantOverrideNonAad);
         }
-    
 
         internal abstract Task<string> GetTokenEndpointAsync(RequestContext requestContext);
 
diff --git a/src/client/Microsoft.Identity.Client/Instance/CiamAuthority.cs b/src/client/Microsoft.Identity.Client/Instance/CiamAuthority.cs
index 5135c8fefd..95537e3e02 100644
--- a/src/client/Microsoft.Identity.Client/Instance/CiamAuthority.cs
+++ b/src/client/Microsoft.Identity.Client/Instance/CiamAuthority.cs
@@ -19,7 +19,8 @@ internal CiamAuthority(AuthorityInfo authorityInfo) :
 
         internal override string GetTenantedAuthority(string tenantId, bool forceSpecifiedTenant = false)
         {
-            if (!string.IsNullOrEmpty(tenantId))
+            if (!string.IsNullOrEmpty(tenantId) &&
+               (forceSpecifiedTenant || IsCommonOrganizationsOrConsumersTenant()))
             {
                 var authorityUri = AuthorityInfo.CanonicalAuthority;