Skip to content

Removing experimental feature Flag from WithFmiPath #5206

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
bgavrilMS merged 3 commits into from
Mar 27, 2025
Merged

Removing experimental feature Flag from WithFmiPath #5206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a148768
Removing expiremental feature from WithFmiPath
Mar 21, 2025
82d815b
Updating WithAdditionalCacheKeyComponents api
Mar 21, 2025
a3451ef
Fixing test
Mar 21, 2025
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: 0 additions & 2 deletions src/client/Microsoft.Identity.Client/ApiConfig/AcquireTokenForClientParameterBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@ public AcquireTokenForClientParameterBuilder WithPreferredAzureRegion(bool useAz
/// </summary>
public AcquireTokenForClientParameterBuilder WithFmiPath(string pathSuffix)
{
ValidateUseOfExperimentalFeature();

if (string.IsNullOrWhiteSpace(pathSuffix))
{
throw new ArgumentNullException(nameof(pathSuffix));
Expand Down
2 changes: 0 additions & 2 deletions src/client/Microsoft.Identity.Client/Extensibility/AcquireTokenForClientBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ public static class AcquireTokenForClientBuilderExtensions
internal static AcquireTokenForClientParameterBuilder WithAdditionalCacheKeyComponents(this AcquireTokenForClientParameterBuilder builder,
IDictionary<string, string> cacheKeyComponents)
{
builder.ValidateUseOfExperimentalFeature();

if (cacheKeyComponents == null || cacheKeyComponents.Count == 0)
{
//no-op
Expand Down
6 changes: 0 additions & 6 deletions tests/Microsoft.Identity.Test.Integration.netcore/HeadlessTests/FmiIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ public async Task Flow1_RmaCredential_From_CertTestAsync()
.Create(clientId)
.WithAuthority("https://login.microsoftonline.com/f645ad92-e38d-4d1a-b510-d1b09a74a8ca", true)
.WithExtraQueryParameters("dc=ESTS-PUB-SCUS-LZ1-FD000-TEST1") //Enables MSAL to target ESTS Test slice
.WithExperimentalFeatures(true) //WithFmiPath is experimental so experimental features needs to be enabled on the app
.WithCertificate(cert, sendX5C: true) //sendX5c enables SN+I auth which is required for FMI flows
.BuildConcrete();

Expand Down Expand Up @@ -103,7 +102,6 @@ public async Task Flow2_RmaToken_From_CertTestAsync()
.Create(clientId)
.WithAuthority("https://login.microsoftonline.com/f645ad92-e38d-4d1a-b510-d1b09a74a8ca", true)
.WithExtraQueryParameters("dc=ESTS-PUB-SCUS-LZ1-FD000-TEST1") //Enables MSAL to target ESTS Test slice
.WithExperimentalFeatures(true) //WithFmiPath is experimental so experimental features needs to be enabled on the app
.WithCertificate(cert, sendX5C: true) //sendX5c enables SN+I auth which is required for FMI flows
.BuildConcrete();

Expand Down Expand Up @@ -156,7 +154,6 @@ public async Task Flow3_FmiCredential_From_RmaCredential()
.Create(clientId)
.WithAuthority("https://login.microsoftonline.com/f645ad92-e38d-4d1a-b510-d1b09a74a8ca", true)
.WithExtraQueryParameters("dc=ESTS-PUB-SCUS-LZ1-FD000-TEST1") //Enables MSAL to target ESTS Test slice
.WithExperimentalFeatures(true) //WithFmiPath is experimental so experimental features needs to be enabled on the app
.WithClientAssertion((options) => GetParentCredential(options)) //This api acquires the FMI credential needed to authenticate
.BuildConcrete();

Expand Down Expand Up @@ -209,7 +206,6 @@ public async Task Flow4_SubRma_FmiCredential_For_leaf()
.Create(clientId)
.WithAuthority("https://login.microsoftonline.com/f645ad92-e38d-4d1a-b510-d1b09a74a8ca", true)
.WithExtraQueryParameters("dc=ESTS-PUB-SCUS-LZ1-FD000-TEST1") //Enables MSAL to target ESTS Test slice
.WithExperimentalFeatures(true) //WithFmiPath is experimental so experimental features needs to be enabled on the app
.WithClientAssertion((options) => GetParentCredential(options)) //This api acquires the FMI credential needed to authenticate
.BuildConcrete();

Expand Down Expand Up @@ -262,7 +258,6 @@ public async Task Flow5_SubRma_FmiToken_From_FmiCred_For_leafTestAsync()
.Create(clientId)
.WithAuthority("https://login.microsoftonline.com/f645ad92-e38d-4d1a-b510-d1b09a74a8ca", true)
.WithExtraQueryParameters("dc=ESTS-PUB-SCUS-LZ1-FD000-TEST1") //Enables MSAL to target ESTS Test slice
.WithExperimentalFeatures(true) //WithFmiPath is experimental so experimental features needs to be enabled on the app
.WithClientAssertion((options) => GetParentCredential(options)) //This api acquires the FMI credential needed to authenticate
.BuildConcrete();

Expand Down Expand Up @@ -301,7 +296,6 @@ private static async Task<string> GetParentCredential(AssertionRequestOptions op
.Create(clientId)
.WithAuthority("https://login.microsoftonline.com/f645ad92-e38d-4d1a-b510-d1b09a74a8ca", true)
.WithExtraQueryParameters("dc=ESTS-PUB-SCUS-LZ1-FD000-TEST1") //Enables MSAL to target ESTS Test slice
.WithExperimentalFeatures(true) //WithFmiPath is experimental so experimental features needs to be enabled on the app
.WithCertificate(cert, sendX5C: true) //sendX5c enables SN+I auth which is required for FMI flows
.BuildConcrete();

Expand Down
7 changes: 1 addition & 6 deletions tests/Microsoft.Identity.Test.Unit/PublicApiTests/CacheKeyExtensionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ public async Task CacheExtWithInMemoryTestAsync()
.WithRedirectUri(TestConstants.RedirectUri)
.WithClientSecret(TestConstants.ClientSecret)
.WithHttpManager(httpManager)
.WithExperimentalFeatures()
.BuildConcrete();

await RunHappyPathTest(app, httpManager).ConfigureAwait(false);
Expand All @@ -75,7 +74,6 @@ public async Task CacheExtWithSerializedCacheTestAsync()
.WithRedirectUri(TestConstants.RedirectUri)
.WithClientSecret(TestConstants.ClientSecret)
.WithHttpManager(httpManager)
.WithExperimentalFeatures()
.BuildConcrete();

app.AppTokenCache.SetBeforeAccess(BeforeCacheAccess);
Expand Down Expand Up @@ -168,7 +166,6 @@ public async Task CacheExtEnsureStandardTokensDoNotClashTestAsync()
.WithRedirectUri(TestConstants.RedirectUri)
.WithClientSecret(TestConstants.ClientSecret)
.WithHttpManager(httpManager)
.WithExperimentalFeatures()
.BuildConcrete();

var appCacheAccess = app.AppTokenCache.RecordAccess();
Expand Down Expand Up @@ -225,7 +222,6 @@ public async Task CacheExtEnsureNoComponentsAreAddedWithEmptyArrayTestAsync()
.WithRedirectUri(TestConstants.RedirectUri)
.WithClientSecret(TestConstants.ClientSecret)
.WithHttpManager(httpManager)
.WithExperimentalFeatures()
.BuildConcrete();

var appCacheAccess = app.AppTokenCache.RecordAccess();
Expand Down Expand Up @@ -269,7 +265,7 @@ public async Task CacheExtEnsurePopKeysFunctionAsync()
ConfidentialClientApplication app =
ConfidentialClientApplicationBuilder.Create(TestConstants.ClientId)
.WithClientSecret(TestConstants.ClientSecret)
.WithExperimentalFeatures(true)
.WithExperimentalFeatures()
.WithHttpManager(httpManager)
.BuildConcrete();

Expand Down Expand Up @@ -318,7 +314,6 @@ public async Task CacheExtEnsureInputKeysAddedCorrectlyTestAsync()
.WithRedirectUri(TestConstants.RedirectUri)
.WithClientSecret(TestConstants.ClientSecret)
.WithHttpManager(httpManager)
.WithExperimentalFeatures()
.BuildConcrete();

var appCacheAccess = app.AppTokenCache.RecordAccess();
Expand Down
1 change: 0 additions & 1 deletion tests/Microsoft.Identity.Test.Unit/PublicApiTests/FmiTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ public async Task FmiEnsureWithFmiPathFunctions()
.WithRedirectUri(TestConstants.RedirectUri)
.WithClientSecret(TestConstants.ClientSecret)
.WithHttpManager(httpManager)
.WithExperimentalFeatures()
.BuildConcrete();

var appCacheAccess = app.AppTokenCache.RecordAccess();
Expand Down