Added implict usings

src/.env

@@ -6,15 +6,15 @@
 
 # Use this values to run the app locally in Windows
 ESHOP_EXTERNAL_DNS_NAME_OR_IP=host.docker.internal
-ESHOP_STORAGE_CATALOG_URL=http://host.docker.internal:5121/c/api/v1/catalog/items/[0]/pic/
+ESHOP_STORAGE_CATALOG_URL=http://host.docker.internal:5202/c/api/v1/catalog/items/[0]/pic/
 
 # Use this values to run the app locally in Mac
 # ESHOP_EXTERNAL_DNS_NAME_OR_IP=docker.for.mac.localhost
-# ESHOP_STORAGE_CATALOG_URL=http://docker.for.mac.localhost:5121/c/api/v1/catalog/items/[0]/pic/
+# ESHOP_STORAGE_CATALOG_URL=http://docker.for.mac.localhost:5202/c/api/v1/catalog/items/[0]/pic/
 
 # Use this values to run the app locally in Linux
 # ESHOP_EXTERNAL_DNS_NAME_OR_IP=docker.for.linux.localhost
-# ESHOP_STORAGE_CATALOG_URL=http://docker.for.linux.localhost:5121/c/api/v1/catalog/items/[0]/pic/
+# ESHOP_STORAGE_CATALOG_URL=http://docker.for.linux.localhost:5202/c/api/v1/catalog/items/[0]/pic/
 
 # Configure this values to the cloud storage locations
 # ESHOP_STORAGE_CATALOG_URL=<YourAzureStorage_Catalog_BLOB_URL>

src/ApiGateways/Envoy/config/mobileshopping/envoy.yaml

@@ -0,0 +1,139 @@
+admin:
+  access_log_path: "/dev/null"
+  address:
+    socket_address:
+      address: 0.0.0.0
+      port_value: 8001
+static_resources:
+  listeners:
+  - address:
+      socket_address:
+        address: 0.0.0.0
+        port_value: 80
+    filter_chains:
+    - filters:
+      - name: envoy.http_connection_manager
+        config:
+          codec_type: auto
+          stat_prefix: ingress_http
+          route_config:
+            name: eshop_backend_route
+            virtual_hosts:
+            - name: eshop_backend
+              domains:
+              - "*"
+              routes:
+              - name: "c-short"
+                match:
+                  prefix: "/c/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/catalog-api/"
+                  cluster: catalog
+              - name: "c-long"
+                match:
+                  prefix: "/catalog-api/"
+                route:
+                  auto_host_rewrite: true
+                  cluster: catalog
+              - name: "o-short"
+                match:
+                  prefix: "/o/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/ordering-api/"
+                  cluster: ordering
+              - name: "o-long"
+                match:
+                  prefix: "/ordering-api/"
+                route:
+                  auto_host_rewrite: true
+                  cluster: ordering
+              - name: "h-long"
+                match:
+                  prefix: "/hub/notificationhub"
+                route:
+                  auto_host_rewrite: true
+                  cluster: signalr-hub
+                  timeout: 300s
+              - name: "b-short"
+                match:
+                  prefix: "/b/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/basket-api/"
+                  cluster: basket
+              - name: "b-long"
+                match:
+                  prefix: "/basket-api/"
+                route:
+                  auto_host_rewrite: true
+                  cluster: basket
+              - name: "agg"
+                match:
+                  prefix: "/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/"
+                  cluster: shoppingagg
+          http_filters:
+          - name: envoy.router
+          access_log:
+          - name: envoy.file_access_log
+            filter:
+              not_health_check_filter: {}
+            config:
+              json_format:
+                time: "%START_TIME%"
+                protocol: "%PROTOCOL%"
+                duration: "%DURATION%"
+                request_method: "%REQ(:METHOD)%"
+                request_host: "%REQ(HOST)%"
+                path: "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%"
+                response_flags: "%RESPONSE_FLAGS%"
+                route_name: "%ROUTE_NAME%"
+                upstream_host: "%UPSTREAM_HOST%"
+                upstream_cluster: "%UPSTREAM_CLUSTER%"
+                upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"
+              path: "/tmp/access.log"
+  clusters:
+  - name: shoppingagg
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: mobileshoppingagg
+        port_value: 80
+  - name: catalog
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: catalog-api
+        port_value: 80
+  - name: basket
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: basket-api
+        port_value: 80
+  - name: ordering
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: ordering-api
+        port_value: 80
+  - name: signalr-hub
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: ordering-signalrhub
+        port_value: 80

src/ApiGateways/Envoy/config/webshopping/envoy.yaml

