Make BFF work and clean up ports

src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/HomeController.cs

@@ -1,11 +0,0 @@
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Controllers;
-
-[Route("")]
-public class HomeController : Controller
-{
-    [HttpGet]
-    public IActionResult Index()
-    {
-        return new RedirectResult("~/swagger");
-    }
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Extensions/ServiceCollectionExtensions.cs

@@ -0,0 +1,57 @@
+public static class ServiceCollectionExtensions
+{
+    public static IServiceCollection AddHealthChecks(this IServiceCollection services, IConfiguration configuration)
+    {
+        services.AddHealthChecks()
+            .AddUrlGroup(_ => new Uri(configuration.GetRequiredValue("CatalogUrlHC")), name: "catalogapi-check", tags: new string[] { "catalogapi" })
+            .AddUrlGroup(_ => new Uri(configuration.GetRequiredValue("OrderingUrlHC")), name: "orderingapi-check", tags: new string[] { "orderingapi" })
+            .AddUrlGroup(_ => new Uri(configuration.GetRequiredValue("BasketUrlHC")), name: "basketapi-check", tags: new string[] { "basketapi" })
+            .AddUrlGroup(_ => new Uri(configuration.GetRequiredValue("IdentityUrlHC")), name: "identityapi-check", tags: new string[] { "identityapi" });
+
+        return services;
+    }
+
+    public static IServiceCollection AddApplicationServices(this IServiceCollection services)
+    {
+        // Register delegating handlers
+        services.AddTransient<HttpClientAuthorizationDelegatingHandler>();
+
+        // Register http services
+
+        services.AddHttpClient<IOrderApiClient, OrderApiClient>()
+            .AddHttpMessageHandler<HttpClientAuthorizationDelegatingHandler>();
+
+        return services;
+    }
+
+    public static IServiceCollection AddGrpcServices(this IServiceCollection services)
+    {
+        services.AddTransient<GrpcExceptionInterceptor>();
+
+        services.AddScoped<IBasketService, BasketService>();
+
+        services.AddGrpcClient<Basket.BasketClient>((services, options) =>
+        {
+            var basketApi = services.GetRequiredService<IOptions<UrlsConfig>>().Value.GrpcBasket;
+            options.Address = new Uri(basketApi);
+        }).AddInterceptor<GrpcExceptionInterceptor>();
+
+        services.AddScoped<ICatalogService, CatalogService>();
+
+        services.AddGrpcClient<Catalog.CatalogClient>((services, options) =>
+        {
+            var catalogApi = services.GetRequiredService<IOptions<UrlsConfig>>().Value.GrpcCatalog;
+            options.Address = new Uri(catalogApi);
+        }).AddInterceptor<GrpcExceptionInterceptor>();
+
+        services.AddScoped<IOrderingService, OrderingService>();
+
+        services.AddGrpcClient<GrpcOrdering.OrderingGrpc.OrderingGrpcClient>((services, options) =>
+        {
+            var orderingApi = services.GetRequiredService<IOptions<UrlsConfig>>().Value.GrpcOrdering;
+            options.Address = new Uri(orderingApi);
+        }).AddInterceptor<GrpcExceptionInterceptor>();
+
+        return services;
+    }
+}

src/ApiGateways/Web.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs

@@ -1,34 +0,0 @@
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Filters
-{
-    namespace Basket.API.Infrastructure.Filters
-    {
-        public class AuthorizeCheckOperationFilter : IOperationFilter
-        {
-            public void Apply(OpenApiOperation operation, OperationFilterContext context)
-            {
-                // Check for authorize attribute
-                var hasAuthorize = context.MethodInfo.DeclaringType.GetCustomAttributes(true).OfType<AuthorizeAttribute>().Any() ||
-                                    context.MethodInfo.GetCustomAttributes(true).OfType<AuthorizeAttribute>().Any();
-
-                if (!hasAuthorize) return;
-
-                operation.Responses.TryAdd("401", new OpenApiResponse { Description = "Unauthorized" });
-                operation.Responses.TryAdd("403", new OpenApiResponse { Description = "Forbidden" });
-
-                var oAuthScheme = new OpenApiSecurityScheme
-                {
-                    Reference = new OpenApiReference { Type = ReferenceType.SecurityScheme, Id = "oauth2" }
-                };
-
-                operation.Security = new List<OpenApiSecurityRequirement>
-            {
-                new()
-                {
-                    [ oAuthScheme ] = new[] { "Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator" }
-                }
-            };
-            }
-        }
-    }
-
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/GlobalUsings.cs

@@ -1,38 +1,27 @@
-global using CatalogApi;
+global using System;
-global using Grpc.Core.Interceptors;
+global using System.Collections.Generic;
+global using System.Linq;
+global using System.Net;
+global using System.Net.Http;
+global using System.Net.Http.Headers;
+global using System.Text.Json;
+global using System.Threading;
+global using System.Threading.Tasks;
+global using CatalogApi;
 global using Grpc.Core;
+global using Grpc.Core.Interceptors;
 global using GrpcBasket;
-global using HealthChecks.UI.Client;
 global using Microsoft.AspNetCore.Authentication;
 global using Microsoft.AspNetCore.Authorization;
 global using Microsoft.AspNetCore.Builder;
-global using Microsoft.AspNetCore.Diagnostics.HealthChecks;
-global using Microsoft.AspNetCore.Hosting;
 global using Microsoft.AspNetCore.Http;
 global using Microsoft.AspNetCore.Mvc;
-global using Microsoft.AspNetCore;
 global using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config;
-global using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Filters.Basket.API.Infrastructure.Filters;
 global using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Infrastructure;
 global using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
 global using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services;
-global using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator;
 global using Microsoft.Extensions.Configuration;
 global using Microsoft.Extensions.DependencyInjection;
-global using Microsoft.Extensions.Diagnostics.HealthChecks;
-global using Microsoft.Extensions.Hosting;
 global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Options;
-global using Microsoft.OpenApi.Models;
+global using Services.Common;
-global using Swashbuckle.AspNetCore.SwaggerGen;
-global using System.Collections.Generic;
-global using System.IdentityModel.Tokens.Jwt;
-global using System.Linq;
-global using System.Net.Http.Headers;
-global using System.Net.Http;
-global using System.Net;
-global using System.Text.Json;
-global using System.Threading.Tasks;
-global using System.Threading;
-global using System;
-global using Microsoft.IdentityModel.Tokens;

src/ApiGateways/Web.Bff.Shopping/aggregator/Program.cs

@@ -1,169 +1,42 @@
 var builder = WebApplication.CreateBuilder(args);
 
-builder.Services.AddHealthChecks()
+builder.AddServiceDefaults();
-    .AddCheck("self", () => HealthCheckResult.Healthy())
+
-    .AddUrlGroup(new Uri(builder.Configuration["CatalogUrlHC"]), name: "catalogapi-check", tags: new string[] { "catalogapi" })
+builder.Services.AddControllers();
-    .AddUrlGroup(new Uri(builder.Configuration["OrderingUrlHC"]), name: "orderingapi-check", tags: new string[] { "orderingapi" })
+
-    .AddUrlGroup(new Uri(builder.Configuration["BasketUrlHC"]), name: "basketapi-check", tags: new string[] { "basketapi" })
+builder.Services.AddHealthChecks(builder.Configuration);
-    .AddUrlGroup(new Uri(builder.Configuration["IdentityUrlHC"]), name: "identityapi-check", tags: new string[] { "identityapi" })
+builder.Services.AddCors(options =>
-    .AddUrlGroup(new Uri(builder.Configuration["PaymentUrlHC"]), name: "paymentapi-check", tags: new string[] { "paymentapi" });
-builder.Services.AddCustomMvc(builder.Configuration)
-    .AddCustomAuthentication(builder.Configuration)
-    .AddApplicationServices()
-    .AddGrpcServices();
-var app = builder.Build();
-if (!app.Environment.IsDevelopment())
 {
-    app.UseExceptionHandler("/Home/Error");
+    options.AddPolicy("CorsPolicy",
+        builder => builder
+        .SetIsOriginAllowed((host) => true)
+        .AllowAnyMethod()
+        .AllowAnyHeader()
+        .AllowCredentials());
+});
+
+builder.Services.AddApplicationServices();
+builder.Services.AddGrpcServices();
+
+builder.Services.Configure<UrlsConfig>(builder.Configuration.GetSection("urls"));
+
+var app = builder.Build();
+
+if (!await app.CheckHealthAsync())
+{
+    return;
 }
 
-var pathBase = builder.Configuration["PATH_BASE"];
+app.UseServiceDefaults();
-if (!string.IsNullOrEmpty(pathBase))
-{
-    app.UsePathBase(pathBase);
-}
 
 app.UseHttpsRedirection();
 
-app.UseSwagger().UseSwaggerUI(c =>
-{
-    c.SwaggerEndpoint($"{(!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty)}/swagger/v1/swagger.json", "Purchase BFF V1");
-
-    c.OAuthClientId("webshoppingaggswaggerui");
-    c.OAuthClientSecret(string.Empty);
-    c.OAuthRealm(string.Empty);
-    c.OAuthAppName("web shopping bff Swagger UI");
-});
-
-app.UseRouting();
 app.UseCors("CorsPolicy");
 app.UseAuthentication();
 app.UseAuthorization();
 
-app.MapDefaultControllerRoute();
+app.MapGet("/", () => Results.Redirect("/swagger"));
+
 app.MapControllers();
-app.MapHealthChecks("/hc", new HealthCheckOptions()
-{
-    Predicate = _ => true,
-    ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse
-});
-app.MapHealthChecks("/liveness", new HealthCheckOptions
-{
-    Predicate = r => r.Name.Contains("self")
-});
 
 await app.RunAsync();
-
-public static class ServiceCollectionExtensions
-{
-    public static IServiceCollection AddCustomAuthentication(this IServiceCollection services, IConfiguration configuration)
-    {
-        JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Remove("sub");
-
-        var identityUrl = configuration.GetValue<string>("urls:identity");
-        services.AddAuthentication("Bearer")
-        .AddJwtBearer(options =>
-        {
-            options.Authority = identityUrl;
-            options.RequireHttpsMetadata = false;
-            options.Audience = "webshoppingagg";
-            options.TokenValidationParameters = new TokenValidationParameters
-            {
-                ValidateAudience = false
-            };
-        });
-
-        return services;
-    }
-    public static IServiceCollection AddCustomMvc(this IServiceCollection services, IConfiguration configuration)
-    {
-        services.Configure<UrlsConfig>(configuration.GetSection("urls"));
-
-        services.AddControllers()
-                .AddJsonOptions(options => options.JsonSerializerOptions.WriteIndented = true);
-
-        services.AddSwaggerGen(options =>
-        {
-            options.SwaggerDoc("v1", new OpenApiInfo
-            {
-                Title = "Shopping Aggregator for Web Clients",
-                Version = "v1",
-                Description = "Shopping Aggregator for Web Clients"
-            });
-            var identityUrl = configuration.GetSection("Identity").GetValue<string>("ExternalUrl");
-            options.AddSecurityDefinition("oauth2", new OpenApiSecurityScheme
-            {
-                Type = SecuritySchemeType.OAuth2,
-                Flows = new OpenApiOAuthFlows()
-                {
-                    Implicit = new OpenApiOAuthFlow()
-                    {
-                        AuthorizationUrl = new Uri($"{identityUrl}/connect/authorize"),
-                        TokenUrl = new Uri($"{identityUrl}/connect/token"),
-                        Scopes = new Dictionary<string, string>()
-                        {
-                            { "webshoppingagg", "Shopping Aggregator for Web Clients" }
-                        }
-                    }
-                }
-            });
-
-            options.OperationFilter<AuthorizeCheckOperationFilter>();
-        });
-        services.AddCors(options =>
-        {
-            options.AddPolicy("CorsPolicy",
-                builder => builder
-                .SetIsOriginAllowed((host) => true)
-                .AllowAnyMethod()
-                .AllowAnyHeader()
-                .AllowCredentials());
-        });
-
-        return services;
-    }
-    public static IServiceCollection AddApplicationServices(this IServiceCollection services)
-    {
-        //register delegating handlers
-        services.AddTransient<HttpClientAuthorizationDelegatingHandler>();
-        services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
-
-        //register http services
-
-        services.AddHttpClient<IOrderApiClient, OrderApiClient>()
-            .AddHttpMessageHandler<HttpClientAuthorizationDelegatingHandler>();
-
-        return services;
-    }
-
-    public static IServiceCollection AddGrpcServices(this IServiceCollection services)
-    {
-        services.AddTransient<GrpcExceptionInterceptor>();
-
-        services.AddScoped<IBasketService, BasketService>();
-
-        services.AddGrpcClient<Basket.BasketClient>((services, options) =>
-        {
-            var basketApi = services.GetRequiredService<IOptions<UrlsConfig>>().Value.GrpcBasket;
-            options.Address = new Uri(basketApi);
-        }).AddInterceptor<GrpcExceptionInterceptor>();
-
-        services.AddScoped<ICatalogService, CatalogService>();
-
-        services.AddGrpcClient<Catalog.CatalogClient>((services, options) =>
-        {
-            var catalogApi = services.GetRequiredService<IOptions<UrlsConfig>>().Value.GrpcCatalog;
-            options.Address = new Uri(catalogApi);
-        }).AddInterceptor<GrpcExceptionInterceptor>();
-
-        services.AddScoped<IOrderingService, OrderingService>();
-
-        services.AddGrpcClient<GrpcOrdering.OrderingGrpc.OrderingGrpcClient>((services, options) =>
-        {
-            var orderingApi = services.GetRequiredService<IOptions<UrlsConfig>>().Value.GrpcOrdering;
-            options.Address = new Uri(orderingApi);
-        }).AddInterceptor<GrpcExceptionInterceptor>();
-
-        return services;
-    }
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Properties/launchSettings.json

@@ -1,29 +1,16 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:57425/",
-      "sslPort": 0
-    }
-  },
   "profiles": {
-    "IIS Express": {
+    "Web.Shopping.HttpAggregator": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "api/values",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "PurchaseForMvc": {
       "commandName": "Project",
       "launchBrowser": true,
-      "launchUrl": "api/values",
+      "applicationUrl": "http://localhost:61632/",
       "environmentVariables": {
+        "CatalogUrlHC": "http://localhost:5222/hc",
+        "OrderingUrlHC": "http://localhost:5224/hc",
+        "BasketUrlHC": "http://localhost:5221/hc",
+        "IdentityUrlHC": "http://localhost:5223/hc",
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
+      }
-      "applicationUrl": "http://localhost:61632/"
     }
   }
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj

@@ -5,31 +5,19 @@
     <AssemblyName>Web.Shopping.HttpAggregator</AssemblyName>
     <RootNamespace>Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator</RootNamespace>
     <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
-    <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
-    <IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>    
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="wwwroot\**" />
-    <Content Remove="wwwroot\**" />
-    <EmbeddedResource Remove="wwwroot\**" />
-    <None Remove="wwwroot\**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="AspNetCore.HealthChecks.UI.Client" />
     <PackageReference Include="AspNetCore.HealthChecks.Uris" />
     <PackageReference Include="Google.Protobuf" />
     <PackageReference Include="Grpc.AspNetCore.Server.ClientFactory" />
-    <PackageReference Include="Grpc.Core" />
     <PackageReference Include="Grpc.Net.Client" />
     <PackageReference Include="Grpc.Net.ClientFactory" />
     <PackageReference Include="Grpc.Tools" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
+  </ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
+
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" />
+  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
+    <ProjectReference Include="..\..\..\Services\Services.Common\Services.Common.csproj" />
-    <PackageReference Include="Swashbuckle.AspNetCore" />
   </ItemGroup>
 
   <ItemGroup>

src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.Development.json

@@ -1,16 +1,8 @@
 {
   "Logging": {
-    "Debug": {
+    "LogLevel": {
-      "IncludeScopes": false,
+      "Default": "Information",
-      "LogLevel": {
+      "Microsoft.AspNetCore": "Warning"
-        "Default": "Debug"
-      }
-    },
-    "Console": {
-      "IncludeScopes": false,
-      "LogLevel": {
-        "Default": "Debug"
-      }
     }
   }
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.json

@@ -1,20 +1,29 @@
 {
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "OpenApi": {
+    "Endpoint": {
+      "Name": "Purchase BFF V1"
+    },
+    "Document": {
+      "Description": "Shopping Aggregator for Web Clients",
+      "Title": "Shopping Aggregator for Web Clients",
+      "Version": "v1"
+    },
+    "Auth": {
+      "ClientId": "webshoppingaggswaggerui",
+      "AppName": "web shopping bff Swagger UI"
+    }
+  },
   "Identity": {
     "Url": "http://localhost:5105",
-    "Audience": "webshoppingagg"
+    "Audience": "webshoppingagg",
-  },
+    "Scopes": {
-  "Logging": {
+      "webshoppingagg": "Shopping Aggregator for Web Clients"
-    "Debug": {
-      "IncludeScopes": false,
-      "LogLevel": {
-        "Default": "Warning"
-      }
-    },
-    "Console": {
-      "IncludeScopes": false,
-      "LogLevel": {
-        "Default": "Warning"
-      }
     }
   }
 }

src/Services/Basket/Basket.API/Properties/launchSettings.json

@@ -3,10 +3,9 @@
     "Basket.API": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5222",
+      "applicationUrl": "http://localhost:5221",
       "environmentVariables": {
-        "Identity__Url": "http://localhost:5225",
+        "Identity__Url": "http://localhost:5223",
-        "Identity__ExternalUrl": "http://localhost:5225",
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     }

src/Services/Basket/Basket.API/appsettings.json

@@ -26,7 +26,6 @@
   "Identity": {
     "Audience": "basket",
     "Url": "http://localhost:5105",
-    "ExternalUrl": "http://localhost:5105",
     "Scopes": {
       "basket": "Basket API"
     }

src/Services/Catalog/Catalog.API/Properties/launchSettings.json

@@ -3,7 +3,7 @@
     "Catalog.API": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5226/",
+      "applicationUrl": "http://localhost:5222/",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

src/Services/Identity/Identity.API/Properties/launchSettings.json

@@ -3,9 +3,9 @@
     "Identity.API": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5225",
+      "applicationUrl": "http://localhost:5223",
       "environmentVariables": {
-        "BasketApiClient": "http://localhost:5222",
+        "BasketApiClient": "http://localhost:5221",
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     }

src/Services/Ordering/Ordering.API/Properties/launchSettings.json

@@ -3,7 +3,7 @@
     "Ordering.API": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5228/",
+      "applicationUrl": "http://localhost:5224/",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

src/Services/Ordering/Ordering.API/appsettings.json

@@ -32,7 +32,6 @@
   },
   "Identity": {
     "Url": "http://localhost:5105",
-    "ExternalUrl": "http://localhost:5105",
     "Audience": "orders",
     "Scopes": {
       "orders": "Ordering API"

src/Services/Ordering/Ordering.SignalrHub/Properties/launchSettings.json

@@ -3,7 +3,7 @@
     "Ordering.SignalrHub": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5223/",
+      "applicationUrl": "http://localhost:5225/",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

src/Services/Services.Common/CommonExtensions.cs

@@ -180,7 +180,7 @@ public static class CommonExtensions
             //    }
             // }
 
-            var identityUrlExternal = identitySection.GetRequiredValue("ExternalUrl");
+            var identityUrlExternal = identitySection["ExternalUrl"] ?? identitySection.GetRequiredValue("Url");
             var scopes = identitySection.GetRequiredSection("Scopes").GetChildren().ToDictionary(p => p.Key, p => p.Value);
 
             options.AddSecurityDefinition("oauth2", new OpenApiSecurityScheme

src/Services/Webhooks/Webhooks.API/Properties/launchSettings.json

@@ -3,7 +3,7 @@
     "Webhooks.API": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5222",
+      "applicationUrl": "http://localhost:5227",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

src/Services/Webhooks/Webhooks.API/appsettings.json

@@ -32,7 +32,6 @@
   },
   "Identity": {
     "Url": "http://localhost:5105",
-    "ExternalUrl": "http://localhost:5105",
     "Audience": "webhooks",
     "Scopes": {
       "webhooks": "Webhooks API"