WIP

Author: eiximenis

docker-compose.override.yml

@@ -403,5 +403,6 @@ services:
       - IdentityUrl=http://10.0.75.1:5105
       - CallBackUrl=http://localhost:5114
       - WebhooksUrl=http://webhooks.api
+      - SelfUrl=http://webhooks.client/
     ports:
       - "5114:80"

src/Services/Webhooks/Webhooks.API/IntegrationEvents/OrderStatusChangedToShippedIntegrationEvent.cs

@@ -0,0 +1,22 @@
+using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Webhooks.API.IntegrationEvents
+{
+    public class OrderStatusChangedToShippedIntegrationEvent : IntegrationEvent
+    {
+        public int OrderId { get; private set; }
+        public string OrderStatus { get; private set; }
+        public string BuyerName { get; private set; }
+
+        public OrderStatusChangedToShippedIntegrationEvent(int orderId, string orderStatus, string buyerName)
+        {
+            OrderId = orderId;
+            OrderStatus = orderStatus;
+            BuyerName = buyerName;
+        }
+    }
+}

src/Services/Webhooks/Webhooks.API/IntegrationEvents/OrderStatusChangedToShippedIntegrationEventHandler.cs

@@ -0,0 +1,29 @@
+using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Webhooks.API.Model;
+using Webhooks.API.Services;
+
+namespace Webhooks.API.IntegrationEvents
+{
+    public class OrderStatusChangedToShippedIntegrationEventHandler : IIntegrationEventHandler<OrderStatusChangedToShippedIntegrationEvent>
+    {
+        private readonly IWebhooksRetriever _retriever;
+        private readonly IWebhooksSender _sender;
+        public OrderStatusChangedToShippedIntegrationEventHandler(IWebhooksRetriever retriever, IWebhooksSender sender )
+        {
+            _retriever = retriever;
+            _sender = sender;
+        }
+
+        public async Task Handle(OrderStatusChangedToShippedIntegrationEvent @event)
+        {
+            var subscriptions = await _retriever.GetSubscriptionsOfType(WebhookType.OrderShipped);
+
+            var whook = new WebhookData(WebhookType.OrderShipped, @event);
+            await _sender.SendAll(subscriptions, whook);
+        }
+    }
+}

src/Services/Webhooks/Webhooks.API/Model/WebhookData.cs

@@ -0,0 +1,26 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Webhooks.API.Model
+{
+    public class WebhookData
+    {
+        public DateTime When { get; }
+
+        public string Payload { get; }
+
+        public string Type { get;  }
+
+        public WebhookData(WebhookType hookType, object data)
+        {
+            When = DateTime.UtcNow;
+            Type = hookType.ToString();
+            Payload = JsonConvert.SerializeObject(data);
+        }
+
+
+    }
+}

src/Services/Webhooks/Webhooks.API/Model/WebhookType.cs

@@ -7,6 +7,7 @@ namespace Webhooks.API.Model
 {
     public enum WebhookType
     {
-        CatalogItemPriceChange = 1
+        CatalogItemPriceChange = 1,
+        OrderShipped = 2
     }
 }

src/Services/Webhooks/Webhooks.API/Services/IWebhooksRetriever.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Webhooks.API.Model;
+
+namespace Webhooks.API.Services
+{
+    public interface IWebhooksRetriever
+    {
+
+        Task<IEnumerable<WebhookSubscription>> GetSubscriptionsOfType(WebhookType type);
+    }
+}

src/Services/Webhooks/Webhooks.API/Services/IWebhooksSender.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Webhooks.API.Model;
+
+namespace Webhooks.API.Services
+{
+    public interface IWebhooksSender
+    {
+        Task SendAll(IEnumerable<WebhookSubscription> receivers, WebhookData data);
+    }
+}