@@ -0,0 +1,142 @@
+admin:
+  access_log_path: "/dev/null"
+  address:
+    socket_address:
+      address: 0.0.0.0
+      port_value: 8001
+static_resources:
+  listeners:
+  - address:
+      socket_address:
+        address: 0.0.0.0
+        port_value: 80
+    filter_chains:
+    - filters:
+      - name: envoy.http_connection_manager
+        config:
+          codec_type: auto
+          stat_prefix: ingress_http
+          route_config:
+            name: eshop_backend_route
+            virtual_hosts:
+            - name: eshop_backend
+              domains:
+              - "*"
+              routes:
+              - name: "c-short"
+                match:
+                  prefix: "/c/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/catalog-api/"
+                  cluster: catalog
+              - name: "c-long"
+                match:
+                  prefix: "/catalog-api/"
+                route:
+                  auto_host_rewrite: true
+                  cluster: catalog
+              - name: "o-short"
+                match:
+                  prefix: "/o/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/ordering-api/"
+                  cluster: ordering
+              - name: "o-long"
+                match:
+                  prefix: "/ordering-api/"
+                route:
+                  auto_host_rewrite: true
+                  cluster: ordering
+              - name: "h-long"
+                match:
+                  prefix: "/hub/notificationhub"
+                route:
+                  auto_host_rewrite: true
+                  cluster: signalr-hub
+                  timeout: 300s
+                  upgrade_configs:
+                    upgrade_type: "websocket"
+                    enabled: true
+              - name: "b-short"
+                match:
+                  prefix: "/b/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/basket-api/"
+                  cluster: basket
+              - name: "b-long"
+                match:
+                  prefix: "/basket-api/"
+                route:
+                  auto_host_rewrite: true
+                  cluster: basket
+              - name: "agg"
+                match:
+                  prefix: "/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/"
+                  cluster: shoppingagg
+          http_filters:
+          - name: envoy.router
+          access_log:
+          - name: envoy.file_access_log
+            filter:
+              not_health_check_filter: {}
+            config:
+              json_format:
+                time: "%START_TIME%"
+                protocol: "%PROTOCOL%"
+                duration: "%DURATION%"
+                request_method: "%REQ(:METHOD)%"
+                request_host: "%REQ(HOST)%"
+                path: "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%"
+                response_flags: "%RESPONSE_FLAGS%"
+                route_name: "%ROUTE_NAME%"
+                upstream_host: "%UPSTREAM_HOST%"
+                upstream_cluster: "%UPSTREAM_CLUSTER%"
+                upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"
+              path: "/tmp/access.log"
+  clusters:
+  - name: shoppingagg
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: webshoppingagg
+        port_value: 80
+  - name: catalog
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: catalog-api
+        port_value: 80
+  - name: basket
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: basket-api
+        port_value: 80
+  - name: ordering
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: ordering-api
+        port_value: 80
+  - name: signalr-hub
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: ordering-signalrhub
+        port_value: 80

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile

@@ -33,7 +33,6 @@ COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Service
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
-COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"
 COPY "Web/WebhookClient/WebhookClient.csproj" "Web/WebhookClient/WebhookClient.csproj"

src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile

@@ -33,7 +33,6 @@ COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Service
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
-COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"
 COPY "Web/WebhookClient/WebhookClient.csproj" "Web/WebhookClient/WebhookClient.csproj"

src/Directory.Packages.props

@@ -74,7 +74,7 @@
     <PackageVersion Include="Microsoft.Extensions.Logging.AzureAppServices" Version="7.0.3" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageVersion Include="Microsoft.NETCore.Platforms" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.4" />
     <PackageVersion Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
     <PackageVersion Include="Moq" Version="4.18.4" />

src/Services/Basket/Basket.API/Dockerfile

@@ -32,7 +32,6 @@ COPY "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj"
 COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj"
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
-COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"

src/Services/Catalog/Catalog.API/Dockerfile

@@ -33,7 +33,6 @@ COPY "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj"
 COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj"
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
-COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"

src/Services/Contact/Contact.API/Contact.API.csproj

@@ -1,26 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>9457faa3-370a-4009-8020-10e7de0fbf17</UserSecretsId>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerfileContext>..\..\..</DockerfileContext>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
-    <PackageReference Include="Swashbuckle.AspNetCore" />
-  </ItemGroup>
-
-</Project>

src/Services/Contact/Contact.API/Controllers/ContactController.cs

@@ -1,48 +0,0 @@
-using Contact.API.Model;
-using Contact.API.ViewModel;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace Contact.API.Controllers;
-
-[Route("api/v1/[controller]")]
-[ApiController]
-public class ContactController : ControllerBase
-{
-    private readonly ApplicationDBContext _context;
-
-    public ContactController(ApplicationDBContext context)
-    {
-        this._context = context ?? throw new ArgumentNullException(nameof(context));
-    }
-
-    [HttpPost]
-    [Route("CreateContects")]
-    public async Task<IActionResult> PostQuery([FromBody]ContactViewModel model)
-    {
-        if(!ModelState.IsValid)
-            return BadRequest(ModelState);
-
-        var result = await _context.Contacts.AddAsync(new Model.Contact
-        {
-            Name = model.Name,
-            Email = model.Email,
-            Message = model.Query ??= string.Empty
-        });
-        return Created(string.Empty, result);
-    }
-
-    [HttpGet]
-    [Route("GetContacts")]
-    public async Task<List<ContactViewModel>> GetContacts()
-    {
-        var result = await _context.Contacts.Select(a => new ContactViewModel
-        {
-            Email = a.Email,
-            Name = a.Name,
-            Query = a.Message
-        }).ToListAsync();
-        return result;
-    }
-}

src/Services/Contact/Contact.API/Dockerfile

