Skip to content

fix middleware crime #379

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
StuartFerguson merged 2 commits into from
Mar 27, 2026
Merged

fix middleware crime #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e56ce2
fix middleware crime
StuartFerguson Mar 27, 2026
f2f9bea
Merge branch 'master' into task/#374_duende_removal
StuartFerguson Mar 27, 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
76 changes: 31 additions & 45 deletions MessagingService/Bootstrapper/MiddlewareRegistry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@
using Microsoft.Extensions.Logging;
using Microsoft.IdentityModel.Tokens;
using Microsoft.OpenApi;
using OpenIddict.Client;
using Shared.Authorisation;

namespace MessagingService.Bootstrapper
{
using System;
using System.IO;
using System.Net.Http;
using Common;
using Lamar;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Diagnostics.HealthChecks;
using OpenIddict.Validation.AspNetCore;
using Shared.EventStore.Extensions;
using Shared.General;
using Shared.Middleware;
using Swashbuckle.AspNetCore.Filters;
using System;
using System.Diagnostics.CodeAnalysis;
using Microsoft.Extensions.Configuration;
using Shared.Middleware;
using System.IO;
using System.Net.Http;

[ExcludeFromCodeCoverage]
public class MiddlewareRegistry : ServiceRegistry
Expand Down Expand Up @@ -53,51 +53,37 @@ public MiddlewareRegistry() {
}

private void ConfigureAuthentication() {
//this.AddAuthentication(options =>
// {
// options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
// options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
// options.DefaultScheme = JwtBearerDefaults.AuthenticationScheme;
// })
// .AddJwtBearer(options =>
// {
// options.BackchannelHttpHandler = new HttpClientHandler
// {
// ServerCertificateCustomValidationCallback =
// (message, certificate, chain, sslPolicyErrors) => true
// };
// options.Authority = GetSecurityConfigSetting("Authority");
// options.Audience = GetSecurityConfigSetting("ApiName");

// options.TokenValidationParameters = new Microsoft.IdentityModel.Tokens.TokenValidationParameters()
// {
// ValidateAudience = false,
// ValidAudience = GetSecurityConfigSetting("ApiName"),
// ValidIssuer = GetSecurityConfigSetting("Authority"),
// };
// options.IncludeErrorDetails = true;
// });
this.AddAuthentication(options =>
{
options.DefaultScheme = OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme;
});

this.AddOpenIddict()
// Register the OpenIddict client components.
.AddClient(options => {
// Allow grant_type=client_credentials to be negotiated.
options.AllowClientCredentialsFlow();
.AddValidation(options =>
{
// Same as your Authority
options.SetIssuer(new Uri(GetSecurityConfigSetting("Authority")));

// Disable token storage, which is not necessary for non-interactive flows like
// grant_type=password, grant_type=client_credentials or grant_type=refresh_token.
options.DisableTokenStorage();
// Enables discovery and HTTP backchannel support
options.UseSystemNetHttp()
.ConfigureHttpClientHandler(handler =>
{
// DEV ONLY: bypass all certificate errors
handler.ServerCertificateCustomValidationCallback =
HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
});

// Register the System.Net.Http integration and use the identity of the current
// assembly as a more specific user agent, which can be useful when dealing with
// providers that use the user agent as a way to throttle requests (e.g Reddit).
options.UseSystemNetHttp().SetProductInformation(typeof(Program).Assembly);
// Register the ASP.NET Core integration
options.UseAspNetCore();

// Add a client registration matching the client application definition in the server project.
options.AddRegistration(new OpenIddictClientRegistration { Issuer = new Uri(GetSecurityConfigSetting("Authority"), UriKind.Absolute), ClientId = GetSecurityConfigSetting("ApiName") });
// Optionally set expected audience(s):
options.AddAudiences(GetSecurityConfigSetting("ApiName"));

});



this.AddAuthorization();


this.AddClientCredentialsOnlyPolicy();
this.AddClientCredentialsHandler();

Expand Down
3 changes: 2 additions & 1 deletion MessagingService/MessagingService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OpenIddict.Client.SystemNetHttp" Version="7.4.0" />
<PackageReference Include="OpenIddict.Validation.AspNetCore" Version="7.4.0" />
<PackageReference Include="OpenIddict.Validation.SystemNetHttp" Version="7.4.0" />
<PackageReference Include="Lamar" Version="15.0.1" />
<PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="15.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
Expand Down
Loading