Skip to content

Commit f717a5d

Browse files
authored
Simplified how we disable the TransportSecurityRequirement in OpenIddict (#16629)
1 parent 75c42f4 commit f717a5d

File tree

3 files changed

+16
-45
lines changed

3 files changed

+16
-45
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
using Microsoft.Extensions.Options;
2+
using OpenIddict.Server.AspNetCore;
3+
using Umbraco.Cms.Core.Configuration.Models;
4+
5+
namespace Umbraco.Cms.Api.Common.Configuration;
6+
7+
internal class ConfigureOpenIddict : IConfigureOptions<OpenIddictServerAspNetCoreOptions>
8+
{
9+
private readonly IOptions<GlobalSettings> _globalSettings;
10+
11+
public ConfigureOpenIddict(IOptions<GlobalSettings> globalSettings) => _globalSettings = globalSettings;
12+
13+
public void Configure(OpenIddictServerAspNetCoreOptions options)
14+
=> options.DisableTransportSecurityRequirement = _globalSettings.Value.UseHttps is false;
15+
}

src/Umbraco.Cms.Api.Common/Configuration/PostConfigureOpenIddict.cs

Lines changed: 0 additions & 44 deletions
This file was deleted.

src/Umbraco.Cms.Api.Common/DependencyInjection/UmbracoBuilderAuthExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,6 @@ private static void ConfigureOpenIddict(IUmbracoBuilder builder)
133133
});
134134

135135
builder.Services.AddRecurringBackgroundJob<OpenIddictCleanupJob>();
136-
builder.Services.ConfigureOptions<PostConfigureOpenIddict>();
136+
builder.Services.ConfigureOptions<ConfigureOpenIddict>();
137137
}
138138
}

0 commit comments

Comments
 (0)