@@ -1,60 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
-WORKDIR /app
-EXPOSE 80
-EXPOSE 443
-
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
-WORKDIR /src
-COPY "eShopOnContainers-ServicesAndWebApps.sln" "eShopOnContainers-ServicesAndWebApps.sln"
-
-COPY "ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj" "ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj"
-COPY "ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj" "ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj"
-COPY "BuildingBlocks/EventBus/EventBus/EventBus.csproj" "BuildingBlocks/EventBus/EventBus/EventBus.csproj"
-COPY "BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj" "BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj"
-COPY "BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj" "BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj"
-COPY "BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj" "BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj"
-COPY "BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj" "BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj"
-COPY "BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj" "BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj"
-COPY "Services/Basket/Basket.API/Basket.API.csproj" "Services/Basket/Basket.API/Basket.API.csproj"
-COPY "Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj" "Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj"
-COPY "Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj" "Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj"
-COPY "Services/Catalog/Catalog.API/Catalog.API.csproj" "Services/Catalog/Catalog.API/Catalog.API.csproj"
-COPY "Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj" "Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj"
-COPY "Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj" "Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj"
-COPY "Services/Identity/Identity.API/Identity.API.csproj" "Services/Identity/Identity.API/Identity.API.csproj"
-COPY "Services/Ordering/Ordering.API/Ordering.API.csproj" "Services/Ordering/Ordering.API/Ordering.API.csproj"
-COPY "Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj" "Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj"
-COPY "Services/Ordering/Ordering.Domain/Ordering.Domain.csproj" "Services/Ordering/Ordering.Domain/Ordering.Domain.csproj"
-COPY "Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj" "Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj"
-COPY "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj" "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj"
-COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj"
-COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
-COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
-COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
-COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
-COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
-COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"
-COPY "Web/WebhookClient/WebhookClient.csproj" "Web/WebhookClient/WebhookClient.csproj"
-COPY "Web/WebMVC/WebMVC.csproj" "Web/WebMVC/WebMVC.csproj"
-COPY "Web/WebSPA/WebSPA.csproj" "Web/WebSPA/WebSPA.csproj"
-COPY "Web/WebStatus/WebStatus.csproj" "Web/WebStatus/WebStatus.csproj"
-
-COPY "docker-compose.dcproj" "docker-compose.dcproj"
-
-COPY "Directory.Packages.props" "Directory.Packages.props"
-COPY "NuGet.config" "NuGet.config"
-
-RUN dotnet restore "eShopOnContainers-ServicesAndWebApps.sln"
-
-COPY . .
-WORKDIR "/src/Services/Contact/Contact.API"
-RUN dotnet publish --no-restore -c Release -o /app
-
-FROM build AS publish
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app .
-ENTRYPOINT ["dotnet", "Contact.API.dll"]

src/Services/Contact/Contact.API/Migrations/20230724050259_initilasation.Designer.cs

@@ -1,53 +0,0 @@
-// <auto-generated />
-using System;
-using Contact.API.Model;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace Contact.API.Migrations
-{
-    [DbContext(typeof(ApplicationDBContext))]
-    [Migration("20230724050259_initilasation")]
-    partial class Initilasation
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.3")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("Contact.API.Model.Contact", b =>
-                {
-                    b.Property<Guid>("ID")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Message")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("Contacts");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

src/Services/Contact/Contact.API/Migrations/20230724050259_initilasation.cs

@@ -1,36 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Contact.API.Migrations
-{
-    /// <inheritdoc />
-    public partial class Initilasation : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Contacts",
-                columns: table => new
-                {
-                    ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Name = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Email = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Message = table.Column<string>(type: "nvarchar(max)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Contacts", x => x.ID);
-                });
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "Contacts");
-        }
-    }
-}

src/Services/Contact/Contact.API/Migrations/ApplicationDBContextModelSnapshot.cs

@@ -1,50 +0,0 @@
-// <auto-generated />
-using System;
-using Contact.API.Model;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace Contact.API.Migrations
-{
-    [DbContext(typeof(ApplicationDBContext))]
-    partial class ApplicationDBContextModelSnapshot : ModelSnapshot
-    {
-        protected override void BuildModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.3")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("Contact.API.Model.Contact", b =>
-                {
-                    b.Property<Guid>("ID")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Message")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("Contacts");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

src/Services/Contact/Contact.API/Model/ApplicationDBContext.cs

@@ -1,30 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Design;
-
-namespace Contact.API.Model;
-
-public class ApplicationDBContext : DbContext
-{
-    public ApplicationDBContext(DbContextOptions<ApplicationDBContext> option) : base(option) { }
-    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-    {
-        base.Database.EnsureCreated();
-        base.OnConfiguring(optionsBuilder);
-    }
-
-    public DbSet<Contact> Contacts { get; set; }
-
-}
-
-
-
-public class DbContextFactory : IDesignTimeDbContextFactory<ApplicationDBContext>
-{
-    public ApplicationDBContext CreateDbContext(string[] args)
-    {
-        var optionsBuilder = new DbContextOptionsBuilder<ApplicationDBContext>();
-        optionsBuilder.UseSqlServer("Server=.;Initial Catalog=Microsoft.eShopOnContainers.Services.ContactDb;Integrated Security=true");
-
-        return new ApplicationDBContext(optionsBuilder.Options);
-    }
-}

src/Services/Contact/Contact.API/Model/Contact.cs

@@ -1,18 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Contact.API.Model;
-
-public class Contact
-{
-    [Key]
-    public Guid ID { get; set; }
-
-    [Required]
-    public string Name { get; set; }
-
-    [Required]
-    public string Email { get; set; }
-
-    [Required]
-    public string Message { get; set; }
-}

src/Services/Contact/Contact.API/Program.cs

@@ -1,29 +0,0 @@
-using Contact.API.Model;
-
-var builder = WebApplication.CreateBuilder(args);
-
-// Add services to the container.
-
-builder.Services.
-    AddSqlServer<ApplicationDBContext>("server=127.0.0.1,5433;Initial Catalog=Microsoft.eShopOnContainers.Services.ContactDb;User Id=sa;Password=Pass@word;Encrypt=false");
-builder.Services.AddControllers();
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
-
-var app = builder.Build();
-
-// Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment())
-{
-    app.UseSwagger();
-    app.UseSwaggerUI();
-}
-
-app.UseHttpsRedirection();
-
-app.UseAuthorization();
-
-app.MapControllers();
-
-app.Run();

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

@@ -1,38 +0,0 @@
-{
-  "profiles": {
-    "Contact.API": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "https://localhost:7237;http://localhost:5118"
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "publishAllPorts": true,
-      "useSSL": true
-    }
-  },
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:37689",
-      "sslPort": 44355
-    }
-  }
-}

src/Services/Contact/Contact.API/ViewModel/ContactViewModel.cs

@@ -1,17 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Contact.API.ViewModel;
-
-public class ContactViewModel
-{
-    [Required]
-    [StringLength(maximumLength: 100, MinimumLength = 3)]
-    public required string Name { get; set; }
-
-    [Required]
-    [EmailAddress]
-    public required string Email { get; set; }
-
-    [StringLength(1000)]
-    public string? Query { get; set; }
-}

