Skip to content

Refactors loading cert in EntraMockResponsePlugin. Closes #1610 #1612

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
waldekmastykarz merged 3 commits into from
Apr 14, 2026
+5 −8
Merged

Refactors loading cert in EntraMockResponsePlugin. Closes #1610 #1612

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e05281
Refactors loading cert in EntraMockResponsePlugin. Closes #1610
waldekmastykarz Apr 11, 2026
ee2a4ec
Removes dead null check after GetRequiredService
waldekmastykarz Apr 11, 2026
caff7db
Merge branch 'main' into fix-1610
waldekmastykarz Apr 14, 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
13 changes: 5 additions & 8 deletions DevProxy.Plugins/Mocking/EntraMockResponsePlugin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using Microsoft.Extensions.Logging;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using Microsoft.Extensions.DependencyInjection;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Text.RegularExpressions;
Expand Down Expand Up @@ -39,7 +40,7 @@ public sealed class EntraMockResponsePlugin(
HttpClient httpClient,
ILogger<EntraMockResponsePlugin> logger,
ISet<UrlToWatch> urlsToWatch,
X509Certificate2 certificate,
IServiceProvider serviceProvider,
IProxyConfiguration proxyConfiguration,
IConfigurationSection pluginConfigurationSection) :
MockResponsePlugin(
Expand Down Expand Up @@ -147,18 +148,14 @@ private void UpdateIdToken(ref string body, ref bool changed)
changed = true;
}

private string GetKeyId() => certificate.Thumbprint ?? "";
private string GetKeyId() => serviceProvider.GetRequiredService<X509Certificate2>().Thumbprint ?? "";

private List<string> GetCertificateChain()
{
if (certificate is null)
{
return [];
}

var cert = serviceProvider.GetRequiredService<X509Certificate2>();
var collection = new X509Certificate2Collection
{
certificate
cert
};

var certificateChain = new List<string>();
Expand Down
Loading