Code Re-factorings and formatted in web Aggregator BFF projects

src/ApiGateways/Mobile.Bff.Marketing/apigw/configuration.json

@@ -1,34 +1,33 @@
 {
-    "ReRoutes": [
-      {
-        "DownstreamPathTemplate": "/api/{version}/{everything}",
-        "DownstreamScheme": "http",
-        "DownstreamHostAndPorts": [
-          {
-            "Host": "marketing.api",
-            "Port": 80
-          }
-        ],
-        "UpstreamPathTemplate": "/api/{version}/m/{everything}",
-        "UpstreamHttpMethod": []
-      },
-      {
-        "DownstreamPathTemplate": "/api/{version}/{everything}",
-        "DownstreamScheme": "http",
-        "DownstreamHostAndPorts": [
-          {
-            "Host": "locations.api",
-            "Port": 80
-          }
-        ],
-        "UpstreamPathTemplate": "/api/{version}/l/{everything}",
-        "UpstreamHttpMethod": []
-      }
-  
-    ],
-    "GlobalConfiguration": {
-      "RequestIdKey": "OcRequestId",
-      "AdministrationPath": "/administration"
-    }
-  }
-    
+	"ReRoutes": [
+		{
+			"DownstreamPathTemplate": "/api/{version}/{everything}",
+			"DownstreamScheme": "http",
+			"DownstreamHostAndPorts": [
+				{
+					"Host": "marketing.api",
+					"Port": 80
+				}
+			],
+			"UpstreamPathTemplate": "/api/{version}/m/{everything}",
+			"UpstreamHttpMethod": []
+		},
+		{
+			"DownstreamPathTemplate": "/api/{version}/{everything}",
+			"DownstreamScheme": "http",
+			"DownstreamHostAndPorts": [
+				{
+					"Host": "locations.api",
+					"Port": 80
+				}
+			],
+			"UpstreamPathTemplate": "/api/{version}/l/{everything}",
+			"UpstreamHttpMethod": []
+		}
+
+	],
+	"GlobalConfiguration": {
+		"RequestIdKey": "OcRequestId",
+		"AdministrationPath": "/administration"
+	}
+}

src/ApiGateways/Web.Bff.Marketing/apigw/configuration.json

@@ -1,34 +1,33 @@
 {
-  "ReRoutes": [
-    {
-      "DownstreamPathTemplate": "/api/{version}/{everything}",
-      "DownstreamScheme": "http",
-      "DownstreamHostAndPorts": [
-        {
-          "Host": "marketing.api",
-          "Port": 80
-        }
-      ],
-      "UpstreamPathTemplate": "/api/{version}/m/{everything}",
-      "UpstreamHttpMethod": []
-    },
-    {
-      "DownstreamPathTemplate": "/api/{version}/{everything}",
-      "DownstreamScheme": "http",
-      "DownstreamHostAndPorts": [
-        {
-          "Host": "locations.api",
-          "Port": 80
-        }
-      ],
-      "UpstreamPathTemplate": "/api/{version}/l/{everything}",
-      "UpstreamHttpMethod": []
-    }
+	"ReRoutes": [
+		{
+			"DownstreamPathTemplate": "/api/{version}/{everything}",
+			"DownstreamScheme": "http",
+			"DownstreamHostAndPorts": [
+				{
+					"Host": "marketing.api",
+					"Port": 80
+				}
+			],
+			"UpstreamPathTemplate": "/api/{version}/m/{everything}",
+			"UpstreamHttpMethod": []
+		},
+		{
+			"DownstreamPathTemplate": "/api/{version}/{everything}",
+			"DownstreamScheme": "http",
+			"DownstreamHostAndPorts": [
+				{
+					"Host": "locations.api",
+					"Port": 80
+				}
+			],
+			"UpstreamPathTemplate": "/api/{version}/l/{everything}",
+			"UpstreamHttpMethod": []
+		}
 
-  ],
-  "GlobalConfiguration": {
-    "RequestIdKey": "OcRequestId",
-    "AdministrationPath": "/administration"
-  }
+	],
+	"GlobalConfiguration": {
+		"RequestIdKey": "OcRequestId",
+		"AdministrationPath": "/administration"
+	}
 }
-  

src/ApiGateways/Web.Bff.Shopping/aggregator/Config/UrlsConfig.cs

@@ -1,31 +1,28 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config
 {
-    public class UrlsConfig
-    {
-        public class CatalogOperations
-        {
-            public static string GetItemById(int id) => $"/api/v1/catalog/items/{id}";
-            public static string GetItemsById(IEnumerable<int> ids) => $"/api/v1/catalog/items?ids={string.Join(',', ids)}";
-        }
+	public class UrlsConfig
+	{
+		public class CatalogOperations
+		{
+			public static string GetItemById(int id) => $"/api/v1/catalog/items/{id}";
+			public static string GetItemsById(IEnumerable<int> ids) => $"/api/v1/catalog/items?ids={string.Join(',', ids)}";
+		}
 
-        public class BasketOperations
-        {
-            public static string GetItemById(string id) => $"/api/v1/basket/{id}";
-            public static string UpdateBasket() => "/api/v1/basket";
-        }
+		public class BasketOperations
+		{
+			public static string GetItemById(string id) => $"/api/v1/basket/{id}";
+			public static string UpdateBasket() => "/api/v1/basket";
+		}
 
-        public class OrdersOperations
-        {
-            public static string GetOrderDraft() => "/api/v1/orders/draft";
-        }
+		public class OrdersOperations
+		{
+			public static string GetOrderDraft() => "/api/v1/orders/draft";
+		}
 
-        public string Basket { get; set; }
-        public string Catalog { get; set; }
-        public string Orders { get; set; }
-    }
+		public string Basket { get; set; }
+		public string Catalog { get; set; }
+		public string Orders { get; set; }
+	}
 }

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