src/Services/Contact/Contact.API/appsettings.Development.json

@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}

src/Services/Contact/Contact.API/appsettings.json

@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
-}

src/Services/Identity/Identity.API/Dockerfile

@@ -32,7 +32,6 @@ COPY "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj"
 COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj"
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
-COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"

src/Services/Ordering/Ordering.API/Dockerfile

@@ -32,7 +32,6 @@ COPY "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj"
 COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj"
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
-COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"

src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile

@@ -32,7 +32,6 @@ COPY "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj"
 COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj"
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
-COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"

src/Services/Ordering/Ordering.SignalrHub/Dockerfile

@@ -33,7 +33,6 @@ COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Service
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
-COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"
 COPY "Web/WebhookClient/WebhookClient.csproj" "Web/WebhookClient/WebhookClient.csproj"

src/Services/Payment/Payment.API/Dockerfile

@@ -32,7 +32,6 @@ COPY "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj"
 COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj"
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
-COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"

src/Services/Webhooks/Webhooks.API/Dockerfile

@@ -32,7 +32,6 @@ COPY "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj"
 COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj"
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
-COPY ["Services/Contact/Contact.API/Contact.API.csproj", "Services/Contact/Contact.API/Contact.API.csproj"]
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"

src/Web/WebMVC/Dockerfile

@@ -33,7 +33,6 @@ COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Service
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
-COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"
 COPY "Web/WebhookClient/WebhookClient.csproj" "Web/WebhookClient/WebhookClient.csproj"

src/Web/WebSPA/AppSettings.cs

@@ -3,6 +3,7 @@
 public class AppSettings
 {
     public string IdentityUrl { get; set; }
+    public string BasketUrl { get; set; }
     public string MarketingUrl { get; set; }
 
     public string PurchaseUrl { get; set; }

src/Web/WebSPA/Dockerfile

@@ -44,7 +44,6 @@ COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Service
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
-COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"
 COPY "Web/WebhookClient/WebhookClient.csproj" "Web/WebhookClient/WebhookClient.csproj"

src/Web/WebSPA/Extensions/Extensions.cs

@@ -1,12 +0,0 @@
-internal static class Extensions
-{
-    public static IServiceCollection AddHealthChecks(this IServiceCollection services, IConfiguration configuration)
-    {
-        var hcBuilder = services.AddHealthChecks();
-
-        hcBuilder
-            .AddUrlGroup(_ => new Uri(configuration["IdentityUrlHC"]), name: "identityapi-check", tags: new string[] { "identityapi" });
-
-        return services;
-    }
-}

src/Web/WebSPA/GlobalUsings.cs

@@ -1,6 +1,24 @@
-global using System.IO.Compression;
+global using eShopConContainers.WebSPA;
+global using Microsoft.AspNetCore;
+global using Microsoft.AspNetCore.Hosting;
+global using Microsoft.Extensions.Configuration;
+global using Microsoft.Extensions.Logging;
+global using System.IO;
 global using eShopOnContainers.WebSPA;
+global using HealthChecks.UI.Client;
+global using Microsoft.AspNetCore.Antiforgery;
+global using Microsoft.AspNetCore.Builder;
+global using Microsoft.AspNetCore.DataProtection;
+global using Microsoft.AspNetCore.Diagnostics.HealthChecks;
+global using Microsoft.AspNetCore.Http;
+global using Microsoft.AspNetCore.Mvc;
 global using Microsoft.AspNetCore.SpaServices.AngularCli;
-global using Microsoft.Extensions.Options;
+global using Microsoft.Extensions.DependencyInjection;
-global using Services.Common;
+global using Microsoft.Extensions.Diagnostics.HealthChecks;
+global using Microsoft.Extensions.Hosting;
+global using StackExchange.Redis;
+global using System;
 global using WebSPA.Infrastructure;
+global using Microsoft.Extensions.Options;
+global using System.IO.Compression;
+global using System.Linq;

src/Web/WebSPA/Program.cs

@@ -1,21 +1,78 @@
 var builder = WebApplication.CreateBuilder(args);
+builder.WebHost.UseContentRoot(Directory.GetCurrentDirectory());
 
-builder.AddServiceDefaults();
+builder.Services.AddApplicationInsightsTelemetry(builder.Configuration);
+builder.Services.AddApplicationInsightsKubernetesEnricher();
+builder.Services.AddHealthChecks()
+    .AddCheck("self", () => HealthCheckResult.Healthy())
+    .AddUrlGroup(new Uri(builder.Configuration["IdentityUrlHC"]), name: "identityapi-check", tags: new string[] { "identityapi" });
 
-builder.Services.AddHealthChecks(builder.Configuration);
 builder.Services.Configure<AppSettings>(builder.Configuration);
+if (builder.Configuration.GetValue<string>("IsClusterEnv") == bool.TrueString)
+{
+    builder.Services.AddDataProtection(opts =>
+    {
+        opts.ApplicationDiscriminator = "eshop.webspa";
+    })
+    .PersistKeysToStackExchangeRedis(ConnectionMultiplexer.Connect(builder.Configuration["DPConnectionString"]), "DataProtection-Keys");
+}
+
+
+// Add Anti-forgery services and configure the header name that angular will use by default.
+builder.Services.AddAntiforgery(options => options.HeaderName = "X-XSRF-TOKEN");
+
+// Add controllers support and add a global AutoValidateAntiforgeryTokenFilter that will make the application check for an Anti-forgery token on all "mutating" requests (POST, PUT, DELETE).
+// The AutoValidateAntiforgeryTokenFilter is an internal class registered when we register views, so we need to register controllers and views also.
+builder.Services.AddControllersWithViews(options => options.Filters.Add(new AutoValidateAntiforgeryTokenAttribute()))
+    .AddJsonOptions(options =>
+    {
+        options.JsonSerializerOptions.PropertyNameCaseInsensitive = true;
+    });
 
 // Setup where the compiled version of our spa application will be, when in production. 
-builder.Services.AddSpaStaticFiles(options =>
+builder.Services.AddSpaStaticFiles(configuration =>
 {
-    options.RootPath = "wwwroot";
+    configuration.RootPath = "wwwroot";
 });
 
+builder.Logging.AddConfiguration(builder.Configuration.GetSection("Logging"));
+builder.Logging.AddAzureWebAppDiagnostics();
+
 var app = builder.Build();
 
-app.UseServiceDefaults();
+// Here we add Angular default Anti-forgery cookie name on first load. https://angular.io/guide/http#security-xsrf-protection
+// This cookie will be read by Angular app and its value will be sent back to the application as the header configured in .AddAntiforgery()
+var antiForgery = app.Services.GetRequiredService<IAntiforgery>();
+app.Use(next => context =>
+{
+    string path = context.Request.Path.Value;
 
-app.UseFileServer();
+    if (string.Equals(path, "/", StringComparison.OrdinalIgnoreCase) ||
+        string.Equals(path, "/index.html", StringComparison.OrdinalIgnoreCase))
+    {
+        // The request token has to be sent as a JavaScript-readable cookie, 
+        // and Angular uses it by default.
+        var tokens = antiForgery.GetAndStoreTokens(context);
+        context.Response.Cookies.Append("XSRF-TOKEN", tokens.RequestToken,
+            new CookieOptions() { HttpOnly = false });
+    }
+
+    return next(context);
+});
+
+// Seed Data
+WebContextSeed.Seed(app, app.Environment, app.Services.GetRequiredService<ILogger<WebContextSeed>>());
+
+var pathBase = app.Configuration["PATH_BASE"];
+
+if (!string.IsNullOrEmpty(pathBase))
+{
+    app.Services.GetRequiredService<ILogger<WebContextSeed>>().LogDebug("Using PATH_BASE '{PathBase}'", pathBase);
+    app.UsePathBase(pathBase);
+}
+
+app.UseDefaultFiles();
+app.UseStaticFiles();
 
 // This will make the application to respond with the index.html and the rest of the assets present on the configured folder (at AddSpaStaticFiles() (wwwroot))
 if (!app.Environment.IsDevelopment())
@@ -24,12 +81,16 @@ if (!app.Environment.IsDevelopment())
 }
 
 app.UseRouting();
-
+app.MapDefaultControllerRoute();
-#pragma warning disable ASP0014 // Suggest using top level route registrations
+app.MapControllers();
-app.UseEndpoints(routes =>
+app.MapHealthChecks("/liveness", new HealthCheckOptions
 {
-    // TODO: Change this route
+    Predicate = r => r.Name.Contains("self")
-    routes.MapGet("/home/configuration", (IOptions<AppSettings> options) => options.Value);
+});
+app.MapHealthChecks("/hc", new HealthCheckOptions()
+{
+    Predicate = _ => true,
+    ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse
 });
 
 // Handles all still unattended (by any other middleware) requests by returning the default page of the SPA (wwwroot/index.html).
@@ -48,7 +109,4 @@ app.UseSpa(spa =>
     }
 });
 
