Skip to content

Commit 74f8bfb

Browse files
authored
Merge branch 'main' into dharshanb/winui3Support
2 parents cee6bbb + c21e39b commit 74f8bfb

File tree

12 files changed

+71
-71
lines changed

12 files changed

+71
-71
lines changed

src/client/Microsoft.Identity.Client/ApiConfig/Parameters/AcquireTokenCommonParameters.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ internal async Task InitMtlsPopParametersAsync(IServiceBundle serviceBundle, Can
7575
CancellationToken = ct
7676
};
7777

78-
ClientAssertion ar = await cadc.GetAssertionAsync(opts, ct).ConfigureAwait(false);
78+
ClientSignedAssertion ar = await cadc.GetAssertionAsync(opts, ct).ConfigureAwait(false);
7979

8080
if (ar.TokenBindingCertificate == null)
8181
{

src/client/Microsoft.Identity.Client/AppConfig/ClientAssertion.cs renamed to src/client/Microsoft.Identity.Client/AppConfig/ClientSignedAssertion.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ namespace Microsoft.Identity.Client
88
/// <summary>
99
/// Container returned from <c>WithClientAssertion</c>.
1010
/// </summary>
11-
public class ClientAssertion
11+
public class ClientSignedAssertion
1212
{
1313
/// <summary>
1414
/// Represents the client assertion (JWT) and optional mutual‑TLS binding certificate returned
1515
/// by the <c>clientAssertionProvider</c> callback supplied to
16-
/// <see cref="ConfidentialClientApplicationBuilder.WithClientAssertion(System.Func{AssertionRequestOptions, System.Threading.CancellationToken, System.Threading.Tasks.Task{ClientAssertion}})"/>.
16+
/// <see cref="ConfidentialClientApplicationBuilder.WithClientAssertion(System.Func{AssertionRequestOptions, System.Threading.CancellationToken, System.Threading.Tasks.Task{ClientSignedAssertion}})"/>.
1717
/// </summary>
1818
/// <remarks>
1919
/// MSAL forwards <see cref="Assertion"/> to the token endpoint as the <c>client_assertion</c> parameter.

src/client/Microsoft.Identity.Client/AppConfig/ConfidentialClientApplicationBuilder.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ public ConfidentialClientApplicationBuilder WithClientAssertion(Func<string> cli
230230

231231
return WithClientAssertion(
232232
(opts, ct) =>
233-
Task.FromResult(new ClientAssertion
233+
Task.FromResult(new ClientSignedAssertion
234234
{
235235
Assertion = clientAssertionDelegate() // bearer
236236
}));
@@ -255,7 +255,7 @@ public ConfidentialClientApplicationBuilder WithClientAssertion(Func<Cancellatio
255255
async (opts, ct) =>
256256
{
257257
string jwt = await clientAssertionAsyncDelegate(ct).ConfigureAwait(false);
258-
return new ClientAssertion { Assertion = jwt }; // bearer
258+
return new ClientSignedAssertion { Assertion = jwt }; // bearer
259259
});
260260
}
261261

@@ -277,7 +277,7 @@ public ConfidentialClientApplicationBuilder WithClientAssertion(Func<AssertionRe
277277
async (opts, _) =>
278278
{
279279
string jwt = await clientAssertionAsyncDelegate(opts).ConfigureAwait(false);
280-
return new ClientAssertion { Assertion = jwt }; // bearer
280+
return new ClientSignedAssertion { Assertion = jwt }; // bearer
281281
});
282282
}
283283

@@ -287,16 +287,16 @@ public ConfidentialClientApplicationBuilder WithClientAssertion(Func<AssertionRe
287287
/// <remarks>This method allows the client application to authenticate using a custom client
288288
/// assertion, which can be useful in scenarios where the assertion needs to be dynamically generated or
289289
/// retrieved.</remarks>
290-
/// <param name="clientAssertionProvider">A delegate that asynchronously provides an <see cref="ClientAssertion"/> based on the given <see
290+
/// <param name="clientSignedAssertionProvider">A delegate that asynchronously provides an <see cref="ClientSignedAssertion"/> based on the given <see
291291
/// cref="AssertionRequestOptions"/> and <see cref="CancellationToken"/>. This delegate must not be <see
292292
/// langword="null"/>.</param>
293293
/// <returns>The <see cref="ConfidentialClientApplicationBuilder"/> instance configured with the specified client
294294
/// assertion.</returns>
295-
/// <exception cref="MsalClientException">Thrown if <paramref name="clientAssertionProvider"/> is <see langword="null"/>.</exception>
295+
/// <exception cref="MsalClientException">Thrown if <paramref name="clientSignedAssertionProvider"/> is <see langword="null"/>.</exception>
296296
public ConfidentialClientApplicationBuilder WithClientAssertion(Func<AssertionRequestOptions,
297-
CancellationToken, Task<ClientAssertion>> clientAssertionProvider)
297+
CancellationToken, Task<ClientSignedAssertion>> clientSignedAssertionProvider)
298298
{
299-
Config.ClientCredential = new ClientAssertionDelegateCredential(clientAssertionProvider);
299+
Config.ClientCredential = new ClientAssertionDelegateCredential(clientSignedAssertionProvider);
300300
return this;
301301
}
302302

src/client/Microsoft.Identity.Client/Internal/ClientCredential/ClientAssertionDelegateCredential.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ namespace Microsoft.Identity.Client.Internal.ClientCredential
1717
{
1818
/// <summary>
1919
/// Handles client assertions supplied via a delegate that returns an
20-
/// <see cref="ClientAssertion"/> (JWT + optional certificate bound for mTLS‑PoP).
20+
/// <see cref="ClientSignedAssertion"/> (JWT + optional certificate bound for mTLS‑PoP).
2121
/// </summary>
2222
internal sealed class ClientAssertionDelegateCredential : IClientCredential
2323
{
24-
private readonly Func<AssertionRequestOptions, CancellationToken, Task<ClientAssertion>> _provider;
24+
private readonly Func<AssertionRequestOptions, CancellationToken, Task<ClientSignedAssertion>> _provider;
2525

26-
internal Task<ClientAssertion> GetAssertionAsync(
26+
internal Task<ClientSignedAssertion> GetAssertionAsync(
2727
AssertionRequestOptions options,
2828
CancellationToken cancellationToken) =>
2929
_provider(options, cancellationToken);
3030

3131
public ClientAssertionDelegateCredential(
32-
Func<AssertionRequestOptions, CancellationToken, Task<ClientAssertion>> provider)
32+
Func<AssertionRequestOptions, CancellationToken, Task<ClientSignedAssertion>> provider)
3333
{
3434
_provider = provider ?? throw new ArgumentNullException(nameof(provider));
3535
}
@@ -56,7 +56,7 @@ public async Task AddConfidentialClientParametersAsync(
5656
ClientAssertionFmiPath = p.ClientAssertionFmiPath
5757
};
5858

59-
ClientAssertion resp = await _provider(opts, ct).ConfigureAwait(false);
59+
ClientSignedAssertion resp = await _provider(opts, ct).ConfigureAwait(false);
6060

6161
if (string.IsNullOrWhiteSpace(resp?.Assertion))
6262
{
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const Microsoft.Identity.Client.MsalError.InvalidClientAssertion = "invalid_client_assertion" -> string
2-
Microsoft.Identity.Client.ClientAssertion
3-
Microsoft.Identity.Client.ClientAssertion.Assertion.get -> string
4-
Microsoft.Identity.Client.ClientAssertion.Assertion.set -> void
5-
Microsoft.Identity.Client.ClientAssertion.ClientAssertion() -> void
6-
Microsoft.Identity.Client.ClientAssertion.TokenBindingCertificate.get -> System.Security.Cryptography.X509Certificates.X509Certificate2
7-
Microsoft.Identity.Client.ClientAssertion.TokenBindingCertificate.set -> void
8-
Microsoft.Identity.Client.ConfidentialClientApplicationBuilder.WithClientAssertion(System.Func<Microsoft.Identity.Client.AssertionRequestOptions, System.Threading.CancellationToken, System.Threading.Tasks.Task<Microsoft.Identity.Client.ClientAssertion>> clientAssertionProvider) -> Microsoft.Identity.Client.ConfidentialClientApplicationBuilder
2+
Microsoft.Identity.Client.ClientSignedAssertion
3+
Microsoft.Identity.Client.ClientSignedAssertion.Assertion.get -> string
4+
Microsoft.Identity.Client.ClientSignedAssertion.Assertion.set -> void
5+
Microsoft.Identity.Client.ClientSignedAssertion.ClientSignedAssertion() -> void
6+
Microsoft.Identity.Client.ClientSignedAssertion.TokenBindingCertificate.get -> System.Security.Cryptography.X509Certificates.X509Certificate2
7+
Microsoft.Identity.Client.ClientSignedAssertion.TokenBindingCertificate.set -> void
8+
Microsoft.Identity.Client.ConfidentialClientApplicationBuilder.WithClientAssertion(System.Func<Microsoft.Identity.Client.AssertionRequestOptions, System.Threading.CancellationToken, System.Threading.Tasks.Task<Microsoft.Identity.Client.ClientSignedAssertion>> clientSignedAssertionProvider) -> Microsoft.Identity.Client.ConfidentialClientApplicationBuilder
99
static Microsoft.Identity.Client.Extensibility.AcquireTokenForClientBuilderExtensions.WithExtraBodyParameters(this Microsoft.Identity.Client.AcquireTokenForClientParameterBuilder builder, System.Collections.Generic.Dictionary<string, System.Func<System.Threading.CancellationToken, System.Threading.Tasks.Task<string>>> extrabodyparams) -> Microsoft.Identity.Client.AcquireTokenForClientParameterBuilder
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const Microsoft.Identity.Client.MsalError.InvalidClientAssertion = "invalid_client_assertion" -> string
2-
Microsoft.Identity.Client.ClientAssertion
3-
Microsoft.Identity.Client.ClientAssertion.Assertion.get -> string
4-
Microsoft.Identity.Client.ClientAssertion.Assertion.set -> void
5-
Microsoft.Identity.Client.ClientAssertion.ClientAssertion() -> void
6-
Microsoft.Identity.Client.ClientAssertion.TokenBindingCertificate.get -> System.Security.Cryptography.X509Certificates.X509Certificate2
7-
Microsoft.Identity.Client.ClientAssertion.TokenBindingCertificate.set -> void
8-
Microsoft.Identity.Client.ConfidentialClientApplicationBuilder.WithClientAssertion(System.Func<Microsoft.Identity.Client.AssertionRequestOptions, System.Threading.CancellationToken, System.Threading.Tasks.Task<Microsoft.Identity.Client.ClientAssertion>> clientAssertionProvider) -> Microsoft.Identity.Client.ConfidentialClientApplicationBuilder
2+
Microsoft.Identity.Client.ClientSignedAssertion
3+
Microsoft.Identity.Client.ClientSignedAssertion.Assertion.get -> string
4+
Microsoft.Identity.Client.ClientSignedAssertion.Assertion.set -> void
5+
Microsoft.Identity.Client.ClientSignedAssertion.ClientSignedAssertion() -> void
6+
Microsoft.Identity.Client.ClientSignedAssertion.TokenBindingCertificate.get -> System.Security.Cryptography.X509Certificates.X509Certificate2
7+
Microsoft.Identity.Client.ClientSignedAssertion.TokenBindingCertificate.set -> void
8+
Microsoft.Identity.Client.ConfidentialClientApplicationBuilder.WithClientAssertion(System.Func<Microsoft.Identity.Client.AssertionRequestOptions, System.Threading.CancellationToken, System.Threading.Tasks.Task<Microsoft.Identity.Client.ClientSignedAssertion>> clientSignedAssertionProvider) -> Microsoft.Identity.Client.ConfidentialClientApplicationBuilder
99
static Microsoft.Identity.Client.Extensibility.AcquireTokenForClientBuilderExtensions.WithExtraBodyParameters(this Microsoft.Identity.Client.AcquireTokenForClientParameterBuilder builder, System.Collections.Generic.Dictionary<string, System.Func<System.Threading.CancellationToken, System.Threading.Tasks.Task<string>>> extrabodyparams) -> Microsoft.Identity.Client.AcquireTokenForClientParameterBuilder
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const Microsoft.Identity.Client.MsalError.InvalidClientAssertion = "invalid_client_assertion" -> string
2-
Microsoft.Identity.Client.ClientAssertion
3-
Microsoft.Identity.Client.ClientAssertion.Assertion.get -> string
4-
Microsoft.Identity.Client.ClientAssertion.Assertion.set -> void
5-
Microsoft.Identity.Client.ClientAssertion.ClientAssertion() -> void
6-
Microsoft.Identity.Client.ClientAssertion.TokenBindingCertificate.get -> System.Security.Cryptography.X509Certificates.X509Certificate2
7-
Microsoft.Identity.Client.ClientAssertion.TokenBindingCertificate.set -> void
8-
Microsoft.Identity.Client.ConfidentialClientApplicationBuilder.WithClientAssertion(System.Func<Microsoft.Identity.Client.AssertionRequestOptions, System.Threading.CancellationToken, System.Threading.Tasks.Task<Microsoft.Identity.Client.ClientAssertion>> clientAssertionProvider) -> Microsoft.Identity.Client.ConfidentialClientApplicationBuilder
2+
Microsoft.Identity.Client.ClientSignedAssertion
3+
Microsoft.Identity.Client.ClientSignedAssertion.Assertion.get -> string
4+
Microsoft.Identity.Client.ClientSignedAssertion.Assertion.set -> void
5+
Microsoft.Identity.Client.ClientSignedAssertion.ClientSignedAssertion() -> void
6+
Microsoft.Identity.Client.ClientSignedAssertion.TokenBindingCertificate.get -> System.Security.Cryptography.X509Certificates.X509Certificate2
7+
Microsoft.Identity.Client.ClientSignedAssertion.TokenBindingCertificate.set -> void
8+
Microsoft.Identity.Client.ConfidentialClientApplicationBuilder.WithClientAssertion(System.Func<Microsoft.Identity.Client.AssertionRequestOptions, System.Threading.CancellationToken, System.Threading.Tasks.Task<Microsoft.Identity.Client.ClientSignedAssertion>> clientSignedAssertionProvider) -> Microsoft.Identity.Client.ConfidentialClientApplicationBuilder
99
static Microsoft.Identity.Client.Extensibility.AcquireTokenForClientBuilderExtensions.WithExtraBodyParameters(this Microsoft.Identity.Client.AcquireTokenForClientParameterBuilder builder, System.Collections.Generic.Dictionary<string, System.Func<System.Threading.CancellationToken, System.Threading.Tasks.Task<string>>> extrabodyparams) -> Microsoft.Identity.Client.AcquireTokenForClientParameterBuilder
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const Microsoft.Identity.Client.MsalError.InvalidClientAssertion = "invalid_client_assertion" -> string
2-
Microsoft.Identity.Client.ClientAssertion
3-
Microsoft.Identity.Client.ClientAssertion.Assertion.get -> string
4-
Microsoft.Identity.Client.ClientAssertion.Assertion.set -> void
5-
Microsoft.Identity.Client.ClientAssertion.ClientAssertion() -> void
6-
Microsoft.Identity.Client.ClientAssertion.TokenBindingCertificate.get -> System.Security.Cryptography.X509Certificates.X509Certificate2
7-
Microsoft.Identity.Client.ClientAssertion.TokenBindingCertificate.set -> void
8-
Microsoft.Identity.Client.ConfidentialClientApplicationBuilder.WithClientAssertion(System.Func<Microsoft.Identity.Client.AssertionRequestOptions, System.Threading.CancellationToken, System.Threading.Tasks.Task<Microsoft.Identity.Client.ClientAssertion>> clientAssertionProvider) -> Microsoft.Identity.Client.ConfidentialClientApplicationBuilder
2+
Microsoft.Identity.Client.ClientSignedAssertion
3+
Microsoft.Identity.Client.ClientSignedAssertion.Assertion.get -> string
4+
Microsoft.Identity.Client.ClientSignedAssertion.Assertion.set -> void
5+
Microsoft.Identity.Client.ClientSignedAssertion.ClientSignedAssertion() -> void
6+
Microsoft.Identity.Client.ClientSignedAssertion.TokenBindingCertificate.get -> System.Security.Cryptography.X509Certificates.X509Certificate2
7+
Microsoft.Identity.Client.ClientSignedAssertion.TokenBindingCertificate.set -> void
8+
Microsoft.Identity.Client.ConfidentialClientApplicationBuilder.WithClientAssertion(System.Func<Microsoft.Identity.Client.AssertionRequestOptions, System.Threading.CancellationToken, System.Threading.Tasks.Task<Microsoft.Identity.Client.ClientSignedAssertion>> clientSignedAssertionProvider) -> Microsoft.Identity.Client.ConfidentialClientApplicationBuilder
99
static Microsoft.Identity.Client.Extensibility.AcquireTokenForClientBuilderExtensions.WithExtraBodyParameters(this Microsoft.Identity.Client.AcquireTokenForClientParameterBuilder builder, System.Collections.Generic.Dictionary<string, System.Func<System.Threading.CancellationToken, System.Threading.Tasks.Task<string>>> extrabodyparams) -> Microsoft.Identity.Client.AcquireTokenForClientParameterBuilder
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const Microsoft.Identity.Client.MsalError.InvalidClientAssertion = "invalid_client_assertion" -> string
2-
Microsoft.Identity.Client.ClientAssertion
3-
Microsoft.Identity.Client.ClientAssertion.Assertion.get -> string
4-
Microsoft.Identity.Client.ClientAssertion.Assertion.set -> void
5-
Microsoft.Identity.Client.ClientAssertion.ClientAssertion() -> void
6-
Microsoft.Identity.Client.ClientAssertion.TokenBindingCertificate.get -> System.Security.Cryptography.X509Certificates.X509Certificate2
7-
Microsoft.Identity.Client.ClientAssertion.TokenBindingCertificate.set -> void
8-
Microsoft.Identity.Client.ConfidentialClientApplicationBuilder.WithClientAssertion(System.Func<Microsoft.Identity.Client.AssertionRequestOptions, System.Threading.CancellationToken, System.Threading.Tasks.Task<Microsoft.Identity.Client.ClientAssertion>> clientAssertionProvider) -> Microsoft.Identity.Client.ConfidentialClientApplicationBuilder
2+
Microsoft.Identity.Client.ClientSignedAssertion
3+
Microsoft.Identity.Client.ClientSignedAssertion.Assertion.get -> string
4+
Microsoft.Identity.Client.ClientSignedAssertion.Assertion.set -> void
5+
Microsoft.Identity.Client.ClientSignedAssertion.ClientSignedAssertion() -> void
6+
Microsoft.Identity.Client.ClientSignedAssertion.TokenBindingCertificate.get -> System.Security.Cryptography.X509Certificates.X509Certificate2
7+
Microsoft.Identity.Client.ClientSignedAssertion.TokenBindingCertificate.set -> void
8+
Microsoft.Identity.Client.ConfidentialClientApplicationBuilder.WithClientAssertion(System.Func<Microsoft.Identity.Client.AssertionRequestOptions, System.Threading.CancellationToken, System.Threading.Tasks.Task<Microsoft.Identity.Client.ClientSignedAssertion>> clientSignedAssertionProvider) -> Microsoft.Identity.Client.ConfidentialClientApplicationBuilder
99
static Microsoft.Identity.Client.Extensibility.AcquireTokenForClientBuilderExtensions.WithExtraBodyParameters(this Microsoft.Identity.Client.AcquireTokenForClientParameterBuilder builder, System.Collections.Generic.Dictionary<string, System.Func<System.Threading.CancellationToken, System.Threading.Tasks.Task<string>>> extrabodyparams) -> Microsoft.Identity.Client.AcquireTokenForClientParameterBuilder
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const Microsoft.Identity.Client.MsalError.InvalidClientAssertion = "invalid_client_assertion" -> string
2-
Microsoft.Identity.Client.ClientAssertion
3-
Microsoft.Identity.Client.ClientAssertion.Assertion.get -> string
4-
Microsoft.Identity.Client.ClientAssertion.Assertion.set -> void
5-
Microsoft.Identity.Client.ClientAssertion.ClientAssertion() -> void
6-
Microsoft.Identity.Client.ClientAssertion.TokenBindingCertificate.get -> System.Security.Cryptography.X509Certificates.X509Certificate2
7-
Microsoft.Identity.Client.ClientAssertion.TokenBindingCertificate.set -> void
8-
Microsoft.Identity.Client.ConfidentialClientApplicationBuilder.WithClientAssertion(System.Func<Microsoft.Identity.Client.AssertionRequestOptions, System.Threading.CancellationToken, System.Threading.Tasks.Task<Microsoft.Identity.Client.ClientAssertion>> clientAssertionProvider) -> Microsoft.Identity.Client.ConfidentialClientApplicationBuilder
2+
Microsoft.Identity.Client.ClientSignedAssertion
3+
Microsoft.Identity.Client.ClientSignedAssertion.Assertion.get -> string
4+
Microsoft.Identity.Client.ClientSignedAssertion.Assertion.set -> void
5+
Microsoft.Identity.Client.ClientSignedAssertion.ClientSignedAssertion() -> void
6+
Microsoft.Identity.Client.ClientSignedAssertion.TokenBindingCertificate.get -> System.Security.Cryptography.X509Certificates.X509Certificate2
7+
Microsoft.Identity.Client.ClientSignedAssertion.TokenBindingCertificate.set -> void
8+
Microsoft.Identity.Client.ConfidentialClientApplicationBuilder.WithClientAssertion(System.Func<Microsoft.Identity.Client.AssertionRequestOptions, System.Threading.CancellationToken, System.Threading.Tasks.Task<Microsoft.Identity.Client.ClientSignedAssertion>> clientSignedAssertionProvider) -> Microsoft.Identity.Client.ConfidentialClientApplicationBuilder
99
static Microsoft.Identity.Client.Extensibility.AcquireTokenForClientBuilderExtensions.WithExtraBodyParameters(this Microsoft.Identity.Client.AcquireTokenForClientParameterBuilder builder, System.Collections.Generic.Dictionary<string, System.Func<System.Threading.CancellationToken, System.Threading.Tasks.Task<string>>> extrabodyparams) -> Microsoft.Identity.Client.AcquireTokenForClientParameterBuilder

0 commit comments

Comments
 (0)