From 5544a837038c4f4b8c94274e5bccc411e411be3f Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Thu, 20 Jan 2022 13:17:15 +0300 Subject: [PATCH] Updated gateways --- .../EShopOnAbpWebPublicGatewayModule.cs | 16 +++++++++++----- .../EShopOnAbp.WebPublicGateway/appsettings.json | 4 +--- .../EShopOnAbpWebGatewayModule.cs | 8 +++++--- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/EShopOnAbpWebPublicGatewayModule.cs b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/EShopOnAbpWebPublicGatewayModule.cs index b850de01..86d0fb5d 100644 --- a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/EShopOnAbpWebPublicGatewayModule.cs +++ b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/EShopOnAbpWebPublicGatewayModule.cs @@ -43,10 +43,12 @@ namespace EShopOnAbp.WebPublicGateway { var configuration = context.ServiceProvider.GetRequiredService(); var routes = configuration.GetSection("Routes").Get>(); - var routedServices = routes.GroupBy(t => t.ServiceKey).Select(r => r.First()).Distinct(); + var routedServices = routes + .GroupBy(t => t.ServiceKey) + .Select(r => r.First()) + .Distinct(); - //TODO : AccountService (AuthServer) doesn't have any swagger end point - foreach (var config in routedServices.Where(q => !q.ServiceKey.StartsWith("Account"))) + foreach (var config in routedServices) { var url = $"{config.DownstreamScheme}://{config.DownstreamHostAndPorts.FirstOrDefault()?.Host}:{config.DownstreamHostAndPorts.FirstOrDefault()?.Port}"; @@ -56,8 +58,12 @@ namespace EShopOnAbp.WebPublicGateway } options.SwaggerEndpoint($"{url}/swagger/v1/swagger.json", $"{config.ServiceKey} API"); - options.OAuthClientId(configuration["AuthServer:SwaggerClientId"]); - options.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]); + // options.OAuthClientId(configuration["AuthServer:SwaggerClientId"]); + // options.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]); + + // TODO: Find a way to get these configurations from related running applications settings. + // options.OAuthClientId($"{config.ServiceKey.Replace(" ","")}_Swagger"); + // options.OAuthClientSecret("1q2w3e*"); } }); app.UseAbpSerilogEnrichers(); diff --git a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/appsettings.json b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/appsettings.json index 613c332d..39f6f0a0 100644 --- a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/appsettings.json +++ b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/appsettings.json @@ -5,9 +5,7 @@ }, "AuthServer": { "Authority": "https://localhost:44330", - "RequireHttpsMetadata": "true", - "SwaggerClientId": "WebPublicGateway_Swagger", - "SwaggerClientSecret": "1q2w3e*" + "RequireHttpsMetadata": "true" }, "Logging": { "LogLevel": { diff --git a/gateways/web/src/EShopOnAbp.WebGateway/EShopOnAbpWebGatewayModule.cs b/gateways/web/src/EShopOnAbp.WebGateway/EShopOnAbpWebGatewayModule.cs index 8a3a855d..b7b2ee1f 100644 --- a/gateways/web/src/EShopOnAbp.WebGateway/EShopOnAbpWebGatewayModule.cs +++ b/gateways/web/src/EShopOnAbp.WebGateway/EShopOnAbpWebGatewayModule.cs @@ -63,10 +63,12 @@ namespace EShopOnAbp.WebGateway { var configuration = context.ServiceProvider.GetRequiredService(); var routes = configuration.GetSection("Routes").Get>(); - var routedServices = routes.GroupBy(t => t.ServiceKey).Select(r => r.First()).Distinct(); + var routedServices = routes + .GroupBy(t => t.ServiceKey) + .Select(r => r.First()) + .Distinct(); - //TODO : AccountService (AuthServer) doesn't have any swagger end point - foreach (var config in routedServices.Where(q => !q.ServiceKey.StartsWith("Account"))) + foreach (var config in routedServices) { var url = $"{config.DownstreamScheme}://{config.DownstreamHostAndPorts.FirstOrDefault()?.Host}:{config.DownstreamHostAndPorts.FirstOrDefault()?.Port}";