src/Services/Webhooks/Webhooks.API/Services/WebhooksRetriever.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Webhooks.API.Infrastructure;
+using Webhooks.API.Model;
+
+namespace Webhooks.API.Services
+{
+    public class WebhooksRetriever : IWebhooksRetriever
+    {
+        private readonly WebhooksContext _db;
+        public WebhooksRetriever(WebhooksContext db)
+        {
+            _db = db;
+        }
+        public async Task<IEnumerable<WebhookSubscription>> GetSubscriptionsOfType(WebhookType type)
+        {
+            var data = await _db.Subscriptions.Where(s => s.Type == type).ToListAsync();
+            return data;
+        }
+    }
+}

src/Services/Webhooks/Webhooks.API/Services/WebhooksSender.cs

@@ -0,0 +1,49 @@
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using Webhooks.API.Model;
+
+namespace Webhooks.API.Services
+{
+    public class WebhooksSender : IWebhooksSender
+    {
+        private readonly IHttpClientFactory _httpClientFactory;
+        private readonly ILogger _logger;
+        public WebhooksSender(IHttpClientFactory httpClientFactory, ILogger<WebhooksSender> logger)
+        {
+            _httpClientFactory = httpClientFactory;
+            _logger = logger;
+        }
+
+        public async Task SendAll(IEnumerable<WebhookSubscription> receivers, WebhookData data)
+        {
+            var client = _httpClientFactory.CreateClient();
+            var json = JsonConvert.SerializeObject(data);
+            var tasks = receivers.Select(r => OnSendData(r, json, client));
+            await Task.WhenAll(tasks.ToArray());
+        }
+
+        private Task OnSendData(WebhookSubscription subs, string jsonData, HttpClient client)
+        {
+            var request = new HttpRequestMessage()
+            {
+                RequestUri = new Uri(subs.DestUrl, UriKind.Absolute),
+                Method = HttpMethod.Post,
+                Content = new StringContent(jsonData, Encoding.UTF8, "application/json")
+            };
+
+            if (!string.IsNullOrWhiteSpace(subs.Token))
+            {
+                request.Headers.Add("X-eshop-whtoken", subs.Token);
+            }
+            _logger.LogDebug($"Sending hook to {subs.DestUrl} of type {subs.Type.ToString()}");
+            return client.SendAsync(request);
+        }
+
+    }
+}

src/Services/Webhooks/Webhooks.API/Startup.cs

@@ -61,7 +61,9 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
                 .AddCustomAuthentication(Configuration)
                 .AddSingleton<IHttpContextAccessor, HttpContextAccessor>()
                 .AddTransient<IIdentityService, IdentityService>()
-                .AddTransient<IGrantUrlTesterService, GrantUrlTesterService>();
+                .AddTransient<IGrantUrlTesterService, GrantUrlTesterService>()
+                .AddTransient<IWebhooksRetriever, WebhooksRetriever>()
+                .AddTransient<IWebhooksSender, WebhooksSender>();
 
             var container = new ContainerBuilder();
             container.Populate(services);
@@ -125,6 +127,7 @@ protected virtual void ConfigureEventBus(IApplicationBuilder app)
         {
             var eventBus = app.ApplicationServices.GetRequiredService<IEventBus>();
             eventBus.Subscribe<ProductPriceChangedIntegrationEvent, ProductPriceChangedIntegrationEventHandler>();
+            eventBus.Subscribe<OrderStatusChangedToShippedIntegrationEvent, OrderStatusChangedToShippedIntegrationEventHandler>();
         }
     }
 
@@ -287,19 +290,11 @@ public static IServiceCollection AddCustomHealthCheck(this IServiceCollection se
         public static IServiceCollection AddHttpClientServices(this IServiceCollection services, IConfiguration configuration)
         {
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
-
-
-            //register delegating handlers
-            //services.AddTransient<HttpClientAuthorizationDelegatingHandler>();
-
-            //InfinteTimeSpan -> See: https://github.com/aspnet/HttpClientFactory/issues/194
             services.AddHttpClient("extendedhandlerlifetime").SetHandlerLifetime(Timeout.InfiniteTimeSpan);
-
             //add http client services
             services.AddHttpClient("GrantClient")
                    .SetHandlerLifetime(TimeSpan.FromMinutes(5));
                    //.AddHttpMessageHandler<HttpClientAuthorizationDelegatingHandler>();
-
             return services;
         }