@@ -9,125 +9,125 @@ using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Controllers
 {
-    [Route("api/v1/[controller]")]
-    [Authorize]
-    public class BasketController : Controller
-    {
-        private readonly ICatalogService _catalog;
-        private readonly IBasketService _basket;
-        public BasketController(ICatalogService catalogService, IBasketService basketService)
-        {
-            _catalog = catalogService;
-            _basket = basketService;
-        }
-
-        [HttpPost]
-        [HttpPut]
-        public async Task<IActionResult> UpdateAllBasket([FromBody] UpdateBasketRequest data)
-        {
-
-            if (data.Items == null || !data.Items.Any())
-            {
-                return BadRequest("Need to pass at least one basket line");
-            }
-
-            // Retrieve the current basket
-            var currentBasket = await _basket.GetById(data.BuyerId);
-            if (currentBasket == null)
-            {
-                currentBasket = new BasketData(data.BuyerId);
-            }
-
-            var catalogItems = await _catalog.GetCatalogItems(data.Items.Select(x => x.ProductId));
-            var newBasket = new BasketData(data.BuyerId);
-
-            foreach (var bitem in data.Items)
-            {
-                var catalogItem = catalogItems.SingleOrDefault(ci => ci.Id == bitem.ProductId);
-                if (catalogItem == null)
-                {
-                    return BadRequest($"Basket refers to a non-existing catalog item ({bitem.ProductId})");
-                }
-
-                newBasket.Items.Add(new BasketDataItem()
-                {
-                    Id = bitem.Id,
-                    ProductId = catalogItem.Id.ToString(),
-                    ProductName = catalogItem.Name,
-                    PictureUrl = catalogItem.PictureUri,
-                    UnitPrice = catalogItem.Price,
-                    Quantity = bitem.Quantity
-                });
-            }
-
-            await _basket.Update(newBasket);
-            return Ok(newBasket);
-        }
-
-        [HttpPut]
-        [Route("items")]
-        public async Task<IActionResult> UpdateQuantities([FromBody] UpdateBasketItemsRequest data)
-        {
-            if (!data.Updates.Any())
-            {
-                return BadRequest("No updates sent");
-            }
-
-            // Retrieve the current basket
-            var currentBasket = await _basket.GetById(data.BasketId);
-            if (currentBasket == null)
-            {
-                return BadRequest($"Basket with id {data.BasketId} not found.");
-            }
-
-            // Update with new quantities
-            foreach (var update in data.Updates)
-            {
-                var basketItem = currentBasket.Items.SingleOrDefault(bitem => bitem.Id == update.BasketItemId);
-                if (basketItem == null)
-                {
-                    return BadRequest($"Basket item with id {update.BasketItemId} not found");
-                }
-                basketItem.Quantity = update.NewQty;
-            }
-
-            // Save the updated basket
-            await _basket.Update(currentBasket);
-            return Ok(currentBasket);
-        }
-
-        [HttpPost]
-        [Route("items")]
-        public async Task<IActionResult> AddBasketItem([FromBody] AddBasketItemRequest data)
-        {
-            if (data == null || data.Quantity == 0)
-            {
-                return BadRequest("Invalid payload");
-            }
-
-            // Step 1: Get the item from catalog
-            var item = await _catalog.GetCatalogItem(data.CatalogItemId);
-
-            //item.PictureUri = 
-
-            // Step 2: Get current basket status
-            var currentBasket = (await _basket.GetById(data.BasketId)) ?? new BasketData(data.BasketId);
-            // Step 3: Merge current status with new product
-            currentBasket.Items.Add(new BasketDataItem()
-            {
-                UnitPrice = item.Price,
-                PictureUrl = item.PictureUri,
-                ProductId = item.Id.ToString(),
-                ProductName = item.Name,
-                Quantity = data.Quantity,
-                Id = Guid.NewGuid().ToString()
-            });
-
-            // Step 4: Update basket
-            await _basket.Update(currentBasket);
-
-
-            return Ok();
-        }
-    }
+	[Route("api/v1/[controller]")]
+	[Authorize]
+	public class BasketController : Controller
+	{
+		private readonly ICatalogService _catalog;
+		private readonly IBasketService _basket;
+		public BasketController(ICatalogService catalogService, IBasketService basketService)
+		{
+			_catalog = catalogService;
+			_basket = basketService;
+		}
+
+		[HttpPost]
+		[HttpPut]
+		public async Task<IActionResult> UpdateAllBasket([FromBody] UpdateBasketRequest data)
+		{
+
+			if (data.Items == null || !data.Items.Any())
+			{
+				return BadRequest("Need to pass at least one basket line");
+			}
+
+			// Retrieve the current basket
+			var currentBasket = await _basket.GetById(data.BuyerId);
+			if (currentBasket == null)
+			{
+				currentBasket = new BasketData(data.BuyerId);
+			}
+
+			var catalogItems = await _catalog.GetCatalogItems(data.Items.Select(x => x.ProductId));
+			var newBasket = new BasketData(data.BuyerId);
+
+			foreach (var bitem in data.Items)
+			{
+				var catalogItem = catalogItems.SingleOrDefault(ci => ci.Id == bitem.ProductId);
+				if (catalogItem == null)
+				{
+					return BadRequest($"Basket refers to a non-existing catalog item ({bitem.ProductId})");
+				}
+
+				newBasket.Items.Add(new BasketDataItem()
+				{
+					Id = bitem.Id,
+					ProductId = catalogItem.Id.ToString(),
+					ProductName = catalogItem.Name,
+					PictureUrl = catalogItem.PictureUri,
+					UnitPrice = catalogItem.Price,
+					Quantity = bitem.Quantity
+				});
+			}
+
+			await _basket.Update(newBasket);
+			return Ok(newBasket);
+		}
+
+		[HttpPut]
+		[Route("items")]
+		public async Task<IActionResult> UpdateQuantities([FromBody] UpdateBasketItemsRequest data)
+		{
+			if (!data.Updates.Any())
+			{
+				return BadRequest("No updates sent");
+			}
+
+			// Retrieve the current basket
+			var currentBasket = await _basket.GetById(data.BasketId);
+			if (currentBasket == null)
+			{
+				return BadRequest($"Basket with id {data.BasketId} not found.");
+			}
+
+			// Update with new quantities
+			foreach (var update in data.Updates)
+			{
+				var basketItem = currentBasket.Items.SingleOrDefault(bitem => bitem.Id == update.BasketItemId);
+				if (basketItem == null)
+				{
+					return BadRequest($"Basket item with id {update.BasketItemId} not found");
+				}
+				basketItem.Quantity = update.NewQty;
+			}
+
+			// Save the updated basket
+			await _basket.Update(currentBasket);
+			return Ok(currentBasket);
+		}
+
+		[HttpPost]
+		[Route("items")]
+		public async Task<IActionResult> AddBasketItem([FromBody] AddBasketItemRequest data)
+		{
+			if (data == null || data.Quantity == 0)
+			{
+				return BadRequest("Invalid payload");
+			}
+
+			// Step 1: Get the item from catalog
+			var item = await _catalog.GetCatalogItem(data.CatalogItemId);
+
+			//item.PictureUri = 
+
+			// Step 2: Get current basket status
+			var currentBasket = (await _basket.GetById(data.BasketId)) ?? new BasketData(data.BasketId);
+			// Step 3: Merge current status with new product
+			currentBasket.Items.Add(new BasketDataItem()
+			{
+				UnitPrice = item.Price,
+				PictureUrl = item.PictureUri,
+				ProductId = item.Id.ToString(),
+				ProductName = item.Name,
+				Quantity = data.Quantity,
+				Id = Guid.NewGuid().ToString()
+			});
+
+			// Step 4: Update basket
+			await _basket.Update(currentBasket);
+
+
+			return Ok();
+		}
+	}
 }

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

@@ -1,18 +1,14 @@
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Controllers
 {
-    [Route("")]
-    public class HomeController : Controller
-    {
-        [HttpGet()]
-        public IActionResult Index()
-        {
-            return new RedirectResult("~/swagger");
-        }
-    }
+	[Route("")]
+	public class HomeController : Controller
+	{
+		[HttpGet()]
+		public IActionResult Index()
+		{
+			return new RedirectResult("~/swagger");
+		}
+	}
 }

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

