From a9e7e86f9749ab5f8c32035051d0b49f7e61e8de Mon Sep 17 00:00:00 2001 From: Alvin So Date: Sat, 21 Feb 2026 12:13:36 +0800 Subject: [PATCH 1/2] fix: OIDC schema mismatch in SwaggerGen setup --- .../AbpSwaggerGenServiceCollectionExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerGenServiceCollectionExtensions.cs b/framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerGenServiceCollectionExtensions.cs index d63ca833eb..37413f51f3 100644 --- a/framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerGenServiceCollectionExtensions.cs +++ b/framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerGenServiceCollectionExtensions.cs @@ -104,7 +104,7 @@ public static class AbpSwaggerGenServiceCollectionExtensions options.AddSecurityRequirement(document => new OpenApiSecurityRequirement() { - [new OpenApiSecuritySchemeReference("oauth2", document)] = [] + [new OpenApiSecuritySchemeReference("oidc", document)] = [] }); setupAction?.Invoke(options); From ed0ad6408ee45471b23fb3383abd4a9629f9db44 Mon Sep 17 00:00:00 2001 From: maliming Date: Sun, 22 Feb 2026 15:48:56 +0800 Subject: [PATCH 2/2] Make OIDC auth scheme configurable --- .../AbpSwaggerGenServiceCollectionExtensions.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerGenServiceCollectionExtensions.cs b/framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerGenServiceCollectionExtensions.cs index 37413f51f3..b81aa8bf77 100644 --- a/framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerGenServiceCollectionExtensions.cs +++ b/framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerGenServiceCollectionExtensions.cs @@ -77,7 +77,8 @@ public static class AbpSwaggerGenServiceCollectionExtensions string[]? scopes = null, string[]? flows = null, string? discoveryEndpoint = null, - Action? setupAction = null) + Action? setupAction = null, + string oidcAuthenticationScheme = "oidc") { var discoveryUrl = discoveryEndpoint != null ? $"{discoveryEndpoint.TrimEnd('/')}/.well-known/openid-configuration": @@ -96,7 +97,7 @@ public static class AbpSwaggerGenServiceCollectionExtensions .AddSwaggerGen( options => { - options.AddSecurityDefinition("oidc", new OpenApiSecurityScheme + options.AddSecurityDefinition(oidcAuthenticationScheme, new OpenApiSecurityScheme { Type = SecuritySchemeType.OpenIdConnect, OpenIdConnectUrl = new Uri(RemoveTenantPlaceholders(discoveryUrl)) @@ -104,7 +105,7 @@ public static class AbpSwaggerGenServiceCollectionExtensions options.AddSecurityRequirement(document => new OpenApiSecurityRequirement() { - [new OpenApiSecuritySchemeReference("oidc", document)] = [] + [new OpenApiSecuritySchemeReference(oidcAuthenticationScheme, document)] = [] }); setupAction?.Invoke(options);