-// Seed Data
-WebContextSeed.Seed(app, app.Environment, app.Logger);
-
 await app.RunAsync();

src/Web/WebSPA/Properties/launchSettings.json

@@ -1,5 +1,24 @@
 {
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:58018/",
+      "sslPort": 0
+    }
+  },
   "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Docker": {
+      "commandName": "Docker",
+      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
+      "publishAllPorts": true
+    },
     "WebSPA": {
       "commandName": "Project",
       "launchBrowser": true,
@@ -8,11 +27,6 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "applicationUrl": "http://localhost:5104"
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
-      "publishAllPorts": true
     }
   }
 }

src/Web/WebSPA/Server/Controllers/HomeController.cs

@@ -0,0 +1,18 @@
+// For more information on enabling MVC for empty projects, visit http://go.microsoft.com/fwlink/?LinkID=397860
+namespace eShopConContainers.WebSPA.Server.Controllers;
+
+public class HomeController : Controller
+{
+    private readonly IWebHostEnvironment _env;
+    private readonly IOptionsSnapshot<AppSettings> _settings;
+
+    public HomeController(IWebHostEnvironment env, IOptionsSnapshot<AppSettings> settings)
+    {
+        _env = env;
+        _settings = settings;
+    }
+    public IActionResult Configuration()
+    {
+        return Json(_settings.Value);
+    }
+}

src/Web/WebSPA/Server/Infrastructure/WebContextSeed.cs

