Browse Source

Merge branch 'dev' into pr/24913

pull/24913/head
maliming 7 months ago
parent
commit
4c1a2efc32
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
  1. 7
      framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerGenServiceCollectionExtensions.cs

7
framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerGenServiceCollectionExtensions.cs

@ -77,7 +77,8 @@ public static class AbpSwaggerGenServiceCollectionExtensions
string[]? scopes = null, string[]? scopes = null,
string[]? flows = null, string[]? flows = null,
string? discoveryEndpoint = null, string? discoveryEndpoint = null,
Action<SwaggerGenOptions>? setupAction = null) Action<SwaggerGenOptions>? setupAction = null,
string oidcAuthenticationScheme = "oidc")
{ {
var discoveryUrl = discoveryEndpoint != null ? var discoveryUrl = discoveryEndpoint != null ?
$"{discoveryEndpoint.TrimEnd('/')}/.well-known/openid-configuration": $"{discoveryEndpoint.TrimEnd('/')}/.well-known/openid-configuration":
@ -96,7 +97,7 @@ public static class AbpSwaggerGenServiceCollectionExtensions
.AddSwaggerGen( .AddSwaggerGen(
options => options =>
{ {
options.AddSecurityDefinition("oidc", new OpenApiSecurityScheme options.AddSecurityDefinition(oidcAuthenticationScheme, new OpenApiSecurityScheme
{ {
Type = SecuritySchemeType.OpenIdConnect, Type = SecuritySchemeType.OpenIdConnect,
OpenIdConnectUrl = new Uri(RemoveTenantPlaceholders(discoveryUrl)) OpenIdConnectUrl = new Uri(RemoveTenantPlaceholders(discoveryUrl))
@ -104,7 +105,7 @@ public static class AbpSwaggerGenServiceCollectionExtensions
options.AddSecurityRequirement(document => new OpenApiSecurityRequirement() options.AddSecurityRequirement(document => new OpenApiSecurityRequirement()
{ {
[new OpenApiSecuritySchemeReference("oauth2", document)] = [] [new OpenApiSecuritySchemeReference(oidcAuthenticationScheme, document)] = []
}); });
setupAction?.Invoke(options); setupAction?.Invoke(options);

Loading…
Cancel
Save