Skip to content

Ignore WithTenantId for B2C, Refactor AADAuthority Tenant Checks #3517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 1, 2022
Merged

Ignore WithTenantId for B2C, Refactor AADAuthority Tenant Checks #3517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
45aef72
Ignore WithTenantId for B2C, Refactor AADAuthority Tenant Checks
MichelZ Jul 24, 2022
647bd1b
Remove Mocks as they are not needed
MichelZ Jul 25, 2022
a3ad2b7
Fix comments
MichelZ Jul 25, 2022
f75b3bb
Merge branch 'main' into mize/resolve_authority_b2c
MichelZ Jul 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/client/Microsoft.Identity.Client/AppConfig/AbstractApplicationBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,9 +561,12 @@ private void ResolveAuthority()
{
if (Config.Authority?.AuthorityInfo != null)
{
var isB2C = Config.Authority is B2CAuthority;

AadAuthority aadAuthority = Config.Authority as AadAuthority;
if (!string.IsNullOrEmpty(Config.TenantId) &&
aadAuthority != null)
if (!string.IsNullOrEmpty(Config.TenantId)
&& !isB2C
&& aadAuthority != null )
{
if (!aadAuthority.IsCommonOrganizationsOrConsumersTenant() &&
!string.Equals(aadAuthority.TenantId, Config.TenantId))
Expand Down
17 changes: 10 additions & 7 deletions src/client/Microsoft.Identity.Client/Instance/AadAuthority.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,19 @@ internal AadAuthority(AuthorityInfo authorityInfo) : base(authorityInfo)

internal bool IsWorkAndSchoolOnly()
{
return !TenantId.Equals(Constants.CommonTenant) &&
!TenantId.Equals(Constants.ConsumerTenant) &&
!TenantId.Equals(Constants.MsaTenantId);
return !TenantId.Equals(Constants.CommonTenant, StringComparison.OrdinalIgnoreCase) &&
!IsConsumers(TenantId);
}

internal bool IsConsumers()
{
return TenantId.Equals(Constants.ConsumerTenant) ||
TenantId.Equals(Constants.MsaTenantId);
return IsConsumers(TenantId);
}

internal static bool IsConsumers(string tenantId)
{
return tenantId.Equals(Constants.ConsumerTenant, StringComparison.OrdinalIgnoreCase) ||
tenantId.Equals(Constants.MsaTenantId, StringComparison.OrdinalIgnoreCase);
}

internal bool IsCommonOrganizationsOrConsumersTenant()
Expand All @@ -54,7 +58,7 @@ internal bool IsCommonOrganizationsOrConsumersTenant()
internal static bool IsCommonOrganizationsOrConsumersTenant(string tenantId)
{
return !string.IsNullOrEmpty(tenantId) &&
s_tenantlessTenantNames.Contains(tenantId);
(IsCommonOrOrganizationsTenant(tenantId) || IsConsumers(tenantId));
}

internal bool IsCommonOrOrganizationsTenant()
Expand All @@ -65,7 +69,6 @@ internal bool IsCommonOrOrganizationsTenant()
internal static bool IsCommonOrOrganizationsTenant(string tenantId)
{
return !string.IsNullOrEmpty(tenantId) &&
tenantId != Constants.ConsumerTenant &&
s_tenantlessTenantNames.Contains(tenantId);
}

Expand Down
20 changes: 20 additions & 0 deletions tests/Microsoft.Identity.Test.Unit/PublicApiTests/PublicClientApplicationTestsWithB2C.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,26 @@ public async Task B2CAcquireTokenWithValidateAuthorityTrueAndRandomAuthorityTest
}
}

[TestMethod]
[TestCategory("B2C")]
[Description("Test against https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/3471")]
public void B2CIgnoreWithTenantId_Success()
{
PublicClientApplication app = PublicClientApplicationBuilder.Create(TestConstants.ClientId)
.WithAuthority(new Uri(TestConstants.B2CCustomDomain), true)
.WithTenantId(Guid.NewGuid().ToString("D"))
.BuildConcrete();

Assert.AreEqual(TestConstants.B2CCustomDomain, app.Authority);

app = PublicClientApplicationBuilder.Create(TestConstants.ClientId)
.WithAuthority(new Uri(TestConstants.B2CAuthority), true)
.WithTenantId(Guid.NewGuid().ToString("D"))
.BuildConcrete();

Assert.AreEqual(TestConstants.B2CAuthority, app.Authority);
}

[TestMethod]
[TestCategory("B2C")]
public void B2CAcquireTokenAuthorityHostMisMatchErrorTest()
Expand Down