Make tests work

src/Services/Basket/Basket.API/Basket.API.csproj

@@ -7,12 +7,6 @@
 		<IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<Content Update="web.config">
-			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-		</Content>
-	</ItemGroup>
-
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
 		<PackageReference Include="System.IdentityModel.Tokens.Jwt" />

src/Services/Basket/Basket.API/Controllers/BasketController.cs

@@ -1,7 +1,7 @@
 namespace Microsoft.eShopOnContainers.Services.Basket.API.Controllers;
 
 [Route("api/v1/[controller]")]
-//[Authorize]
+[Authorize]
 [ApiController]
 public class BasketController : ControllerBase
 {
@@ -56,7 +56,7 @@ public class BasketController : ControllerBase
             return BadRequest();
         }
 
-        var userName = this.HttpContext.User.FindFirst(x => x.Type == ClaimTypes.Name).Value;
+        var userName = User.FindFirst(x => x.Type == ClaimTypes.Name).Value;
 
         var eventMessage = new UserCheckoutAcceptedIntegrationEvent(userId, userName, basketCheckout.City, basketCheckout.Street,
             basketCheckout.State, basketCheckout.Country, basketCheckout.ZipCode, basketCheckout.CardNumber, basketCheckout.CardHolderName,

src/Services/Basket/Basket.API/Controllers/HomeController.cs

@@ -1,11 +0,0 @@
-namespace Microsoft.eShopOnContainers.Services.Basket.API.Controllers;
-
-public class HomeController : Controller
-{
-    // GET: /<controller>/
-    public IActionResult Index()
-    {
-        return new RedirectResult("~/swagger");
-    }
-}
-

src/Services/Basket/Basket.API/CustomExtensionMethods.cs

@@ -2,6 +2,32 @@
 
 public static class CustomExtensionMethods
 {
+    public static ConfigurationManager AddKeyVault(this ConfigurationManager configuration)
+    {
+        if (configuration.GetValue("UseVault", false))
+        {
+            var credential = new ClientSecretCredential(
+                   configuration["Vault:TenantId"],
+                configuration["Vault:ClientId"],
+                configuration["Vault:ClientSecret"]);
+
+            configuration.AddAzureKeyVault(new Uri($"https://{configuration["Vault:Name"]}.vault.azure.net/"), credential);
+        }
+
+        return configuration;
+    }
+
+    public static IServiceCollection AddRedis(this IServiceCollection services)
+    {
+        return services.AddSingleton(sp =>
+        {
+            var settings = sp.GetRequiredService<IOptions<BasketSettings>>().Value;
+            var configuration = ConfigurationOptions.Parse(settings.ConnectionString, true);
+
+            return ConnectionMultiplexer.Connect(configuration);
+        });
+    }
+
     public static IServiceCollection AddCustomHealthCheck(this IServiceCollection services, IConfiguration configuration)
     {
         var hcBuilder = services.AddHealthChecks();
@@ -34,4 +60,81 @@ public static class CustomExtensionMethods
 
         return services;
     }
+
+    public static IServiceCollection AddEventBus(this IServiceCollection services, IConfiguration configuration)
+    {
+        if (configuration.GetValue("AzureServiceBusEnabled", false))
+        {
+            services.AddSingleton<IServiceBusPersisterConnection>(sp =>
+            {
+                var serviceBusConnectionString = configuration["EventBusConnection"];
+
+                return new DefaultServiceBusPersisterConnection(serviceBusConnectionString);
+            });
+
+            services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>
+            {
+                var serviceBusPersisterConnection = sp.GetRequiredService<IServiceBusPersisterConnection>();
+                var logger = sp.GetRequiredService<ILogger<EventBusServiceBus>>();
+                var eventBusSubscriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
+                string subscriptionName = configuration["SubscriptionClientName"];
+
+                return new EventBusServiceBus(serviceBusPersisterConnection, logger,
+                    eventBusSubscriptionsManager, sp, subscriptionName);
+            });
+        }
+        else
+        {
+            services.AddSingleton<IRabbitMQPersistentConnection>(sp =>
+            {
+                var logger = sp.GetRequiredService<ILogger<DefaultRabbitMQPersistentConnection>>();
+
+                var factory = new ConnectionFactory()
+                {
+                    HostName = configuration["EventBusConnection"],
+                    DispatchConsumersAsync = true
+                };
+
+                if (!string.IsNullOrEmpty(configuration["EventBusUserName"]))
+                {
+                    factory.UserName = configuration["EventBusUserName"];
+                }
+
+                if (!string.IsNullOrEmpty(configuration["EventBusPassword"]))
+                {
+                    factory.Password = configuration["EventBusPassword"];
+                }
+
+                var retryCount = 5;
+                if (!string.IsNullOrEmpty(configuration["EventBusRetryCount"]))
+                {
+                    retryCount = int.Parse(configuration["EventBusRetryCount"]);
+                }
+
+                return new DefaultRabbitMQPersistentConnection(factory, logger, retryCount);
+            });
+
+            services.AddSingleton<IEventBus, EventBusRabbitMQ>(sp =>
+            {
+                var subscriptionClientName = configuration["SubscriptionClientName"];
+                var rabbitMQPersistentConnection = sp.GetRequiredService<IRabbitMQPersistentConnection>();
+                var logger = sp.GetRequiredService<ILogger<EventBusRabbitMQ>>();
+                var eventBusSubscriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
+
+                var retryCount = 5;
+                if (!string.IsNullOrEmpty(configuration["EventBusRetryCount"]))
+                {
+                    retryCount = int.Parse(configuration["EventBusRetryCount"]);
+                }
+
+                return new EventBusRabbitMQ(rabbitMQPersistentConnection, logger, sp, eventBusSubscriptionsManager, subscriptionClientName, retryCount);
+            });
+        }
+
+        services.AddSingleton<IEventBusSubscriptionsManager, InMemoryEventBusSubscriptionsManager>();
+
+        services.AddTransient<ProductPriceChangedIntegrationEventHandler>();
+        services.AddTransient<OrderStartedIntegrationEventHandler>();
+        return services;
+    }
 }

