Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
#nullable enable
readonly Microsoft.Identity.Web.TokenAcquisition._certificatesObservers -> Microsoft.Identity.Web.Experimental.ICertificatesObserver![]!
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
#nullable enable
readonly Microsoft.Identity.Web.TokenAcquisition._certificatesObservers -> Microsoft.Identity.Web.Experimental.ICertificatesObserver![]!
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
#nullable enable
readonly Microsoft.Identity.Web.TokenAcquisition._certificatesObservers -> Microsoft.Identity.Web.Experimental.ICertificatesObserver![]!
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
#nullable enable
readonly Microsoft.Identity.Web.TokenAcquisition._certificatesObservers -> Microsoft.Identity.Web.Experimental.ICertificatesObserver![]!
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
#nullable enable
readonly Microsoft.Identity.Web.TokenAcquisition._certificatesObservers -> Microsoft.Identity.Web.Experimental.ICertificatesObserver![]!
30 changes: 19 additions & 11 deletions src/Microsoft.Identity.Web.TokenAcquisition/TokenAcquisition.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,12 @@ class OAuthConstants
protected readonly IServiceProvider _serviceProvider;
protected readonly ITokenAcquisitionHost _tokenAcquisitionHost;
protected readonly ICredentialsLoader _credentialsLoader;
protected readonly ICertificatesObserver? _certificatesObserver;
protected readonly ICertificatesObserver[] _certificatesObservers;
protected readonly IOptionsMonitor<TokenAcquisitionExtensionOptions>? tokenAcquisitionExtensionOptionsMonitor;

[Obsolete("Use _certificatesObservers instead.")]
protected readonly ICertificatesObserver? _certificatesObserver;

/// <summary>
/// Scopes which are already requested by MSAL.NET. They should not be re-requested;.
/// </summary>
Expand Down Expand Up @@ -106,7 +109,10 @@ public TokenAcquisition(
_serviceProvider = serviceProvider;
_tokenAcquisitionHost = tokenAcquisitionHost;
_credentialsLoader = credentialsLoader;
_certificatesObservers = [.. serviceProvider.GetServices<ICertificatesObserver>()];
#pragma warning disable CS0618 // Type or member is obsolete. Setup for backward compatibility.
_certificatesObserver = serviceProvider.GetService<ICertificatesObserver>();
#pragma warning restore CS0618 // Type or member is obsolete
tokenAcquisitionExtensionOptionsMonitor = serviceProvider.GetService<IOptionsMonitor<TokenAcquisitionExtensionOptions>>();
_miHttpFactory = serviceProvider.GetService<IManagedIdentityTestHttpClientFactory>();
}
Expand Down Expand Up @@ -1024,17 +1030,19 @@ private void NotifyCertificateSelection(
Exception? exception)
{
X509Certificate2 selectedCertificate = app.AppConfig.ClientCredentialCertificate;
if (_certificatesObserver != null
&& selectedCertificate != null)
if (selectedCertificate != null)
{
_certificatesObserver.OnClientCertificateChanged(
new CertificateChangeEventArg()
{
Action = action,
Certificate = app.AppConfig.ClientCredentialCertificate,
CredentialDescription = mergedOptions.ClientCredentials?.FirstOrDefault(c => c.Certificate == selectedCertificate),
ThrownException = exception,
});
for (int i = 0; i < _certificatesObservers.Length; i++)
{
_certificatesObservers[i].OnClientCertificateChanged(
new CertificateChangeEventArg()
{
Action = action,
Certificate = app.AppConfig.ClientCredentialCertificate,
CredentialDescription = mergedOptions.ClientCredentials?.FirstOrDefault(c => c.Certificate == selectedCertificate),
ThrownException = exception,
});
}
}
}

Expand Down
Loading