@@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging;
 
 public class WebContextSeed
 {
-    public static void Seed(IApplicationBuilder applicationBuilder, IWebHostEnvironment env, ILogger logger)
+    public static void Seed(IApplicationBuilder applicationBuilder, IWebHostEnvironment env, ILogger<WebContextSeed> logger)
     {
         var settings = applicationBuilder
             .ApplicationServices.GetRequiredService<IOptions<AppSettings>>().Value;

src/Web/WebSPA/WebSPA.csproj

@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnetcorespa-c23d27a4-eb88-4b18-9b77-2a93f3b15119</UserSecretsId>
     <TypeScriptCompileOnSaveEnabled>false</TypeScriptCompileOnSaveEnabled>
+    <IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <GeneratedItemPatterns>wwwroot/dist/**</GeneratedItemPatterns>
     <DefaultItemExcludes>$(DefaultItemExcludes);$(GeneratedItemPatterns)</DefaultItemExcludes>
@@ -22,20 +22,26 @@
     <Content Update="appsettings.json;">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>
+    <Content Update="web.config;">
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
     <Content Update="wwwroot\**\*;">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="AspNetCore.HealthChecks.UI.Client" />
     <PackageReference Include="AspNetCore.HealthChecks.Uris" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" />
+    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" />
+    <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" />
     <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" />    
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
-  </ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" />
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Services\Services.Common\Services.Common.csproj" />
   </ItemGroup>
   
   <Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') ">

src/Web/WebSPA/appsettings.json

@@ -1,19 +1,24 @@
 {
+  "IdentityUrl": "http://host.docker.internal:5105",
+  "CallBackUrl": "http://host.docker.internal:5104/",
+  "BasketUrl" : "http://host.docker.internal:5103",
+  "PurchaseUrl": "http://host.docker.internal:5202",
+  "PurchaseUrlHC": "http://host.docker.internal:5202/hc",
+  "IdentityUrlHC": "http://host.docker.internal:5105/hc",
+  "SignalrHubUrl": "http://host.docker.internal:5112",
+  "UseCustomizationData": true,
+  "IsClusterEnv": "False",
+  "ActivateCampaignDetailFunction": false,
   "Logging": {
+    "Console": {
+      "IncludeScopes": false
+    },
     "LogLevel": {
-      "Default": "Information",
+      "Default": "Debug",
-      "Microsoft.AspNetCore": "Warning"
+      "System": "Information",
+      "Microsoft": "Information"
     }
   },
-  "IdentityUrl": "http://localhost:5223",
-  "CallBackUrl": "http://localhost:5331/",
-  "PurchaseUrl": "http://localhost:5229",
-  "PurchaseUrlHC": "http://localhost:5229/hc",
-  "IdentityUrlHC": "http://localhost:5223/hc",
-  "SignalrHubUrl": "http://localhost:5229",
-  "UseCustomizationData": true,
-  "IsClusterEnv": false,
-  "ActivateCampaignDetailFunction": false,
   "ApplicationInsights": {
     "InstrumentationKey": ""
   }

src/Web/WebSPA/web.config

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <!--
+    Configure your application settings in appsettings.json. Learn more at https://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 />
+    </aspNetCore>
+  </system.webServer>
+</configuration>

src/Web/WebStatus/Dockerfile

@@ -32,7 +32,6 @@ COPY "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj"
 COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj"
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
-COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"

src/Web/WebhookClient/Dockerfile

@@ -33,7 +33,6 @@ COPY "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj"
 COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj"
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
-COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"

src/docker-compose.dcproj

@@ -3,7 +3,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>fea0c318-ffed-4d39-8781-265718ca43dd</ProjectGuid>
     <DockerLaunchBrowser>True</DockerLaunchBrowser>
-    <DockerServiceUrl>http://localhost:5100</DockerServiceUrl>
+    <DockerServiceUrl>http://host.docker.internal:5100</DockerServiceUrl>
     <DockerServiceName>webmvc</DockerServiceName>
     <DockerTargetOS>Linux</DockerTargetOS>
     <ProjectVersion>2.1</ProjectVersion>

src/docker-compose.override.yml

@@ -33,7 +33,6 @@ services:
       - "6379:6379"
     volumes:
       - eshop-basketdata:/data
-
   rabbitmq:
     ports:
       - "15672:15672"
@@ -53,7 +52,6 @@ services:
       - WebShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5121
       - WebhooksApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5113
       - WebhooksWebClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5114
-      - ContactApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5106
       - UseCustomizationData=True
       - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
       - OrchestratorType=${ORCHESTRATOR_TYPE}
@@ -158,15 +156,6 @@ services:
     ports:
       - "5108:80"
 
-  contect-api:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionStrings__CatalogDb=${ESHOP_AZURE_CATALOG_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.ContactDb;User Id=sa;Password=Pass@word;Encrypt=False;TrustServerCertificate=true}
-      - OrchestratorType=${ORCHESTRATOR_TYPE}
-    ports:
-      - "5106:80"
- 
   webhooks-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
@@ -180,6 +169,20 @@ services:
     ports:
       - "5113:80"
 
+  mobileshoppingapigw:
+    volumes:
+      - ./ApiGateways/Envoy/config/mobileshopping:/etc/envoy
+    ports:
+    - "5200:80"
+    - "15200:8001"
+
+  webshoppingapigw:
+    volumes:
+      - ./ApiGateways/Envoy/config/webshopping:/etc/envoy
+    ports:
+    - "5202:80"
+    - "15202:8001"
+
   mobileshoppingagg:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
@@ -273,13 +276,13 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - IdentityUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
+      - Identity__Url=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
-      - PurchaseUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5121
+      - PurchaseUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5202
       - IdentityUrlHC=http://identity-api/hc
-      - SignalrHubUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5121
       - UseCustomizationData=True
       - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
       - OrchestratorType=${ORCHESTRATOR_TYPE}
+      - SignalrHubUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5202
     ports:
       - "5104:80"
 

src/docker-compose.prod.yml

@@ -111,7 +111,7 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - IdentityUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
+      - Identity__Url=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
       - PurchaseUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5202
       - CatalogUrlHC=http://catalog-api/hc
       - OrderingUrlHC=http://ordering-api/hc
@@ -128,7 +128,7 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - PurchaseUrl=http://webshoppingagg
+      - PurchaseUrl=http://webshoppingapigw
       - IdentityUrl=http://10.0.75.1:5105  # Local Mac: Use http://docker.for.mac.localhost:5105 || Local Windows:  Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser. || #Remote access: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser.
       - CatalogUrlHC=http://catalog-api/hc
       - OrderingUrlHC=http://ordering-api/hc
@@ -191,6 +191,26 @@ services:
       - "15672:15672"  # Important: In a production environment your should remove the external port
       - "5672:5672"    # Important: In a production environment your should remove the external port
 
+  mobileshoppingapigw:
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+      - IdentityUrl=http://identity-api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+    ports:
+      - "5200:80"   # Important: In a production environment your should remove the external port (5200) kept here for microservice debugging purposes.
+                    # The API Gateway redirects and access through the internal port (80).
+    volumes:
+      - ./ApiGateways/Mobile.Bff.Shopping/apigw:/app/configuration
+
+  webshoppingapigw:
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+      - IdentityUrl=http://identity-api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+    ports:
+      - "5202:80"   # Important: In a production environment your should remove the external port (5202) kept here for microservice debugging purposes.
+                    # The API Gateway redirects and access through the internal port (80).
+    volumes:
+      - ./ApiGateways/Web.Bff.Shopping/apigw:/app/configuration
+
   mobileshoppingagg:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development

src/docker-compose.yml

@@ -1,31 +1,32 @@
 version: '3.4'
+
 services:
+
   seq:
-    image: 'datalust/seq:latest'
+    image: datalust/seq:latest
+
   sqldata:
-    image: 'mcr.microsoft.com/mssql/server:2019-latest'
+    image: mcr.microsoft.com/mssql/server:2019-latest 
+
   nosqldata:
     image: mongo
+
   basketdata:
-    image: 'redis:alpine'
+    image: redis:alpine
+
   rabbitmq:
-    image: 'rabbitmq:3-management-alpine'
+    image: rabbitmq:3-management-alpine
+
   identity-api:
-    image: '${REGISTRY:-eshop}/identity.api:${PLATFORM:-linux}-${TAG:-latest}'
+    image: ${REGISTRY:-eshop}/identity.api:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Services/Identity/Identity.API/Dockerfile
     depends_on:
       - sqldata
-  contect-api:
+
-    image: '${REGISTRY:-eshop}/contect.api:${PLATFORM:-linux}-${TAG:-latest}'
-    build:
-      context: .
-      dockerfile: Services/Contact/Contact.API/Dockerfile
-    depends_on:
-      - sqldata
   basket-api:
-    image: '${REGISTRY:-eshop}/basket.api:${PLATFORM:-linux}-${TAG:-latest}'
+    image: ${REGISTRY:-eshop}/basket.api:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Services/Basket/Basket.API/Dockerfile
@@ -33,46 +34,55 @@ services:
       - basketdata
       - identity-api
       - rabbitmq
+
   catalog-api:
-    image: '${REGISTRY:-eshop}/catalog.api:${PLATFORM:-linux}-${TAG:-latest}'
+    image: ${REGISTRY:-eshop}/catalog.api:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Services/Catalog/Catalog.API/Dockerfile
     depends_on:
       - sqldata
       - rabbitmq
+
   ordering-api:
-    image: '${REGISTRY:-eshop}/ordering.api:${PLATFORM:-linux}-${TAG:-latest}'
+    image: ${REGISTRY:-eshop}/ordering.api:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Services/Ordering/Ordering.API/Dockerfile
     depends_on:
       - sqldata
       - rabbitmq
+
   ordering-backgroundtasks:
-    image: '${REGISTRY:-eshop}/ordering.backgroundtasks:${PLATFORM:-linux}-${TAG:-latest}'
+    image: ${REGISTRY:-eshop}/ordering.backgroundtasks:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Services/Ordering/Ordering.BackgroundTasks/Dockerfile
     depends_on:
       - sqldata
       - rabbitmq
+
   payment-api:
-    image: '${REGISTRY:-eshop}/payment.api:${PLATFORM:-linux}-${TAG:-latest}'
+    image: ${REGISTRY:-eshop}/payment.api:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Services/Payment/Payment.API/Dockerfile
     depends_on:
       - rabbitmq
+
   webhooks-api:
-    image: '${REGISTRY:-eshop}/webhooks.api:${PLATFORM:-linux}-${TAG:-latest}'
+    image: ${REGISTRY:-eshop}/webhooks.api:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Services/Webhooks/Webhooks.API/Dockerfile
     depends_on:
       - sqldata
+
+  mobileshoppingapigw:
+    image: envoyproxy/envoy:v1.11.1
+
   mobileshoppingagg:
-    image: '${REGISTRY:-eshop}/mobileshoppingagg:${PLATFORM:-linux}-${TAG:-latest}'
+    image: ${REGISTRY:-eshop}/mobileshoppingagg:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
@@ -84,8 +94,9 @@ services:
       - ordering-api
       - catalog-api
       - basket-api
+
   webshoppingagg:
-    image: '${REGISTRY:-eshop}/webshoppingagg:${PLATFORM:-linux}-${TAG:-latest}'
+    image: ${REGISTRY:-eshop}/webshoppingagg:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
@@ -97,8 +108,9 @@ services:
       - ordering-api
       - catalog-api
       - basket-api
+
   ordering-signalrhub:
-    image: '${REGISTRY:-eshop}/ordering.signalrhub:${PLATFORM:-linux}-${TAG:-latest}'
+    image: ${REGISTRY:-eshop}/ordering.signalrhub:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Services/Ordering/Ordering.SignalrHub/Dockerfile
@@ -110,31 +122,39 @@ services:
       - ordering-api
       - catalog-api
       - basket-api
+
   webstatus:
-    image: '${REGISTRY:-eshop}/webstatus:${PLATFORM:-linux}-${TAG:-latest}'
+    image: ${REGISTRY:-eshop}/webstatus:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Web/WebStatus/Dockerfile
+
   webspa:
-    image: '${REGISTRY:-eshop}/webspa:${PLATFORM:-linux}-${TAG:-latest}'
+    image: ${REGISTRY:-eshop}/webspa:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Web/WebSPA/Dockerfile
       args:
-        NODE_IMAGE: '${NODE_IMAGE:-node:16-bullseye}'
+        NODE_IMAGE: ${NODE_IMAGE:-node:16-bullseye}
     depends_on:
       - webshoppingagg
+      - webshoppingapigw
+
   webmvc:
-    image: '${REGISTRY:-eshop}/webmvc:${PLATFORM:-linux}-${TAG:-latest}'
+    image: ${REGISTRY:-eshop}/webmvc:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Web/WebMVC/Dockerfile
     depends_on:
       - webshoppingagg
+
   webhooks-client:
-    image: '${REGISTRY:-eshop}/webhooks.client:${PLATFORM:-linux}-${TAG:-latest}'
+    image: ${REGISTRY:-eshop}/webhooks.client:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Web/WebhookClient/Dockerfile
     depends_on:
       - webhooks-api
+
+  webshoppingapigw:
+    image: envoyproxy/envoy:v1.11.1

src/eShopOnContainers-ServicesAndWebApps.sln

@@ -103,8 +103,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Webhooks.API", "Services\We
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebhookClient", "Web\WebhookClient\WebhookClient.csproj", "{766D7E92-6AF0-476C-ADD5-282BF4D8C576}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Envoy", "Envoy", "{882A8F3A-C61F-4C44-86DD-A5A258714BF2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{3ABEEE8C-35E0-4185-9825-C44326151F5B}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.BackgroundTasks", "Services\Ordering\Ordering.BackgroundTasks\Ordering.BackgroundTasks.csproj", "{D4DBA4A3-E4A5-4D9D-8ACF-F38F7D506191}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "webshopping", "webshopping", "{966B1B0B-2AE0-4438-8741-1C5A05556095}"
+	ProjectSection(SolutionItems) = preProject
+		ApiGateways\Envoy\config\webshopping\envoy.yaml = ApiGateways\Envoy\config\webshopping\envoy.yaml
+	EndProjectSection
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile.Bff.Shopping", "Mobile.Bff.Shopping", "{798BFC44-2CCD-45FA-B37A-5173B03C2B30}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mobile.Shopping.HttpAggregator", "ApiGateways\Mobile.Bff.Shopping\aggregator\Mobile.Shopping.HttpAggregator.csproj", "{B62E859F-825E-4C8B-93EC-5966EACFD026}"
@@ -117,10 +126,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Services.Common", "Services
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{42B85D0F-2ED6-4C00-91FA-103DACC3D5E2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Contact", "Contact", "{C7684980-DC20-4957-85E4-92363C252256}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contact.API", "Services\Contact\Contact.API\Contact.API.csproj", "{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -1527,54 +1532,6 @@ Global
 		{CD430CE4-D5E0-4C96-84F5-AEC9162651B5}.Release|x64.Build.0 = Release|Any CPU
 		{CD430CE4-D5E0-4C96-84F5-AEC9162651B5}.Release|x86.ActiveCfg = Release|Any CPU
 		{CD430CE4-D5E0-4C96-84F5-AEC9162651B5}.Release|x86.Build.0 = Release|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|x64.Build.0 = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|x86.Build.0 = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|ARM.Build.0 = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|x64.Build.0 = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|x86.Build.0 = Debug|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|ARM.ActiveCfg = Release|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|ARM.Build.0 = Release|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|iPhone.Build.0 = Release|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|x64.ActiveCfg = Release|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|x64.Build.0 = Release|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|x86.ActiveCfg = Release|Any CPU
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1623,15 +1580,16 @@ Global
 		{E0AA11C4-2873-461D-8F82-53392530FB7A} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8}
 		{84E2016E-0435-44C6-8020-3D288AA38B2C} = {E0AA11C4-2873-461D-8F82-53392530FB7A}
 		{766D7E92-6AF0-476C-ADD5-282BF4D8C576} = {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04}
+		{882A8F3A-C61F-4C44-86DD-A5A258714BF2} = {77849D35-37D4-4802-81DC-9477B2775A40}
+		{3ABEEE8C-35E0-4185-9825-C44326151F5B} = {882A8F3A-C61F-4C44-86DD-A5A258714BF2}
 		{D4DBA4A3-E4A5-4D9D-8ACF-F38F7D506191} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
+		{966B1B0B-2AE0-4438-8741-1C5A05556095} = {3ABEEE8C-35E0-4185-9825-C44326151F5B}
 		{798BFC44-2CCD-45FA-B37A-5173B03C2B30} = {77849D35-37D4-4802-81DC-9477B2775A40}
 		{B62E859F-825E-4C8B-93EC-5966EACFD026} = {798BFC44-2CCD-45FA-B37A-5173B03C2B30}
 		{373D8AA1-36BE-49EC-89F0-6CB736666285} = {807BB76E-B2BB-47A2-A57B-3D1B20FF5E7F}
 		{95D735BE-2899-4495-BE3F-2600E93B4E3C} = {373D8AA1-36BE-49EC-89F0-6CB736666285}
 		{CD430CE4-D5E0-4C96-84F5-AEC9162651B5} = {42B85D0F-2ED6-4C00-91FA-103DACC3D5E2}
 		{42B85D0F-2ED6-4C00-91FA-103DACC3D5E2} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8}
-		{C7684980-DC20-4957-85E4-92363C252256} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8}
-		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3} = {C7684980-DC20-4957-85E4-92363C252256}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {25728519-5F0F-4973-8A64-0A81EB4EA8D9}

src/launchSettings.json

@@ -9,6 +9,7 @@
         "catalog-api": "StartDebugging",
         "identity-api": "StartDebugging",
         "mobileshoppingagg": "StartDebugging",
+        "mobileshoppingapigw": "StartWithoutDebugging",
         "nosqldata": "StartWithoutDebugging",
         "ordering-api": "StartDebugging",
         "ordering-backgroundtasks": "StartDebugging",
@@ -21,6 +22,7 @@
         "webhooks-client": "StartDebugging",
         "webmvc": "StartDebugging",
         "webshoppingagg": "StartDebugging",
+        "webshoppingapigw": "StartWithoutDebugging",
         "webspa": "StartDebugging",
         "webstatus": "StartDebugging"
       }