src/Services/Basket/Basket.API/Program.cs

@@ -1,32 +1,21 @@
-var builder = WebApplication.CreateBuilder(new WebApplicationOptions
+var builder = WebApplication.CreateBuilder(args);
-{
+
-    Args = args,
+builder.Configuration.AddKeyVault();
-    ApplicationName = typeof(Program).Assembly.FullName,
-    ContentRootPath = Directory.GetCurrentDirectory()
-});
-if (builder.Configuration.GetValue<bool>("UseVault", false))
-{
-    TokenCredential credential = new ClientSecretCredential(
-           builder.Configuration["Vault:TenantId"],
-        builder.Configuration["Vault:ClientId"],
-        builder.Configuration["Vault:ClientSecret"]);
-    builder.Configuration.AddAzureKeyVault(new Uri($"https://{builder.Configuration["Vault:Name"]}.vault.azure.net/"), credential);
-}
 
 builder.Services.AddGrpc(options =>
 {
     options.EnableDetailedErrors = true;
 });
+
 builder.Services.AddApplicationInsightsTelemetry(builder.Configuration);
 builder.Services.AddApplicationInsightsKubernetesEnricher();
+
 builder.Services.AddControllers(options =>
 {
     options.Filters.Add(typeof(HttpGlobalExceptionFilter));
     options.Filters.Add(typeof(ValidateModelStateFilter));
+});
 