@@ -1,42 +1,39 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Controllers
 {
-    [Route("api/v1/[controller]")]
-    [Authorize]
-    public class OrderController : Controller
-    {
-        private readonly IBasketService _basketService;
-        private readonly IOrderApiClient _orderClient;
-        public OrderController(IBasketService basketService, IOrderApiClient orderClient)
-        {
-            _basketService = basketService;
-            _orderClient = orderClient;
-        }
+	[Route("api/v1/[controller]")]
+	[Authorize]
+	public class OrderController : Controller
+	{
+		private readonly IBasketService _basketService;
+		private readonly IOrderApiClient _orderClient;
+		public OrderController(IBasketService basketService, IOrderApiClient orderClient)
+		{
+			_basketService = basketService;
+			_orderClient = orderClient;
+		}
 
-        [Route("draft/{basketId}")]
-        [HttpGet]
-        public async Task<IActionResult> GetOrderDraft(string basketId)
-        {
-            if (string.IsNullOrEmpty(basketId))
-            {
-                return BadRequest("Need a valid basketid");
-            }
-            // Get the basket data and build a order draft based on it
-            var basket = await _basketService.GetById(basketId);
-            if (basket == null)
-            {
-                return BadRequest($"No basket found for id {basketId}");
-            }
+		[Route("draft/{basketId}")]
+		[HttpGet]
+		public async Task<IActionResult> GetOrderDraft(string basketId)
+		{
+			if (string.IsNullOrEmpty(basketId))
+			{
+				return BadRequest("Need a valid basketid");
+			}
+			// Get the basket data and build a order draft based on it
+			var basket = await _basketService.GetById(basketId);
+			if (basket == null)
+			{
+				return BadRequest($"No basket found for id {basketId}");
+			}
 
-            var orderDraft = await _orderClient.GetOrderDraftFromBasket(basket);
-            return Ok(orderDraft);
-        }
-    }
+			var orderDraft = await _orderClient.GetOrderDraftFromBasket(basket);
+			return Ok(orderDraft);
+		}
+	}
 }

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

