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 b9fc9fb7bb..b895e86598 100644
--- a/framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerGenServiceCollectionExtensions.cs
+++ b/framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerGenServiceCollectionExtensions.cs
@@ -97,6 +97,8 @@ public static class AbpSwaggerGenServiceCollectionExtensions
         {
             swaggerUiOptions.ConfigObject.AdditionalItems["oidcSupportedFlows"] = flows;
             swaggerUiOptions.ConfigObject.AdditionalItems["oidcSupportedScopes"] = scopes;
+            swaggerUiOptions.ConfigObject.AdditionalItems["oidcAuthority"] = authority;
+            swaggerUiOptions.ConfigObject.AdditionalItems["oidcDiscoveryEndpoint"] = discoveryEndpoint;
         });
         
         return services
diff --git a/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js b/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js
index 8c1ef922d6..c44937e961 100644
--- a/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js
+++ b/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js
@@ -1,19 +1,21 @@
 var abp = abp || {};
 
-(function() {
+(function () {
 
-    abp.SwaggerUIBundle = function(configObject) {
+    abp.SwaggerUIBundle = function (configObject) {
 
         var excludeUrl = ["swagger.json", "connect/token"]
         var firstRequest = true;
         var oidcSupportedFlows = configObject.oidcSupportedFlows || [];
         var oidcSupportedScopes = configObject.oidcSupportedScopes || [];
+        var oidcAuthority = configObject.oidcAuthority || [];
+        var oidcDiscoveryEndpoint = configObject.oidcDiscoveryEndpoint || [];
         abp.appPath = configObject.baseUrl || abp.appPath;
 
         var requestInterceptor = configObject.requestInterceptor;
         var responseInterceptor = configObject.responseInterceptor;
 
-        configObject.requestInterceptor = async function(request) {
+        configObject.requestInterceptor = async function (request) {
 
             if (request.url.includes(excludeUrl[1])) {
                 firstRequest = true;
@@ -25,6 +27,10 @@ var abp = abp || {};
                 });
                 firstRequest = false;
             }
+            // Intercept .well-known request when the discoveryEndpoint is provided
+            if (!firstRequest && oidcDiscoveryEndpoint.length !== 0 && request.url.includes(".well-known/openid-configuration")) {
+                request.url = new URL(oidcAuthority) + ".well-known/openid-configuration";
+            }
 
             var antiForgeryToken = abp.security.antiForgery.getToken();
             if (antiForgeryToken) {
@@ -41,18 +47,22 @@ var abp = abp || {};
             return request;
         };
 
-        configObject.responseInterceptor = async function(response) {
-            if(response.url.endsWith(".well-known/openid-configuration") && response.status === 200) {
+        configObject.responseInterceptor = async function (response) {
+            if (response.url.endsWith(".well-known/openid-configuration") && response.status === 200) {
                 var openIdConnectData = JSON.parse(response.text);
-                
-                if(oidcSupportedFlows.length > 0){
+
+                if (oidcDiscoveryEndpoint.length > 0) {
                     openIdConnectData.grant_types_supported = oidcSupportedFlows;
                 }
-                
-                if(oidcSupportedScopes.length > 0) {
+
+                if (oidcSupportedFlows.length > 0) {
+                    openIdConnectData.grant_types_supported = oidcSupportedFlows;
+                }
+
+                if (oidcSupportedScopes.length > 0) {
                     openIdConnectData.scopes_supported = oidcSupportedScopes;
                 }
-                
+
                 response.text = JSON.stringify(openIdConnectData);
             }