-}) // Added for functional tests
-            .AddApplicationPart(typeof(BasketController).Assembly)
-            .AddJsonOptions(options => options.JsonSerializerOptions.WriteIndented = true);
 builder.Services.AddSwaggerGen(options =>
 {
     options.SwaggerDoc("v1", new OpenApiInfo
@@ -43,8 +32,8 @@ builder.Services.AddSwaggerGen(options =>
         {
             Implicit = new OpenApiOAuthFlow()
             {
-                AuthorizationUrl = new Uri($"{builder.Configuration.GetValue<string>("IdentityUrlExternal")}/connect/authorize"),
+                AuthorizationUrl = new Uri($"{builder.Configuration["IdentityUrlExternal"]}/connect/authorize"),
-                TokenUrl = new Uri($"{builder.Configuration.GetValue<string>("IdentityUrlExternal")}/connect/token"),
+                TokenUrl = new Uri($"{builder.Configuration["IdentityUrlExternal"]}/connect/token"),
                 Scopes = new Dictionary<string, string>() { { "basket", "Basket API" } }
             }
         }
@@ -56,16 +45,16 @@ builder.Services.AddSwaggerGen(options =>
 // prevent from mapping "sub" claim to nameidentifier.
 JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Remove("sub");
 
-var identityUrl = builder.Configuration.GetValue<string>("IdentityUrl");
+var identityUrl = builder.Configuration["IdentityUrl"];
 
-/*
+builder.Services.AddAuthentication().AddJwtBearer(options =>
-builder.Services.AddAuthentication("Bearer").AddJwtBearer(options =>
 {
     options.Authority = identityUrl;
     options.RequireHttpsMetadata = false;
     options.Audience = "basket";
     options.TokenValidationParameters.ValidateAudience = false;
 });
+
 builder.Services.AddAuthorization(options =>
 {
     options.AddPolicy("ApiScope", policy =>
@@ -74,79 +63,20 @@ builder.Services.AddAuthorization(options =>
         policy.RequireClaim("scope", "basket");
     });
 });
-*/
 
 builder.Services.AddCustomHealthCheck(builder.Configuration);
 
 builder.Services.Configure<BasketSettings>(builder.Configuration);
 
-builder.Services.AddSingleton<ConnectionMultiplexer>(sp =>
+builder.Services.AddRedis();
-{
-    var settings = sp.GetRequiredService<IOptions<BasketSettings>>().Value;
-    var configuration = ConfigurationOptions.Parse(settings.ConnectionString, true);
 
-    return ConnectionMultiplexer.Connect(configuration);
+builder.Services.AddEventBus(builder.Configuration);
-});
 
+builder.Services.AddHttpContextAccessor();
 
-if (builder.Configuration.GetValue<bool>("AzureServiceBusEnabled"))
-{
-    builder.Services.AddSingleton<IServiceBusPersisterConnection>(sp =>
-    {
-        var serviceBusConnectionString = builder.Configuration["EventBusConnection"];
-
-        return new DefaultServiceBusPersisterConnection(serviceBusConnectionString);
-    });
-}
-else
-{
-    builder.Services.AddSingleton<IRabbitMQPersistentConnection>(sp =>
-    {
-        var logger = sp.GetRequiredService<ILogger<DefaultRabbitMQPersistentConnection>>();
-
-        var factory = new ConnectionFactory()
-        {
-            HostName = builder.Configuration["EventBusConnection"],
-            DispatchConsumersAsync = true
-        };
-
-        if (!string.IsNullOrEmpty(builder.Configuration["EventBusUserName"]))
-        {
-            factory.UserName = builder.Configuration["EventBusUserName"];
-        }
-
-        if (!string.IsNullOrEmpty(builder.Configuration["EventBusPassword"]))
-        {
-            factory.Password = builder.Configuration["EventBusPassword"];
-        }
-
-        var retryCount = 5;
-        if (!string.IsNullOrEmpty(builder.Configuration["EventBusRetryCount"]))
-        {
-            retryCount = int.Parse(builder.Configuration["EventBusRetryCount"]);
-        }
-
-        return new DefaultRabbitMQPersistentConnection(factory, logger, retryCount);
-    });
-}
-builder.Services.RegisterEventBus(builder.Configuration);
-builder.Services.AddCors(options =>
-{
-    options.AddPolicy("CorsPolicy",
-        builder => builder
-        .SetIsOriginAllowed((host) => true)
-        .AllowAnyMethod()
-        .AllowAnyHeader()
-        .AllowCredentials());
-});
-builder.Services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 builder.Services.AddTransient<IBasketRepository, RedisBasketRepository>();
 builder.Services.AddTransient<IIdentityService, IdentityService>();
 
-builder.Services.AddOptions();
-builder.Configuration.SetBasePath(Directory.GetCurrentDirectory());
-builder.Configuration.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true);
-builder.Configuration.AddEnvironmentVariables();
 builder.WebHost.UseKestrel(options =>
 {
     var ports = GetDefinedPorts(builder.Configuration);
@@ -159,22 +89,19 @@ builder.WebHost.UseKestrel(options =>
     {
         listenOptions.Protocols = HttpProtocols.Http2;
     });
-
 });
+
 builder.Host.UseSerilog(CreateSerilogLogger(builder.Configuration));
 builder.WebHost.UseFailing(options =>
 {
     options.ConfigPath = "/Failing";
     options.NotFilteredPaths.AddRange(new[] { "/hc", "/liveness" });
 });
+
 var app = builder.Build();
 app.MapGet("hello", () => "hello");
 
-if (app.Environment.IsDevelopment())
+if (!app.Environment.IsDevelopment())
-{
-    app.UseDeveloperExceptionPage();
-}
-else
 {
     app.UseExceptionHandler("/Home/Error");
 }
@@ -185,30 +112,18 @@ if (!string.IsNullOrEmpty(pathBase))
     app.UsePathBase(pathBase);
 }
 
-app.UseSwagger()
+app.UseSwagger();
-            .UseSwaggerUI(setup =>
+
-            {
+app.UseSwaggerUI(setup =>
+{
     setup.SwaggerEndpoint($"{(!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty)}/swagger/v1/swagger.json", "Basket.API V1");
     setup.OAuthClientId("basketswaggerui");
     setup.OAuthAppName("Basket Swagger UI");
-            });
-
-app.Use(del => ctx =>
-{
-    ctx.Response.StatusCode = 200;
-    ctx.Response.WriteAsync("hello");
-    return Task.CompletedTask;
-    //return del(ctx);
 });
-app.UseRouting();
-app.UseCors("CorsPolicy");
-//app.UseAuthentication();
-//app.UseAuthorization();
-app.UseStaticFiles();
 
 app.MapGrpcService<BasketService>();
-app.MapDefaultControllerRoute();
 app.MapControllers();
+
 app.MapGet("/_proto/", async ctx =>
 {
     ctx.Response.ContentType = "text/plain";
@@ -223,16 +138,20 @@ app.MapGet("/_proto/", async ctx =>
         }
     }
 });
+
 app.MapHealthChecks("/hc", new HealthCheckOptions()
 {
     Predicate = _ => true,
     ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse
 });
+
 app.MapHealthChecks("/liveness", new HealthCheckOptions
 {
     Predicate = r => r.Name.Contains("self")
 });
+
 ConfigureEventBus(app);
+
 try
 {
     Log.Information("Configuring web host ({ApplicationContext})...", Program.AppName);
@@ -288,47 +207,3 @@ public partial class Program
     private static string Namespace = typeof(Program).Assembly.GetName().Name;
     public static string AppName = Namespace.Substring(Namespace.LastIndexOf('.', Namespace.LastIndexOf('.') - 1) + 1);
 }
-
-public static class CustomExtensionMethods
-{
-    public static IServiceCollection RegisterEventBus(this IServiceCollection services, IConfiguration configuration)
-    {
-        if (configuration.GetValue<bool>("AzureServiceBusEnabled"))
-        {
-            services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>
-            {
-                var serviceBusPersisterConnection = sp.GetRequiredService<IServiceBusPersisterConnection>();
-                var logger = sp.GetRequiredService<ILogger<EventBusServiceBus>>();
-                var eventBusSubscriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
-                string subscriptionName = configuration["SubscriptionClientName"];
-
-                return new EventBusServiceBus(serviceBusPersisterConnection, logger,
-                    eventBusSubscriptionsManager, sp, subscriptionName);
-            });
-        }
-        else
-        {
-            services.AddSingleton<IEventBus, EventBusRabbitMQ>(sp =>
-            {
-                var subscriptionClientName = configuration["SubscriptionClientName"];
-                var rabbitMQPersistentConnection = sp.GetRequiredService<IRabbitMQPersistentConnection>();
-                var logger = sp.GetRequiredService<ILogger<EventBusRabbitMQ>>();
-                var eventBusSubscriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
-
-                var retryCount = 5;
-                if (!string.IsNullOrEmpty(configuration["EventBusRetryCount"]))
-                {
-                    retryCount = int.Parse(configuration["EventBusRetryCount"]);
-                }
-
-                return new EventBusRabbitMQ(rabbitMQPersistentConnection, logger, sp, eventBusSubscriptionsManager, subscriptionClientName, retryCount);
-            });
-        }
-
-        services.AddSingleton<IEventBusSubscriptionsManager, InMemoryEventBusSubscriptionsManager>();
-
-        services.AddTransient<ProductPriceChangedIntegrationEventHandler>();
-        services.AddTransient<OrderStartedIntegrationEventHandler>();
-        return services;
-    }
-}

src/Services/Basket/Basket.API/TestHttpResponseTrailersFeature.cs

@@ -1,6 +0,0 @@
-namespace Microsoft.eShopOnContainers.Services.Basket.API;
-
-internal class TestHttpResponseTrailersFeature : IHttpResponseTrailersFeature
-{
-    public IHeaderDictionary Trailers { get; set; }
-}

src/Services/Basket/Basket.API/web.config

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <!--
-    Configure your application settings in appsettings.json. Learn more at http://go.microsoft.com/fwlink/?LinkId=786380
-  -->
-  <system.webServer>
-    <handlers>
-      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
-    </handlers>
-    <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" hostingModel="InProcess">
-      <environmentVariables>
-        <environmentVariable name="COMPLUS_ForceENC" value="1" />
-        <environmentVariable name="ASPNETCORE_ENVIRONMENT" value="Development" />
-      </environmentVariables>
-    </aspNetCore>
-  </system.webServer>
-</configuration>

src/Services/Basket/Basket.FunctionalTests/Base/BasketScenarioBase.cs

@@ -1,6 +1,9 @@
-namespace Basket.FunctionalTests.Base;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.Extensions.Hosting;
 
-public class BasketScenarioBase
+namespace Basket.FunctionalTests.Base;
+
+public class BasketScenarioBase : WebApplicationFactory<Program>
 {
     private const string ApiUrlBase = "api/v1/basket";
 
@@ -33,4 +36,34 @@ public class BasketScenarioBase
         public static string Basket = $"{ApiUrlBase}/";
         public static string CheckoutOrder = $"{ApiUrlBase}/checkout";
     }
+
+    protected override IHost CreateHost(IHostBuilder builder)
+    {
+        builder.ConfigureServices(services =>
+        {
+            services.AddSingleton<IStartupFilter, AuthStartupFilter>();
+        });
+
+        builder.ConfigureAppConfiguration(c =>
+        {
+            var directory = Path.GetDirectoryName(typeof(BasketScenarioBase).Assembly.Location)!;
+
+            c.AddJsonFile(Path.Combine(directory, "appsettings.json"), optional: false);
+        });
+
+        return base.CreateHost(builder);
+    }
+
+    private class AuthStartupFilter : IStartupFilter
+    {
+        public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
+        {
+            return app =>
+            {
+                app.UseMiddleware<AutoAuthorizeMiddleware>();
+
+                next(app);
+            };
+        }
+    }
 }

src/Services/Basket/Basket.FunctionalTests/BasketScenarios.cs

@@ -1,35 +1,12 @@
-using System.Linq;
+namespace Basket.FunctionalTests;
-using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.Extensions.Hosting;
 
-namespace Basket.FunctionalTests;
+public class BasketScenarios : BasketScenarioBase
-
-public class TestWebApplicationFactory<TProgram> : WebApplicationFactory<TProgram> where TProgram : class
 {
-    protected override void ConfigureWebHost(IWebHostBuilder builder)
-    {
-        base.ConfigureWebHost(builder);
-        builder.Configure(app =>
-        {
-            app.UseMiddleware<AutoAuthorizeMiddleware>();
-        });
-    }
-
-    protected override IHost CreateHost(IHostBuilder builder)
-    {
-        return base.CreateHost(builder);
-    }
-}
-
-public class BasketScenarios : BasketScenarioBase, IClassFixture<TestWebApplicationFactory<Program>>
-{
-    private readonly TestWebApplicationFactory<Program> _factory;
     private readonly HttpClient _httpClient;
 
-    public BasketScenarios(TestWebApplicationFactory<Program> factory)
+    public BasketScenarios()
     {
-        _factory = factory;
+        _httpClient = CreateClient();
-        _httpClient = _factory.CreateClient();
     }
 
     [Fact]