Skip to content

Fix ADFS tests for id4slab1 lab migration. #5810

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

Open
RyAuld wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Fix ADFS tests for id4slab1 lab migration. #5810

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
93bd19e
Re-enable ADFS tests for id4slab1 migration
RyAuld Mar 4, 2026
b480f88
Fix PopWhithAdfsUserAndBroker_Async cache environment after ADFS auth…
RyAuld Mar 5, 2026
8658c75
Fix ADFS interactive Selenium test failures
RyAuld Mar 5, 2026
45c2204
Fix all ADFS test failures for id4slab1 lab migration
RyAuld Mar 6, 2026
fd4eda5
Restore tests/Directory.Build.props to match main (MSAL_SKIP_FEDERATE…
RyAuld Mar 6, 2026
c1dd958
Merge branch 'main' into ryauld/ADFS-ReEnable
RyAuld Mar 6, 2026
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
2 changes: 2 additions & 0 deletions tests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
<PropertyGroup Condition="'$(PipelineType)' == 'OneBranch'">
<DefineConstants>$(DefineConstants);ONEBRANCH_BUILD</DefineConstants>
</PropertyGroup>
<!-- ADFS tests are enabled by default. Uncomment to allow pipeline to skip them via MSAL_SKIP_FEDERATED_TESTS=True.
<PropertyGroup Condition="'$(MSAL_SKIP_FEDERATED_TESTS)' == 'True'">
<DefineConstants>$(DefineConstants);IGNORE_FEDERATED</DefineConstants>
</PropertyGroup>
-->
</Project>
13 changes: 1 addition & 12 deletions tests/Microsoft.Identity.Test.Common/TestConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public static HashSet<string> s_scope
public const string AuthorityGuidTenant = "https://" + ProductionPrefNetworkEnvironment + "/" + TenantIdNumber1 + "/";
public const string AuthorityGuidTenant2 = "https://" + ProductionPrefNetworkEnvironment + "/" + TenantIdNumber2 + "/";
public const string AuthorityWindowsNet = "https://" + ProductionPrefCacheEnvironment + "/" + Utid + "/";
public const string ADFSAuthority = "https://fs.msidlab8.com/adfs/";
public const string ADFSAuthority = "https://fs.id4slab1.com/adfs/";
public const string ADFSAuthority2 = "https://someAdfs.com/adfs/";

public const string DstsAuthorityTenantless = "https://some.url.dsts.core.azure-test.net/dstsv2/";
Expand Down Expand Up @@ -639,15 +639,4 @@ public static MsalTokenResponse CreateAadTestTokenResponseWithMsalUserDefault()
#endregion
}

internal static class Adfs2019LabConstants
{
public const string Authority = "https://fs.msidlab8.com/adfs";
public const string AppId = "TestAppIdentifier";
public const string PublicClientId = "PublicClientId";
public const string ConfidentialClientId = "ConfidentialClientId";
public const string ClientRedirectUri = "http://localhost:8080";
public static readonly SortedSet<string> s_supportedScopes = new SortedSet<string>(new[] { "openid", "email", "profile" }, StringComparer.OrdinalIgnoreCase);
public const string ADFS2019ClientSecretURL = "https://id4skeyvault.vault.azure.net/secrets/ADFS2019ClientCredSecret/";
public const string ADFS2019ClientSecretName = "ADFS2019ClientCredSecret";
}
}
Loading