@@ -1,33 +1,33 @@
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Filters
 {
-    using Microsoft.AspNetCore.Authorization;
-    using Swashbuckle.AspNetCore.Swagger;
-    using Swashbuckle.AspNetCore.SwaggerGen;
-    using System.Collections.Generic;
-    using System.Linq;
+	using Microsoft.AspNetCore.Authorization;
+	using Swashbuckle.AspNetCore.Swagger;
+	using Swashbuckle.AspNetCore.SwaggerGen;
+	using System.Collections.Generic;
+	using System.Linq;
 
-    namespace Basket.API.Infrastructure.Filters
-    {
-        public class AuthorizeCheckOperationFilter : IOperationFilter
-        {
-            public void Apply(Operation operation, OperationFilterContext context)
-            {
-                // Check for authorize attribute
-                var hasAuthorize = context.ApiDescription.ControllerAttributes().OfType<AuthorizeAttribute>().Any() ||
-                                   context.ApiDescription.ActionAttributes().OfType<AuthorizeAttribute>().Any();
+	namespace Basket.API.Infrastructure.Filters
+	{
+		public class AuthorizeCheckOperationFilter : IOperationFilter
+		{
+			public void Apply(Operation operation, OperationFilterContext context)
+			{
+				// Check for authorize attribute
+				var hasAuthorize = context.ApiDescription.ControllerAttributes().OfType<AuthorizeAttribute>().Any() ||
+							context.ApiDescription.ActionAttributes().OfType<AuthorizeAttribute>().Any();
 
-                if (hasAuthorize)
-                {
-                    operation.Responses.Add("401", new Response { Description = "Unauthorized" });
-                    operation.Responses.Add("403", new Response { Description = "Forbidden" });
+				if (hasAuthorize)
+				{
+					operation.Responses.Add("401", new Response { Description = "Unauthorized" });
+					operation.Responses.Add("403", new Response { Description = "Forbidden" });
 
-                    operation.Security = new List<IDictionary<string, IEnumerable<string>>>();
-                    operation.Security.Add(new Dictionary<string, IEnumerable<string>>
-                {
-                    { "oauth2", new [] { "Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator" } }
-                });
-                }
-            }
-        }
-    }
+					operation.Security = new List<IDictionary<string, IEnumerable<string>>>();
+					operation.Security.Add(new Dictionary<string, IEnumerable<string>>
+					{
+						{ "oauth2", new [] { "Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator" } }
+					});
+				}
+			}
+		}
+	}
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/Infrastructure/HttpClientAuthorizationDelegatingHandler.cs

@@ -8,42 +8,42 @@ using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Infrastructure
 {
-    public class HttpClientAuthorizationDelegatingHandler
-         : DelegatingHandler
-    {
-        private readonly IHttpContextAccessor _httpContextAccesor;
-
-        public HttpClientAuthorizationDelegatingHandler(IHttpContextAccessor httpContextAccesor)
-        {
-            _httpContextAccesor = httpContextAccesor;
-        }
-
-        protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-        {
-            var authorizationHeader = _httpContextAccesor.HttpContext
-                .Request.Headers["Authorization"];
-
-            if (!string.IsNullOrEmpty(authorizationHeader))
-            {
-                request.Headers.Add("Authorization", new List<string>() { authorizationHeader });
-            }
-
-            var token = await GetToken();
-
-            if (token != null)
-            {
-                request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
-            }
-
-            return await base.SendAsync(request, cancellationToken);
-        }
-
-        async Task<string> GetToken()
-        {
-            const string ACCESS_TOKEN = "access_token";
-
-            return await _httpContextAccesor.HttpContext
-                .GetTokenAsync(ACCESS_TOKEN);
-        }
-    }
+	public class HttpClientAuthorizationDelegatingHandler
+	    : DelegatingHandler
+	{
+		private readonly IHttpContextAccessor _httpContextAccesor;
+
+		public HttpClientAuthorizationDelegatingHandler(IHttpContextAccessor httpContextAccesor)
+		{
+			_httpContextAccesor = httpContextAccesor;
+		}
+
+		protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+		{
+			var authorizationHeader = _httpContextAccesor.HttpContext
+			 .Request.Headers["Authorization"];
+
+			if (!string.IsNullOrEmpty(authorizationHeader))
+			{
+				request.Headers.Add("Authorization", new List<string>() { authorizationHeader });
+			}
+
+			var token = await GetToken();
+
+			if (token != null)
+			{
+				request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
+			}
+
+			return await base.SendAsync(request, cancellationToken);
+		}
+
+		async Task<string> GetToken()
+		{
+			const string ACCESS_TOKEN = "access_token";
+
+			return await _httpContextAccesor.HttpContext
+			    .GetTokenAsync(ACCESS_TOKEN);
+		}
+	}
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/Models/AddBasketItemRequest.cs

@@ -1,20 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
 {
-    public class AddBasketItemRequest
-    {
-        public int CatalogItemId { get; set; }
-        public string BasketId { get; set; }
+	public class AddBasketItemRequest
+	{
+		public int CatalogItemId { get; set; }
+		public string BasketId { get; set; }
 
-        public int Quantity { get; set; }
+		public int Quantity { get; set; }
 
-        public AddBasketItemRequest()
-        {
-            Quantity = 1;
-        }
-    }
+		public AddBasketItemRequest()
+		{
+			Quantity = 1;
+		}
+	}
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/Models/BasketData.cs

@@ -1,31 +1,28 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
 {
-    public class BasketData
-    {
-        public string BuyerId { get; set; }
-        public List<BasketDataItem> Items { get; set; }
+	public class BasketData
+	{
+		public string BuyerId { get; set; }
+		public List<BasketDataItem> Items { get; set; }
 
-        public BasketData(string buyerId)
-        {
-            BuyerId = buyerId;
-            Items = new List<BasketDataItem>();
-        }
-    }
+		public BasketData(string buyerId)
+		{
+			BuyerId = buyerId;
+			Items = new List<BasketDataItem>();
+		}
+	}
 
-    public class BasketDataItem
-    {
-        public string Id { get; set; }
-        public string ProductId { get; set; }
-        public string ProductName { get; set; }
-        public decimal UnitPrice { get; set; }
-        public decimal OldUnitPrice { get; set; }
-        public int Quantity { get; set; }
-        public string PictureUrl { get; set; }
+	public class BasketDataItem
+	{
+		public string Id { get; set; }
+		public string ProductId { get; set; }
+		public string ProductName { get; set; }
+		public decimal UnitPrice { get; set; }
+		public decimal OldUnitPrice { get; set; }
+		public int Quantity { get; set; }
+		public string PictureUrl { get; set; }
 
-    }
+	}
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/Models/CatalogItem.cs

@@ -1,20 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
 {
-    public class CatalogItem
-    {
-        public int Id { get; set; }
+	public class CatalogItem
+	{
+		public int Id { get; set; }
 
-        public string Name { get; set; }
+		public string Name { get; set; }
 
-        public decimal Price { get; set; }
+		public decimal Price { get; set; }
 
 
-        public string PictureUri { get; set; }
+		public string PictureUri { get; set; }
 
-    }
+	}
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/Models/OrderData.cs

@@ -1,33 +1,31 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using DateTime = System.DateTime;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
 {
-    public class OrderData
-    {
-        public string OrderNumber { get; set; }
-        public DateTime Date { get; set; }
-        public string Status { get; set; }
-        public decimal Total { get; set; }
-        public string Description { get; set; }
-        public string City { get; set; }
-        public string Street { get; set; }
-        public string State { get; set; }
-        public string Country { get; set; }
-        public string ZipCode { get; set; }
-        public string CardNumber { get; set; }
-        public string CardHolderName { get; set; }
-        public bool IsDraft { get; set; }
-        public DateTime CardExpiration { get; set; }
-        public string CardExpirationShort { get; set; }
-        public string CardSecurityNumber { get; set; }
+	public class OrderData
+	{
+		public string OrderNumber { get; set; }
+		public DateTime Date { get; set; }
+		public string Status { get; set; }
+		public decimal Total { get; set; }
+		public string Description { get; set; }
+		public string City { get; set; }
+		public string Street { get; set; }
+		public string State { get; set; }
+		public string Country { get; set; }
+		public string ZipCode { get; set; }
+		public string CardNumber { get; set; }
+		public string CardHolderName { get; set; }
+		public bool IsDraft { get; set; }
+		public DateTime CardExpiration { get; set; }
+		public string CardExpirationShort { get; set; }
+		public string CardSecurityNumber { get; set; }
 
-        public int CardTypeId { get; set; }
+		public int CardTypeId { get; set; }
 
-        public string Buyer { get; set; }
+		public string Buyer { get; set; }
 
-        public List<OrderItemData> OrderItems { get; } = new List<OrderItemData>();
-    }
+		public List<OrderItemData> OrderItems { get; } = new List<OrderItemData>();
+	}
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/Models/OrderItemData.cs

@@ -1,17 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
 {
-    public class OrderItemData
-    {
-        public int ProductId { get; set; }
-        public string ProductName { get; set; }
-        public decimal UnitPrice { get; set; }
-        public decimal Discount { get; set; }
-        public int Units { get; set; }
-        public string PictureUrl { get; set; }
-    }
+	public class OrderItemData
+	{
+		public int ProductId { get; set; }
+		public string ProductName { get; set; }
+		public decimal UnitPrice { get; set; }
+		public decimal Discount { get; set; }
+		public int Units { get; set; }
+		public string PictureUrl { get; set; }
+	}
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketItemsRequest.cs

@@ -1,31 +1,28 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
 {
-    public class UpdateBasketItemsRequest
-    {
-        
-        public string BasketId { get; set; }
+	public class UpdateBasketItemsRequest
+	{
 
-        public ICollection<UpdateBasketItemData> Updates { get; set; }
+		public string BasketId { get; set; }
 
-        public UpdateBasketItemsRequest()
-        {
-            Updates = new List<UpdateBasketItemData>();
-        }
-    }
+		public ICollection<UpdateBasketItemData> Updates { get; set; }
 
-    public class UpdateBasketItemData
-    {
-        public string BasketItemId { get; set; }
-        public int NewQty { get; set; }
+		public UpdateBasketItemsRequest()
+		{
+			Updates = new List<UpdateBasketItemData>();
+		}
+	}
 
-        public UpdateBasketItemData()
-        {
-            NewQty = 0;
-        }
-    }
+	public class UpdateBasketItemData
+	{
+		public string BasketItemId { get; set; }
+		public int NewQty { get; set; }
+
+		public UpdateBasketItemData()
+		{
+			NewQty = 0;
+		}
+	}
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketRequest.cs

@@ -1,21 +1,18 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
 {
-    public class UpdateBasketRequest
-    {
-        public string BuyerId { get; set; }
+	public class UpdateBasketRequest
+	{
+		public string BuyerId { get; set; }
 
-        public IEnumerable<UpdateBasketRequestItemData> Items { get; set; }
-    }
+		public IEnumerable<UpdateBasketRequestItemData> Items { get; set; }
+	}
 
-    public class UpdateBasketRequestItemData
-    {
-        public string Id { get; set; }          // Basket id
-        public int ProductId { get; set; }      // Catalog item id
-        public int Quantity { get; set; }       // Quantity
-    }
+	public class UpdateBasketRequestItemData
+	{
+		public string Id { get; set; }          // Basket id
+		public int ProductId { get; set; }      // Catalog item id
+		public int Quantity { get; set; }       // Quantity
+	}
 }

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

@@ -1,36 +1,29 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
+using static Microsoft.AspNetCore.Hosting.WebHostBuilderExtensions;
+using static Microsoft.AspNetCore.Hosting.WebHostExtensions;
+using IWebHost = Microsoft.AspNetCore.Hosting.IWebHost;
+using WebHost = Microsoft.AspNetCore.WebHost;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            BuildWebHost(args).Run();
-        }
+	public class Program
+	{
+		public static void Main(string[] args) 
+			=> BuildWebHost(args).Run();
 
-        public static IWebHost BuildWebHost(string[] args) =>
-            WebHost
-                .CreateDefaultBuilder(args)
-                .ConfigureAppConfiguration(cb =>
-                {
-                    var sources = cb.Sources;
-                    sources.Insert(3, new Microsoft.Extensions.Configuration.Json.JsonConfigurationSource()
-                    {
-                        Optional = true,
-                        Path = "appsettings.localhost.json",
-                        ReloadOnChange = false
-                    });
-                })
-                .UseStartup<Startup>()
-                .Build();
-    }
+		public static IWebHost BuildWebHost(string[] args) =>
+		    WebHost
+			   .CreateDefaultBuilder(args)
+			   .ConfigureAppConfiguration(cb =>
+			   {
+				   var sources = cb.Sources;
+				   sources.Insert(3, new Extensions.Configuration.Json.JsonConfigurationSource()
+				   {
+					   Optional = true,
+					   Path = "appsettings.localhost.json",
+					   ReloadOnChange = false
+				   });
+			   })
+			   .UseStartup<Startup>()
+			   .Build();
+	}
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/Services/BasketService.cs

@@ -1,39 +1,42 @@
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config;
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
-using System.Net.Http;
 using System.Threading.Tasks;
+using HttpClient = System.Net.Http.HttpClient;
+using JsonConvert = Newtonsoft.Json.JsonConvert;
+using StringContent = System.Net.Http.StringContent;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
 {
-    public class BasketService : IBasketService
-    {
+	using BasketData = Models.BasketData;
+	using BasketOperations = Config.UrlsConfig.BasketOperations;
+	using UrlsConfig = Config.UrlsConfig;
 
-        private readonly HttpClient _apiClient;
-        private readonly ILogger<BasketService> _logger;
-        private readonly UrlsConfig _urls;
+	public class BasketService : IBasketService
+	{
 
-        public BasketService(HttpClient httpClient,ILogger<BasketService> logger, IOptions<UrlsConfig> config)
-        {
-            _apiClient = httpClient;
-            _logger = logger;
-            _urls = config.Value;
-        }
+		private readonly HttpClient _apiClient;
+		private readonly ILogger<BasketService> _logger;
+		private readonly UrlsConfig _urls;
 
-        public async Task<BasketData> GetById(string id)
-        {
-            var data = await _apiClient.GetStringAsync(_urls.Basket +  UrlsConfig.BasketOperations.GetItemById(id));
-            var basket = !string.IsNullOrEmpty(data) ? JsonConvert.DeserializeObject<BasketData>(data) : null;
-            return basket;
-        }
+		public BasketService(HttpClient httpClient, ILogger<BasketService> logger, IOptions<UrlsConfig> config)
+		{
+			_apiClient = httpClient;
+			_logger = logger;
+			_urls = config.Value;
+		}
 
-        public async Task Update(BasketData currentBasket)
-        {
-            var basketContent = new StringContent(JsonConvert.SerializeObject(currentBasket), System.Text.Encoding.UTF8, "application/json");
+		public async Task<BasketData> GetById(string id)
+		{
+			var data = await _apiClient.GetStringAsync(_urls.Basket + BasketOperations.GetItemById(id));
+			var basket = !string.IsNullOrEmpty(data) ? JsonConvert.DeserializeObject<BasketData>(data) : null;
+			return basket;
+		}
 
-            var data = await _apiClient.PostAsync(_urls.Basket + UrlsConfig.BasketOperations.UpdateBasket(), basketContent);
-        }
-    }
+		public async Task Update(BasketData currentBasket)
+		{
+			var basketContent = new StringContent(JsonConvert.SerializeObject(currentBasket), System.Text.Encoding.UTF8, "application/json");
+
+			var data = await _apiClient.PostAsync(_urls.Basket + BasketOperations.UpdateBasket(), basketContent);
+		}
+	}
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/Services/CatalogService.cs

@@ -1,42 +1,43 @@
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config;
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
 using System.Collections.Generic;
-using System.Net.Http;
 using System.Threading.Tasks;
+using HttpClient = System.Net.Http.HttpClient;
+using JsonConvert = Newtonsoft.Json.JsonConvert;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
 {
-    public class CatalogService : ICatalogService
-    {
-
-        private readonly HttpClient _httpClient;
-        private readonly ILogger<CatalogService> _logger;
-        private readonly UrlsConfig _urls;
-
-        public CatalogService(HttpClient httpClient, ILogger<CatalogService> logger, IOptions<UrlsConfig> config)
-        {
-            _httpClient = httpClient;
-            _logger = logger;
-            _urls = config.Value;
-        }
-
-        public async Task<CatalogItem> GetCatalogItem(int id)
-        {
-            var stringContent = await _httpClient.GetStringAsync(_urls.Catalog + UrlsConfig.CatalogOperations.GetItemById(id));
-            var catalogItem = JsonConvert.DeserializeObject<CatalogItem>(stringContent);
-
-            return catalogItem;
-        }
-
-        public async Task<IEnumerable<CatalogItem>> GetCatalogItems(IEnumerable<int> ids)
-        {
-            var stringContent = await _httpClient.GetStringAsync(_urls.Catalog + UrlsConfig.CatalogOperations.GetItemsById(ids));
-            var catalogItems = JsonConvert.DeserializeObject<CatalogItem[]>(stringContent);
-
-            return catalogItems;
-        }
-    }
+	using CatalogItem = Models.CatalogItem;
+	using UrlsConfig = Config.UrlsConfig;
+
+	public class CatalogService : ICatalogService
+	{
+
+		private readonly HttpClient _httpClient;
+		private readonly ILogger<CatalogService> _logger;
+		private readonly UrlsConfig _urls;
+
+		public CatalogService(HttpClient httpClient, ILogger<CatalogService> logger, IOptions<UrlsConfig> config)
+		{
+			_httpClient = httpClient;
+			_logger = logger;
+			_urls = config.Value;
+		}
+
+		public async Task<CatalogItem> GetCatalogItem(int id)
+		{
+			var stringContent = await _httpClient.GetStringAsync(_urls.Catalog + UrlsConfig.CatalogOperations.GetItemById(id));
+			var catalogItem = JsonConvert.DeserializeObject<CatalogItem>(stringContent);
+
+			return catalogItem;
+		}
+
+		public async Task<IEnumerable<CatalogItem>> GetCatalogItems(IEnumerable<int> ids)
+		{
+			var stringContent = await _httpClient.GetStringAsync(_urls.Catalog + UrlsConfig.CatalogOperations.GetItemsById(ids));
+			var catalogItems = JsonConvert.DeserializeObject<CatalogItem[]>(stringContent);
+
+			return catalogItems;
+		}
+	}
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/Services/IBasketService.cs

@@ -1,15 +1,13 @@
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
 {
-    public interface IBasketService
-    {
-        Task<BasketData> GetById(string id);
-        Task Update(BasketData currentBasket);
+	using BasketData = Models.BasketData;
 
-    }
+	public interface IBasketService
+	{
+		Task<BasketData> GetById(string id);
+		Task Update(BasketData currentBasket);
+
+	}
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/Services/ICatalogService.cs

@@ -1,14 +1,13 @@
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
 {
-    public interface ICatalogService
-    {
-        Task<CatalogItem> GetCatalogItem(int id);
-        Task<IEnumerable<CatalogItem>> GetCatalogItems(IEnumerable<int> ids);
-    }
+	using CatalogItem = Models.CatalogItem;
+
+	public interface ICatalogService
+	{
+		Task<CatalogItem> GetCatalogItem(int id);
+		Task<IEnumerable<CatalogItem>> GetCatalogItems(IEnumerable<int> ids);
+	}
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/Services/IOrderApiClient.cs

@@ -1,13 +1,12 @@
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
 {
-    public interface IOrderApiClient
-    {
-        Task<OrderData> GetOrderDraftFromBasket(BasketData basket);
-    }
+	using BasketData = Models.BasketData;
+	using OrderData = Models.OrderData;
+
+	public interface IOrderApiClient
+	{
+		Task<OrderData> GetOrderDraftFromBasket(BasketData basket);
+	}
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/Services/OrderApiClient.cs

@@ -1,38 +1,41 @@
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config;
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
-using System.Net.Http;
 using System.Threading.Tasks;
+using HttpClient = System.Net.Http.HttpClient;
+using JsonConvert = Newtonsoft.Json.JsonConvert;
+using StringContent = System.Net.Http.StringContent;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
 {
-    public class OrderApiClient : IOrderApiClient
-    {
+	using BasketData = Models.BasketData;
+	using OrderData = Models.OrderData;
+	using UrlsConfig = Config.UrlsConfig;
 
-        private readonly HttpClient _apiClient;
-        private readonly ILogger<OrderApiClient> _logger;
-        private readonly UrlsConfig _urls;
+	public class OrderApiClient : IOrderApiClient
+	{
 
-        public OrderApiClient(HttpClient httpClient, ILogger<OrderApiClient> logger, IOptions<UrlsConfig> config)
-        {
-            _apiClient = httpClient;
-            _logger = logger;
-            _urls = config.Value;
-        }
+		private readonly HttpClient _apiClient;
+		private readonly ILogger<OrderApiClient> _logger;
+		private readonly UrlsConfig _urls;
 
-        public async Task<OrderData> GetOrderDraftFromBasket(BasketData basket)
-        {
-            var url = _urls.Orders + UrlsConfig.OrdersOperations.GetOrderDraft();
-            var content = new StringContent(JsonConvert.SerializeObject(basket), System.Text.Encoding.UTF8, "application/json");
-            var response = await _apiClient.PostAsync(url, content);
+		public OrderApiClient(HttpClient httpClient, ILogger<OrderApiClient> logger, IOptions<UrlsConfig> config)
+		{
+			_apiClient = httpClient;
+			_logger = logger;
+			_urls = config.Value;
+		}
 
-            response.EnsureSuccessStatusCode();
+		public async Task<OrderData> GetOrderDraftFromBasket(BasketData basket)
+		{
+			var url = _urls.Orders + UrlsConfig.OrdersOperations.GetOrderDraft();
+			var content = new StringContent(JsonConvert.SerializeObject(basket), System.Text.Encoding.UTF8, "application/json");
+			var response = await _apiClient.PostAsync(url, content);
 
-            var ordersDraftResponse = await response.Content.ReadAsStringAsync();
+			response.EnsureSuccessStatusCode();
 
-            return JsonConvert.DeserializeObject<OrderData>(ordersDraftResponse);
-        }
-    }
+			var ordersDraftResponse = await response.Content.ReadAsStringAsync();
+
+			return JsonConvert.DeserializeObject<OrderData>(ordersDraftResponse);
+		}
+	}
 }

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

@@ -11,7 +11,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Polly;
 using Polly.Extensions.Http;
-using Polly.Timeout;
 using Swashbuckle.AspNetCore.Swagger;
 using System;
 using System.Collections.Generic;
@@ -20,168 +19,168 @@ using System.Net.Http;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
 {
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddCustomMvc(Configuration)
-                .AddCustomAuthentication(Configuration)
-                .AddApplicationServices();
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
-        {
-            var pathBase = Configuration["PATH_BASE"];
-            if (!string.IsNullOrEmpty(pathBase))
-            {
-                loggerFactory.CreateLogger("init").LogDebug($"Using PATH BASE '{pathBase}'");
-                app.UsePathBase(pathBase);
-            }
-
-            app.UseCors("CorsPolicy");
-
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-
-            app.UseAuthentication();
-
-            app.UseMvc();
-
-            app.UseSwagger().UseSwaggerUI(c =>
-           {
-               c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Purchase BFF V1");
-               //c.ConfigureOAuth2("Microsoft.eShopOnContainers.Web.Shopping.HttpAggregatorwaggerui", "", "", "Purchase BFF Swagger UI");
-           });
-
-
-        }
-    }
-
-    public static class ServiceCollectionExtensions
-    {
-        public static IServiceCollection AddCustomAuthentication(this IServiceCollection services, IConfiguration configuration)
-        {
-            JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
-            var identityUrl = configuration.GetValue<string>("urls:identity");
-            services.AddAuthentication(options =>
-            {
-                options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-                options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-
-            }).AddJwtBearer(options =>
-            {
-                options.Authority = identityUrl;
-                options.RequireHttpsMetadata = false;
-                options.Audience = "webshoppingagg";
-                options.Events = new JwtBearerEvents()
-                {
-                    OnAuthenticationFailed = async ctx =>
-                    {
-                        int i = 0;
-                    },
-                    OnTokenValidated = async ctx =>
-                    {
-                        int i = 0;
-                    }
-                };
-            });
-
-            return services;
-        }
-        public static IServiceCollection AddCustomMvc(this IServiceCollection services, IConfiguration configuration)
-        {
-            services.AddOptions();
-            services.Configure<UrlsConfig>(configuration.GetSection("urls"));
-
-            services.AddMvc();
-
-            services.AddSwaggerGen(options =>
-            {
-                options.DescribeAllEnumsAsStrings();
-                options.SwaggerDoc("v1", new Swashbuckle.AspNetCore.Swagger.Info
-                {
-                    Title = "Shopping Aggregator for Web Clients",
-                    Version = "v1",
-                    Description = "Shopping Aggregator for Web Clients",
-                    TermsOfService = "Terms Of Service"
-                });
-
-                options.AddSecurityDefinition("oauth2", new OAuth2Scheme
-                {
-                    Type = "oauth2",
-                    Flow = "implicit",
-                    AuthorizationUrl = $"{configuration.GetValue<string>("IdentityUrlExternal")}/connect/authorize",
-                    TokenUrl = $"{configuration.GetValue<string>("IdentityUrlExternal")}/connect/token",
-                    Scopes = new Dictionary<string, string>()
-                    {
-                        { "webshoppingagg", "Shopping Aggregator for Web Clients" }
-                    }
-                });
-
-                options.OperationFilter<AuthorizeCheckOperationFilter>();
-            });
-
-            services.AddCors(options =>
-            {
-                options.AddPolicy("CorsPolicy",
-                    builder => builder.AllowAnyOrigin()
-                    .AllowAnyMethod()
-                    .AllowAnyHeader()
-                    .AllowCredentials());
-            });
-
-            return services;
-        }
-        public static IServiceCollection AddApplicationServices(this IServiceCollection services)
-        {
-            //register delegating handlers
-            services.AddTransient<HttpClientAuthorizationDelegatingHandler>();
-            services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
-
-            //register http services
-          
-            services.AddHttpClient<IBasketService, BasketService>()
-                .AddHttpMessageHandler<HttpClientAuthorizationDelegatingHandler>()
-                .AddPolicyHandler(GetRetryPolicy())
-                .AddPolicyHandler(GetCircuitBreakerPolicy());
-
-            services.AddHttpClient<ICatalogService, CatalogService>()
-                .AddPolicyHandler(GetRetryPolicy())
-                .AddPolicyHandler(GetCircuitBreakerPolicy());
-
-            services.AddHttpClient<IOrderApiClient, OrderApiClient>()
-                .AddHttpMessageHandler<HttpClientAuthorizationDelegatingHandler>()
-                .AddPolicyHandler(GetRetryPolicy())
-                .AddPolicyHandler(GetCircuitBreakerPolicy());
-
-
-            return services;
-        }
-
-        static IAsyncPolicy<HttpResponseMessage> GetRetryPolicy()
-        {
-            return HttpPolicyExtensions
-              .HandleTransientHttpError()
-              .OrResult(msg => msg.StatusCode == System.Net.HttpStatusCode.NotFound)
-              .WaitAndRetryAsync(6, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)));
-
-        }
-        static IAsyncPolicy<HttpResponseMessage> GetCircuitBreakerPolicy()
-        {
-            return HttpPolicyExtensions
-                .HandleTransientHttpError()
-                .CircuitBreakerAsync(5, TimeSpan.FromSeconds(30));
-        }
-    }
+	public class Startup
+	{
+		public Startup(IConfiguration configuration) => 
+			Configuration = configuration;
+
+		public IConfiguration Configuration { get; }
+
+		// This method gets called by the runtime. Use this method to add services to the container.
+		public void ConfigureServices(IServiceCollection services)
+		{
+			services
+				.AddCustomMvc(Configuration)
+				.AddCustomAuthentication(Configuration)
+				.AddApplicationServices();
+		}
+
+		// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+		public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
+		{
+			var pathBase = Configuration["PATH_BASE"];
+			if (!string.IsNullOrEmpty(pathBase))
+			{
+				loggerFactory.CreateLogger("init").LogDebug($"Using PATH BASE '{pathBase}'");
+				app.UsePathBase(pathBase);
+			}
+
+			app.UseCors("CorsPolicy");
+
+			if (env.IsDevelopment())
+			{
+				app.UseDeveloperExceptionPage();
+			}
+
+			app.UseAuthentication();
+
+			app.UseMvc();
+
+			app.UseSwagger().UseSwaggerUI(c =>
+			{
+				c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Purchase BFF V1");
+				//c.ConfigureOAuth2("Microsoft.eShopOnContainers.Web.Shopping.HttpAggregatorwaggerui", "", "", "Purchase BFF Swagger UI");
+			});
+
+
+		}
+	}
+
+	public static class ServiceCollectionExtensions
+	{
+		public static IServiceCollection AddCustomAuthentication(this IServiceCollection services, IConfiguration configuration)
+		{
+			JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
+			var identityUrl = configuration.GetValue<string>("urls:identity");
+			services.AddAuthentication(options =>
+			{
+				options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
+				options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
+
+			}).AddJwtBearer(options =>
+			{
+				options.Authority = identityUrl;
+				options.RequireHttpsMetadata = false;
+				options.Audience = "webshoppingagg";
+				options.Events = new JwtBearerEvents()
+				{
+#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
+					OnAuthenticationFailed = async ctx =>
+#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
+				     {
+				     },
+#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
+					OnTokenValidated = async ctx =>
+#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
+				     {
+				     }
+				};
+			});
+
+			return services;
+		}
+		public static IServiceCollection AddCustomMvc(this IServiceCollection services, IConfiguration configuration)
+		{
+			services.AddOptions();
+			services.Configure<UrlsConfig>(configuration.GetSection("urls"));
+
+			services.AddMvc();
+
+			services.AddSwaggerGen(options =>
+			{
+				options.DescribeAllEnumsAsStrings();
+				options.SwaggerDoc("v1", new Swashbuckle.AspNetCore.Swagger.Info
+				{
+					Title = "Shopping Aggregator for Web Clients",
+					Version = "v1",
+					Description = "Shopping Aggregator for Web Clients",
+					TermsOfService = "Terms Of Service"
+				});
+
+				options.AddSecurityDefinition("oauth2", new OAuth2Scheme
+				{
+					Type = "oauth2",
+					Flow = "implicit",
+					AuthorizationUrl = $"{configuration.GetValue<string>("IdentityUrlExternal")}/connect/authorize",
+					TokenUrl = $"{configuration.GetValue<string>("IdentityUrlExternal")}/connect/token",
+					Scopes = new Dictionary<string, string>()
+				     {
+						{ "webshoppingagg", "Shopping Aggregator for Web Clients" }
+				     }
+				});
+
+				options.OperationFilter<AuthorizeCheckOperationFilter>();
+			});
+
+			services.AddCors(options =>
+			{
+				options
+					.AddPolicy(
+					"CorsPolicy",
+					builder => 
+						builder
+							.AllowAnyOrigin()
+							.AllowAnyMethod()
+							.AllowAnyHeader()
+							.AllowCredentials());
+			});
+
+			return services;
+		}
+		public static IServiceCollection AddApplicationServices(this IServiceCollection services)
+		{
+			//register delegating handlers
+			services.AddTransient<HttpClientAuthorizationDelegatingHandler>();
+			services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
+
+			//register http services
+
+			services.AddHttpClient<IBasketService, BasketService>()
+			    .AddHttpMessageHandler<HttpClientAuthorizationDelegatingHandler>()
+			    .AddPolicyHandler(GetRetryPolicy())
+			    .AddPolicyHandler(GetCircuitBreakerPolicy());
+
+			services.AddHttpClient<ICatalogService, CatalogService>()
+			    .AddPolicyHandler(GetRetryPolicy())
+			    .AddPolicyHandler(GetCircuitBreakerPolicy());
+
+			services.AddHttpClient<IOrderApiClient, OrderApiClient>()
+			    .AddHttpMessageHandler<HttpClientAuthorizationDelegatingHandler>()
+			    .AddPolicyHandler(GetRetryPolicy())
+			    .AddPolicyHandler(GetCircuitBreakerPolicy());
+
+
+			return services;
+		}
+
+		static IAsyncPolicy<HttpResponseMessage> GetRetryPolicy() =>
+			HttpPolicyExtensions
+			  .HandleTransientHttpError()
+			  .OrResult(msg => msg.StatusCode == System.Net.HttpStatusCode.NotFound)
+			  .WaitAndRetryAsync(6, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)));
+		static IAsyncPolicy<HttpResponseMessage> GetCircuitBreakerPolicy() 
+			=> HttpPolicyExtensions
+			    .HandleTransientHttpError()
+			    .CircuitBreakerAsync(5, TimeSpan.FromSeconds(30));
+	}
 }

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

@@ -1,15 +1,15 @@
 {
-  "Logging": {
-    "IncludeScopes": false,
-    "Debug": {
-      "LogLevel": {
-        "Default": "Warning"
-      }
-    },
-    "Console": {
-      "LogLevel": {
-        "Default": "Warning"
-      }
-    }
-  }
+	"Logging": {
+		"IncludeScopes": false,
+		"Debug": {
+			"LogLevel": {
+				"Default": "Warning"
+			}
+		},
+		"Console": {
+			"LogLevel": {
+				"Default": "Warning"
+			}
+		}
+	}
 }

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

@@ -1,8 +1,8 @@
 {
-  "urls": {
-    "basket": "http://localhost:55105",
-    "catalog": "http://localhost:55101",
-    "orders": "http://localhost:55102",
-    "identity": "http://localhost:55105"
-  }
+	"urls": {
+		"basket": "http://localhost:55105",
+		"catalog": "http://localhost:55101",
+		"orders": "http://localhost:55102",
+		"identity": "http://localhost:55105"
+	}
 }

src/ApiGateways/Web.Bff.Shopping/apigw/configuration.json

@@ -1,130 +1,129 @@
 {
-  "ReRoutes": [
-    {
-      "DownstreamPathTemplate": "/api/{version}/{everything}",
-      "DownstreamScheme": "http",
-      "DownstreamHostAndPorts": [
-        {
-          "Host": "catalog.api",
-          "Port": 80
-        }
-      ],
-      "UpstreamPathTemplate": "/api/{version}/c/{everything}",
-      "UpstreamHttpMethod": [ "GET" ]
-    },
-    {
-      "DownstreamPathTemplate": "/api/{version}/{everything}",
-      "DownstreamScheme": "http",
-      "DownstreamHostAndPorts": [
-        {
-          "Host": "basket.api",
-          "Port": 80
-        }
-      ],
-      "UpstreamPathTemplate": "/api/{version}/b/{everything}",
-      "UpstreamHttpMethod": [],
-      "AuthenticationOptions": {
-        "AuthenticationProviderKey": "IdentityApiKey",
-        "AllowedScopes": []
-      }
-    },
-    {
-      "DownstreamPathTemplate": "/api/{version}/{everything}",
-      "DownstreamScheme": "http",
-      "DownstreamHostAndPorts": [
-        {
-          "Host": "ordering.api",
-          "Port": 80
-        }
-      ],
-      "UpstreamPathTemplate": "/api/{version}/o/{everything}",
-      "UpstreamHttpMethod": [],
-      "AuthenticationOptions": {
-        "AuthenticationProviderKey": "IdentityApiKey",
-        "AllowedScopes": []
-      }
-    },
-    {
-      "DownstreamPathTemplate": "/{everything}",
-      "DownstreamScheme": "http",
-      "DownstreamHostAndPorts": [
-        {
-          "Host": "webshoppingagg",
-          "Port": 80
-        }
-      ],
-      "UpstreamPathTemplate": "/{everything}",
-      "UpstreamHttpMethod": [ "POST", "PUT", "GET" ],
-      "AuthenticationOptions": {
-        "AuthenticationProviderKey": "IdentityApiKey",
-        "AllowedScopes": []
-      }
-    },
-    {
-      "DownstreamPathTemplate": "/{everything}",
-      "DownstreamScheme": "http",
-      "DownstreamHostAndPorts": [
-        {
-          "Host": "ordering.api",
-          "Port": 80
-        }
-      ],
-      "UpstreamPathTemplate": "/orders-api/{everything}",
-      "UpstreamHttpMethod": []
-    },
-    {
-      "DownstreamPathTemplate": "/{everything}",
-      "DownstreamScheme": "http",
-      "DownstreamHostAndPorts": [
-        {
-          "Host": "ordering.signalrhub",
-          "Port": 80
-        }
-      ],
-      "UpstreamPathTemplate": "/hub/{everything}",
-      "UpstreamHttpMethod": []
-    },
-    {
-      "DownstreamPathTemplate": "/{everything}",
-      "DownstreamScheme": "http",
-      "DownstreamHostAndPorts": [
-        {
-          "Host": "basket.api",
-          "Port": 80
-        }
-      ],
-      "UpstreamPathTemplate": "/basket-api/{everything}",
-      "UpstreamHttpMethod": []
-    },
-    {
-      "DownstreamPathTemplate": "/{everything}",
-      "DownstreamScheme": "http",
-      "DownstreamHostAndPorts": [
-        {
-          "Host": "catalog.api",
-          "Port": 80
-        }
-      ],
-      "UpstreamPathTemplate": "/catalog-api/{everything}",
-      "UpstreamHttpMethod": []
-    },
-    {
-      "DownstreamPathTemplate": "/{everything}",
-      "DownstreamScheme": "http",
-      "DownstreamHostAndPorts": [
-        {
-          "Host": "payment.api",
-          "Port": 80
-        }
-      ],
-      "UpstreamPathTemplate": "/payment-api/{everything}",
-      "UpstreamHttpMethod": []
-    }
+	"ReRoutes": [
+		{
+			"DownstreamPathTemplate": "/api/{version}/{everything}",
+			"DownstreamScheme": "http",
+			"DownstreamHostAndPorts": [
+				{
+					"Host": "catalog.api",
+					"Port": 80
+				}
+			],
+			"UpstreamPathTemplate": "/api/{version}/c/{everything}",
+			"UpstreamHttpMethod": [ "GET" ]
+		},
+		{
+			"DownstreamPathTemplate": "/api/{version}/{everything}",
+			"DownstreamScheme": "http",
+			"DownstreamHostAndPorts": [
+				{
+					"Host": "basket.api",
+					"Port": 80
+				}
+			],
+			"UpstreamPathTemplate": "/api/{version}/b/{everything}",
+			"UpstreamHttpMethod": [],
+			"AuthenticationOptions": {
+				"AuthenticationProviderKey": "IdentityApiKey",
+				"AllowedScopes": []
+			}
+		},
+		{
+			"DownstreamPathTemplate": "/api/{version}/{everything}",
+			"DownstreamScheme": "http",
+			"DownstreamHostAndPorts": [
+				{
+					"Host": "ordering.api",
+					"Port": 80
+				}
+			],
+			"UpstreamPathTemplate": "/api/{version}/o/{everything}",
+			"UpstreamHttpMethod": [],
+			"AuthenticationOptions": {
+				"AuthenticationProviderKey": "IdentityApiKey",
+				"AllowedScopes": []
+			}
+		},
+		{
+			"DownstreamPathTemplate": "/{everything}",
+			"DownstreamScheme": "http",
+			"DownstreamHostAndPorts": [
+				{
+					"Host": "webshoppingagg",
+					"Port": 80
+				}
+			],
+			"UpstreamPathTemplate": "/{everything}",
+			"UpstreamHttpMethod": [ "POST", "PUT", "GET" ],
+			"AuthenticationOptions": {
+				"AuthenticationProviderKey": "IdentityApiKey",
+				"AllowedScopes": []
+			}
+		},
+		{
+			"DownstreamPathTemplate": "/{everything}",
+			"DownstreamScheme": "http",
+			"DownstreamHostAndPorts": [
+				{
+					"Host": "ordering.api",
+					"Port": 80
+				}
+			],
+			"UpstreamPathTemplate": "/orders-api/{everything}",
+			"UpstreamHttpMethod": []
+		},
+		{
+			"DownstreamPathTemplate": "/{everything}",
+			"DownstreamScheme": "http",
+			"DownstreamHostAndPorts": [
+				{
+					"Host": "ordering.signalrhub",
+					"Port": 80
+				}
+			],
+			"UpstreamPathTemplate": "/hub/{everything}",
+			"UpstreamHttpMethod": []
+		},
+		{
+			"DownstreamPathTemplate": "/{everything}",
+			"DownstreamScheme": "http",
+			"DownstreamHostAndPorts": [
+				{
+					"Host": "basket.api",
+					"Port": 80
+				}
+			],
+			"UpstreamPathTemplate": "/basket-api/{everything}",
+			"UpstreamHttpMethod": []
+		},
+		{
+			"DownstreamPathTemplate": "/{everything}",
+			"DownstreamScheme": "http",
+			"DownstreamHostAndPorts": [
+				{
+					"Host": "catalog.api",
+					"Port": 80
+				}
+			],
+			"UpstreamPathTemplate": "/catalog-api/{everything}",
+			"UpstreamHttpMethod": []
+		},
+		{
+			"DownstreamPathTemplate": "/{everything}",
+			"DownstreamScheme": "http",
+			"DownstreamHostAndPorts": [
+				{
+					"Host": "payment.api",
+					"Port": 80
+				}
+			],
+			"UpstreamPathTemplate": "/payment-api/{everything}",
+			"UpstreamHttpMethod": []
+		}
 
-  ],
-    "GlobalConfiguration": {
-      "RequestIdKey": "OcRequestId",
-      "AdministrationPath": "/administration"
-    }
-  }
-  
+	],
+	"GlobalConfiguration": {
+		"RequestIdKey": "OcRequestId",
+		"AdministrationPath": "/administration"
+	}
+}