Skip to content

Commit 5a8912b

Browse files
trwalketrwalke
trwalke
and
trwalke
authored
Removing experimental feature Flag from WithFmiPath (#5206)
* Removing expiremental feature from WithFmiPath * Updating WithAdditionalCacheKeyComponents api * Fixing test --------- Co-authored-by: trwalke <[email protected]>
1 parent d822a74 commit 5a8912b

File tree

5 files changed

+1
-17
lines changed

5 files changed

+1
-17
lines changed

‎src/client/Microsoft.Identity.Client/ApiConfig/AcquireTokenForClientParameterBuilder.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,6 @@ public AcquireTokenForClientParameterBuilder WithPreferredAzureRegion(bool useAz
138138
/// </summary>
139139
public AcquireTokenForClientParameterBuilder WithFmiPath(string pathSuffix)
140140
{
141-
ValidateUseOfExperimentalFeature();
142-
143141
if (string.IsNullOrWhiteSpace(pathSuffix))
144142
{
145143
throw new ArgumentNullException(nameof(pathSuffix));

‎src/client/Microsoft.Identity.Client/Extensibility/AcquireTokenForClientBuilderExtensions.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ public static class AcquireTokenForClientBuilderExtensions
3030
internal static AcquireTokenForClientParameterBuilder WithAdditionalCacheKeyComponents(this AcquireTokenForClientParameterBuilder builder,
3131
IDictionary<string, string> cacheKeyComponents)
3232
{
33-
builder.ValidateUseOfExperimentalFeature();
34-
3533
if (cacheKeyComponents == null || cacheKeyComponents.Count == 0)
3634
{
3735
//no-op

‎tests/Microsoft.Identity.Test.Integration.netcore/HeadlessTests/FmiIntegrationTests.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ public async Task Flow1_RmaCredential_From_CertTestAsync()
5050
.Create(clientId)
5151
.WithAuthority("https://login.microsoftonline.com/f645ad92-e38d-4d1a-b510-d1b09a74a8ca", true)
5252
.WithExtraQueryParameters("dc=ESTS-PUB-SCUS-LZ1-FD000-TEST1") //Enables MSAL to target ESTS Test slice
53-
.WithExperimentalFeatures(true) //WithFmiPath is experimental so experimental features needs to be enabled on the app
5453
.WithCertificate(cert, sendX5C: true) //sendX5c enables SN+I auth which is required for FMI flows
5554
.BuildConcrete();
5655

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

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

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

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

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

‎tests/Microsoft.Identity.Test.Unit/PublicApiTests/CacheKeyExtensionTests.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ public async Task CacheExtWithInMemoryTestAsync()
5858
.WithRedirectUri(TestConstants.RedirectUri)
5959
.WithClientSecret(TestConstants.ClientSecret)
6060
.WithHttpManager(httpManager)
61-
.WithExperimentalFeatures()
6261
.BuildConcrete();
6362

6463
await RunHappyPathTest(app, httpManager).ConfigureAwait(false);
@@ -75,7 +74,6 @@ public async Task CacheExtWithSerializedCacheTestAsync()
7574
.WithRedirectUri(TestConstants.RedirectUri)
7675
.WithClientSecret(TestConstants.ClientSecret)
7776
.WithHttpManager(httpManager)
78-
.WithExperimentalFeatures()
7977
.BuildConcrete();
8078

8179
app.AppTokenCache.SetBeforeAccess(BeforeCacheAccess);
@@ -168,7 +166,6 @@ public async Task CacheExtEnsureStandardTokensDoNotClashTestAsync()
168166
.WithRedirectUri(TestConstants.RedirectUri)
169167
.WithClientSecret(TestConstants.ClientSecret)
170168
.WithHttpManager(httpManager)
171-
.WithExperimentalFeatures()
172169
.BuildConcrete();
173170

174171
var appCacheAccess = app.AppTokenCache.RecordAccess();
@@ -225,7 +222,6 @@ public async Task CacheExtEnsureNoComponentsAreAddedWithEmptyArrayTestAsync()
225222
.WithRedirectUri(TestConstants.RedirectUri)
226223
.WithClientSecret(TestConstants.ClientSecret)
227224
.WithHttpManager(httpManager)
228-
.WithExperimentalFeatures()
229225
.BuildConcrete();
230226

231227
var appCacheAccess = app.AppTokenCache.RecordAccess();
@@ -269,7 +265,7 @@ public async Task CacheExtEnsurePopKeysFunctionAsync()
269265
ConfidentialClientApplication app =
270266
ConfidentialClientApplicationBuilder.Create(TestConstants.ClientId)
271267
.WithClientSecret(TestConstants.ClientSecret)
272-
.WithExperimentalFeatures(true)
268+
.WithExperimentalFeatures()
273269
.WithHttpManager(httpManager)
274270
.BuildConcrete();
275271

@@ -318,7 +314,6 @@ public async Task CacheExtEnsureInputKeysAddedCorrectlyTestAsync()
318314
.WithRedirectUri(TestConstants.RedirectUri)
319315
.WithClientSecret(TestConstants.ClientSecret)
320316
.WithHttpManager(httpManager)
321-
.WithExperimentalFeatures()
322317
.BuildConcrete();
323318

324319
var appCacheAccess = app.AppTokenCache.RecordAccess();

‎tests/Microsoft.Identity.Test.Unit/PublicApiTests/FmiTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public async Task FmiEnsureWithFmiPathFunctions()
2828
.WithRedirectUri(TestConstants.RedirectUri)
2929
.WithClientSecret(TestConstants.ClientSecret)
3030
.WithHttpManager(httpManager)
31-
.WithExperimentalFeatures()
3231
.BuildConcrete();
3332

3433
var appCacheAccess = app.AppTokenCache.RecordAccess();

0 commit comments

Comments
 (0)