refactoring: webhooks.service: file-scope namespace
This commit is contained in:
parent
2ff2e64f4d
commit
a04f7824fc
@ -21,87 +21,86 @@ using Microsoft.Extensions.Hosting;
|
||||
using StackExchange.Redis.Extensions.Core.Configuration;
|
||||
using StackExchange.Redis.Extensions.Newtonsoft;
|
||||
|
||||
namespace ASC.Webhooks.Service
|
||||
namespace ASC.Webhooks.Service;
|
||||
|
||||
public class Program
|
||||
{
|
||||
public class Program
|
||||
public async static Task Main(string[] args)
|
||||
{
|
||||
public async static Task Main(string[] args)
|
||||
{
|
||||
var host = CreateHostBuilder(args).Build();
|
||||
var host = CreateHostBuilder(args).Build();
|
||||
|
||||
await host.RunAsync();
|
||||
}
|
||||
|
||||
public static IHostBuilder CreateHostBuilder(string[] args) =>
|
||||
Host.CreateDefaultBuilder(args)
|
||||
.UseSystemd()
|
||||
.UseWindowsService()
|
||||
.UseServiceProviderFactory(new AutofacServiceProviderFactory())
|
||||
.ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<BaseWorkerStartup>())
|
||||
.ConfigureAppConfiguration((hostContext, config) =>
|
||||
{
|
||||
var buided = config.Build();
|
||||
var path = buided["pathToConf"];
|
||||
if (!Path.IsPathRooted(path))
|
||||
{
|
||||
path = Path.GetFullPath(CrossPlatform.PathCombine(hostContext.HostingEnvironment.ContentRootPath, path));
|
||||
}
|
||||
config.SetBasePath(path);
|
||||
var env = hostContext.Configuration.GetValue("ENVIRONMENT", "Production");
|
||||
config
|
||||
.AddInMemoryCollection(new Dictionary<string, string>
|
||||
{
|
||||
{"pathToConf", path }
|
||||
}
|
||||
)
|
||||
.AddJsonFile("appsettings.json")
|
||||
.AddJsonFile($"appsettings.{env}.json", true)
|
||||
.AddJsonFile($"appsettings.services.json", true)
|
||||
.AddJsonFile("storage.json")
|
||||
.AddJsonFile("kafka.json")
|
||||
.AddJsonFile($"kafka.{env}.json", true)
|
||||
.AddJsonFile("redis.json")
|
||||
.AddJsonFile($"redis.{env}.json", true)
|
||||
.AddEnvironmentVariables()
|
||||
.AddCommandLine(args);
|
||||
})
|
||||
.ConfigureServices((hostContext, services) =>
|
||||
{
|
||||
services.AddMemoryCache();
|
||||
|
||||
var diHelper = new DIHelper(services);
|
||||
|
||||
var redisConfiguration = hostContext.Configuration.GetSection("Redis").Get<RedisConfiguration>();
|
||||
var kafkaConfiguration = hostContext.Configuration.GetSection("kafka").Get<KafkaSettings>();
|
||||
|
||||
if (kafkaConfiguration != null)
|
||||
{
|
||||
diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
|
||||
}
|
||||
else if (redisConfiguration != null)
|
||||
{
|
||||
diHelper.TryAdd(typeof(ICacheNotify<>), typeof(RedisCache<>));
|
||||
|
||||
services.AddStackExchangeRedisExtensions<NewtonsoftSerializer>(redisConfiguration);
|
||||
}
|
||||
else
|
||||
{
|
||||
diHelper.TryAdd(typeof(ICacheNotify<>), typeof(MemoryCacheNotify<>));
|
||||
}
|
||||
|
||||
diHelper.TryAdd<DbWorker>();
|
||||
|
||||
services.AddHostedService<BuildQueueService>();
|
||||
diHelper.TryAdd<BuildQueueService>();
|
||||
|
||||
services.AddHostedService<WorkerService>();
|
||||
diHelper.TryAdd<WorkerService>();
|
||||
|
||||
})
|
||||
.ConfigureContainer<ContainerBuilder>((context, builder) =>
|
||||
{
|
||||
builder.Register(context.Configuration, false, false);
|
||||
})
|
||||
.ConfigureNLogLogging();
|
||||
await host.RunAsync();
|
||||
}
|
||||
|
||||
public static IHostBuilder CreateHostBuilder(string[] args) =>
|
||||
Host.CreateDefaultBuilder(args)
|
||||
.UseSystemd()
|
||||
.UseWindowsService()
|
||||
.UseServiceProviderFactory(new AutofacServiceProviderFactory())
|
||||
.ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<BaseWorkerStartup>())
|
||||
.ConfigureAppConfiguration((hostContext, config) =>
|
||||
{
|
||||
var buided = config.Build();
|
||||
var path = buided["pathToConf"];
|
||||
if (!Path.IsPathRooted(path))
|
||||
{
|
||||
path = Path.GetFullPath(CrossPlatform.PathCombine(hostContext.HostingEnvironment.ContentRootPath, path));
|
||||
}
|
||||
config.SetBasePath(path);
|
||||
var env = hostContext.Configuration.GetValue("ENVIRONMENT", "Production");
|
||||
config
|
||||
.AddInMemoryCollection(new Dictionary<string, string>
|
||||
{
|
||||
{"pathToConf", path }
|
||||
}
|
||||
)
|
||||
.AddJsonFile("appsettings.json")
|
||||
.AddJsonFile($"appsettings.{env}.json", true)
|
||||
.AddJsonFile($"appsettings.services.json", true)
|
||||
.AddJsonFile("storage.json")
|
||||
.AddJsonFile("kafka.json")
|
||||
.AddJsonFile($"kafka.{env}.json", true)
|
||||
.AddJsonFile("redis.json")
|
||||
.AddJsonFile($"redis.{env}.json", true)
|
||||
.AddEnvironmentVariables()
|
||||
.AddCommandLine(args);
|
||||
})
|
||||
.ConfigureServices((hostContext, services) =>
|
||||
{
|
||||
services.AddMemoryCache();
|
||||
|
||||
var diHelper = new DIHelper(services);
|
||||
|
||||
var redisConfiguration = hostContext.Configuration.GetSection("Redis").Get<RedisConfiguration>();
|
||||
var kafkaConfiguration = hostContext.Configuration.GetSection("kafka").Get<KafkaSettings>();
|
||||
|
||||
if (kafkaConfiguration != null)
|
||||
{
|
||||
diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
|
||||
}
|
||||
else if (redisConfiguration != null)
|
||||
{
|
||||
diHelper.TryAdd(typeof(ICacheNotify<>), typeof(RedisCache<>));
|
||||
|
||||
services.AddStackExchangeRedisExtensions<NewtonsoftSerializer>(redisConfiguration);
|
||||
}
|
||||
else
|
||||
{
|
||||
diHelper.TryAdd(typeof(ICacheNotify<>), typeof(MemoryCacheNotify<>));
|
||||
}
|
||||
|
||||
diHelper.TryAdd<DbWorker>();
|
||||
|
||||
services.AddHostedService<BuildQueueService>();
|
||||
diHelper.TryAdd<BuildQueueService>();
|
||||
|
||||
services.AddHostedService<WorkerService>();
|
||||
diHelper.TryAdd<WorkerService>();
|
||||
|
||||
})
|
||||
.ConfigureContainer<ContainerBuilder>((context, builder) =>
|
||||
{
|
||||
builder.Register(context.Configuration, false, false);
|
||||
})
|
||||
.ConfigureNLogLogging();
|
||||
}
|
||||
|
@ -8,35 +8,34 @@ using ASC.Web.Webhooks;
|
||||
|
||||
using Microsoft.Extensions.Hosting;
|
||||
|
||||
namespace ASC.Webhooks.Service.Services
|
||||
namespace ASC.Webhooks.Service.Services;
|
||||
|
||||
[Singletone]
|
||||
public class BuildQueueService : IHostedService
|
||||
{
|
||||
[Singletone]
|
||||
public class BuildQueueService : IHostedService
|
||||
internal ConcurrentQueue<WebhookRequest> Queue { get; }
|
||||
private readonly ICacheNotify<WebhookRequest> _webhookNotify;
|
||||
|
||||
public BuildQueueService(ICacheNotify<WebhookRequest> webhookNotify)
|
||||
{
|
||||
internal ConcurrentQueue<WebhookRequest> Queue { get; }
|
||||
private readonly ICacheNotify<WebhookRequest> _webhookNotify;
|
||||
_webhookNotify = webhookNotify;
|
||||
Queue = new ConcurrentQueue<WebhookRequest>();
|
||||
}
|
||||
|
||||
public BuildQueueService(ICacheNotify<WebhookRequest> webhookNotify)
|
||||
{
|
||||
_webhookNotify = webhookNotify;
|
||||
Queue = new ConcurrentQueue<WebhookRequest>();
|
||||
}
|
||||
public Task StartAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
_webhookNotify.Subscribe(BuildWebhooksQueue, CacheNotifyAction.Update);
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
public Task StartAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
_webhookNotify.Subscribe(BuildWebhooksQueue, CacheNotifyAction.Update);
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
public Task StopAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
_webhookNotify.Unsubscribe(CacheNotifyAction.Update);
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
public Task StopAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
_webhookNotify.Unsubscribe(CacheNotifyAction.Update);
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
public void BuildWebhooksQueue(WebhookRequest request)
|
||||
{
|
||||
Queue.Enqueue(request);
|
||||
}
|
||||
public void BuildWebhooksQueue(WebhookRequest request)
|
||||
{
|
||||
Queue.Enqueue(request);
|
||||
}
|
||||
}
|
||||
|
@ -10,49 +10,70 @@ using ASC.Web.Webhooks;
|
||||
|
||||
using Microsoft.Extensions.Hosting;
|
||||
|
||||
namespace ASC.Webhooks.Service.Services
|
||||
namespace ASC.Webhooks.Service.Services;
|
||||
|
||||
[Singletone]
|
||||
public class WorkerService: IHostedService, IDisposable
|
||||
{
|
||||
[Singletone]
|
||||
public class WorkerService: IHostedService, IDisposable
|
||||
private readonly int? _threadCount = 10;
|
||||
private readonly WebhookSender _webhookSender;
|
||||
private readonly ConcurrentQueue<WebhookRequest> _queue;
|
||||
private CancellationToken _cancellationToken;
|
||||
private readonly ILog _logger;
|
||||
private Timer _timer;
|
||||
|
||||
public WorkerService(WebhookSender webhookSender,
|
||||
ILog logger,
|
||||
BuildQueueService buildQueueService,
|
||||
Settings settings)
|
||||
{
|
||||
private readonly int? _threadCount = 10;
|
||||
private readonly WebhookSender _webhookSender;
|
||||
private readonly ConcurrentQueue<WebhookRequest> _queue;
|
||||
private CancellationToken _cancellationToken;
|
||||
private readonly ILog _logger;
|
||||
private Timer _timer;
|
||||
_logger = logger;
|
||||
_webhookSender = webhookSender;
|
||||
_queue = buildQueueService.Queue;
|
||||
_threadCount = settings.ThreadCount;
|
||||
}
|
||||
|
||||
public WorkerService(WebhookSender webhookSender,
|
||||
ILog logger,
|
||||
BuildQueueService buildQueueService,
|
||||
Settings settings)
|
||||
{
|
||||
_logger = logger;
|
||||
_webhookSender = webhookSender;
|
||||
_queue = buildQueueService.Queue;
|
||||
_threadCount = settings.ThreadCount;
|
||||
}
|
||||
public Task StartAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
_cancellationToken = cancellationToken;
|
||||
|
||||
public Task StartAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
_cancellationToken = cancellationToken;
|
||||
_timer = new Timer(DoWork, null, 0, Timeout.Infinite);
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
_timer = new Timer(DoWork, null, 0, Timeout.Infinite);
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
public Task StopAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
Stop();
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
public Task StopAsync(CancellationToken cancellationToken)
|
||||
private void Stop()
|
||||
{
|
||||
_timer?.Change(Timeout.Infinite, 0);
|
||||
}
|
||||
|
||||
private void DoWork(object _)
|
||||
{
|
||||
if (_cancellationToken.IsCancellationRequested)
|
||||
{
|
||||
Stop();
|
||||
return Task.CompletedTask;
|
||||
return;
|
||||
}
|
||||
|
||||
private void Stop()
|
||||
_timer.Change(Timeout.Infinite, Timeout.Infinite);
|
||||
_logger.Debug("Procedure: Start.");
|
||||
var queueSize = _queue.Count;
|
||||
|
||||
if (queueSize == 0)// change to "<= threadCount"
|
||||
{
|
||||
_timer?.Change(Timeout.Infinite, 0);
|
||||
_logger.TraceFormat("Procedure: Waiting for data. Sleep {0}.", 5);
|
||||
_timer.Change(TimeSpan.FromSeconds(5), TimeSpan.FromMilliseconds(-1));
|
||||
return;
|
||||
}
|
||||
|
||||
private void DoWork(object _)
|
||||
var tasks = new List<Task>();
|
||||
var counter = 0;
|
||||
for (int i = 0; i < queueSize; i++)
|
||||
{
|
||||
if (_cancellationToken.IsCancellationRequested)
|
||||
{
|
||||
@ -60,49 +81,27 @@ namespace ASC.Webhooks.Service.Services
|
||||
return;
|
||||
}
|
||||
|
||||
_timer.Change(Timeout.Infinite, Timeout.Infinite);
|
||||
_logger.Debug("Procedure: Start.");
|
||||
var queueSize = _queue.Count;
|
||||
if (!_queue.TryDequeue(out var entry))
|
||||
break;
|
||||
|
||||
if (queueSize == 0)// change to "<= threadCount"
|
||||
tasks.Add(_webhookSender.Send(entry, _cancellationToken));
|
||||
counter++;
|
||||
|
||||
if (counter >= _threadCount)
|
||||
{
|
||||
_logger.TraceFormat("Procedure: Waiting for data. Sleep {0}.", 5);
|
||||
_timer.Change(TimeSpan.FromSeconds(5), TimeSpan.FromMilliseconds(-1));
|
||||
return;
|
||||
Task.WaitAll(tasks.ToArray());
|
||||
tasks.Clear();
|
||||
counter = 0;
|
||||
}
|
||||
|
||||
var tasks = new List<Task>();
|
||||
var counter = 0;
|
||||
for (int i = 0; i < queueSize; i++)
|
||||
{
|
||||
if (_cancellationToken.IsCancellationRequested)
|
||||
{
|
||||
Stop();
|
||||
return;
|
||||
}
|
||||
|
||||
if (!_queue.TryDequeue(out var entry))
|
||||
break;
|
||||
|
||||
tasks.Add(_webhookSender.Send(entry, _cancellationToken));
|
||||
counter++;
|
||||
|
||||
if (counter >= _threadCount)
|
||||
{
|
||||
Task.WaitAll(tasks.ToArray());
|
||||
tasks.Clear();
|
||||
counter = 0;
|
||||
}
|
||||
}
|
||||
|
||||
Task.WaitAll(tasks.ToArray());
|
||||
_logger.Debug("Procedure: Finish.");
|
||||
_timer.Change(0, Timeout.Infinite);
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
_timer?.Dispose();
|
||||
}
|
||||
Task.WaitAll(tasks.ToArray());
|
||||
_logger.Debug("Procedure: Finish.");
|
||||
_timer.Change(0, Timeout.Infinite);
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
_timer?.Dispose();
|
||||
}
|
||||
}
|
||||
|
@ -2,24 +2,23 @@
|
||||
using ASC.Common;
|
||||
using ASC.Common.Utils;
|
||||
|
||||
namespace ASC.Webhooks.Service
|
||||
namespace ASC.Webhooks.Service;
|
||||
|
||||
[Singletone]
|
||||
public class Settings
|
||||
{
|
||||
[Singletone]
|
||||
public class Settings
|
||||
public Settings()
|
||||
{
|
||||
public Settings()
|
||||
{
|
||||
|
||||
}
|
||||
public Settings(ConfigurationExtension configuration)
|
||||
{
|
||||
var cfg = configuration.GetSetting<Settings>("webhooks");
|
||||
RepeatCount = cfg.RepeatCount ?? 5;
|
||||
ThreadCount = cfg.ThreadCount ?? 1;
|
||||
}
|
||||
|
||||
public int? RepeatCount { get; }
|
||||
public int? ThreadCount { get; }
|
||||
|
||||
}
|
||||
public Settings(ConfigurationExtension configuration)
|
||||
{
|
||||
var cfg = configuration.GetSetting<Settings>("webhooks");
|
||||
RepeatCount = cfg.RepeatCount ?? 5;
|
||||
ThreadCount = cfg.ThreadCount ?? 1;
|
||||
}
|
||||
|
||||
public int? RepeatCount { get; }
|
||||
public int? ThreadCount { get; }
|
||||
|
||||
}
|
||||
|
@ -16,104 +16,103 @@ using ASC.Webhooks.Core;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Options;
|
||||
|
||||
namespace ASC.Webhooks.Service
|
||||
namespace ASC.Webhooks.Service;
|
||||
|
||||
[Singletone]
|
||||
public class WebhookSender
|
||||
{
|
||||
[Singletone]
|
||||
public class WebhookSender
|
||||
private readonly int? _repeatCount;
|
||||
private static readonly HttpClient httpClient = new HttpClient();
|
||||
private readonly IServiceScopeFactory _scopeFactory;
|
||||
private readonly ILog _log;
|
||||
|
||||
public WebhookSender(IOptionsMonitor<ILog> options, IServiceScopeFactory scopeFactory, Settings settings)
|
||||
{
|
||||
private readonly int? _repeatCount;
|
||||
private static readonly HttpClient httpClient = new HttpClient();
|
||||
private readonly IServiceScopeFactory _scopeFactory;
|
||||
private readonly ILog _log;
|
||||
_log = options.Get("ASC.Webhooks.Core");
|
||||
_scopeFactory = scopeFactory;
|
||||
_repeatCount = settings.RepeatCount;
|
||||
}
|
||||
|
||||
public WebhookSender(IOptionsMonitor<ILog> options, IServiceScopeFactory scopeFactory, Settings settings)
|
||||
public async Task Send(WebhookRequest webhookRequest, CancellationToken cancellationToken)
|
||||
{
|
||||
using var scope = _scopeFactory.CreateScope();
|
||||
var dbWorker = scope.ServiceProvider.GetService<DbWorker>();
|
||||
|
||||
var entry = dbWorker.ReadFromJournal(webhookRequest.Id);
|
||||
var id = entry.Id;
|
||||
var requestURI = entry.Uri;
|
||||
var secretKey = entry.SecretKey;
|
||||
var data = entry.Payload;
|
||||
|
||||
HttpResponseMessage response = new HttpResponseMessage();
|
||||
HttpRequestMessage request = new HttpRequestMessage();
|
||||
|
||||
for (int i = 0; i < _repeatCount; i++)
|
||||
{
|
||||
_log = options.Get("ASC.Webhooks.Core");
|
||||
_scopeFactory = scopeFactory;
|
||||
_repeatCount = settings.RepeatCount;
|
||||
}
|
||||
|
||||
public async Task Send(WebhookRequest webhookRequest, CancellationToken cancellationToken)
|
||||
{
|
||||
using var scope = _scopeFactory.CreateScope();
|
||||
var dbWorker = scope.ServiceProvider.GetService<DbWorker>();
|
||||
|
||||
var entry = dbWorker.ReadFromJournal(webhookRequest.Id);
|
||||
var id = entry.Id;
|
||||
var requestURI = entry.Uri;
|
||||
var secretKey = entry.SecretKey;
|
||||
var data = entry.Payload;
|
||||
|
||||
HttpResponseMessage response = new HttpResponseMessage();
|
||||
HttpRequestMessage request = new HttpRequestMessage();
|
||||
|
||||
for (int i = 0; i < _repeatCount; i++)
|
||||
try
|
||||
{
|
||||
try
|
||||
request = new HttpRequestMessage(HttpMethod.Post, requestURI);
|
||||
request.Headers.Add("Accept", "*/*");
|
||||
request.Headers.Add("Secret", "SHA256=" + GetSecretHash(secretKey, data));
|
||||
|
||||
request.Content = new StringContent(
|
||||
data,
|
||||
Encoding.UTF8,
|
||||
"application/json");
|
||||
|
||||
response = await httpClient.SendAsync(request, cancellationToken);
|
||||
|
||||
if (response.IsSuccessStatusCode)
|
||||
{
|
||||
request = new HttpRequestMessage(HttpMethod.Post, requestURI);
|
||||
request.Headers.Add("Accept", "*/*");
|
||||
request.Headers.Add("Secret", "SHA256=" + GetSecretHash(secretKey, data));
|
||||
|
||||
request.Content = new StringContent(
|
||||
data,
|
||||
Encoding.UTF8,
|
||||
"application/json");
|
||||
|
||||
response = await httpClient.SendAsync(request, cancellationToken);
|
||||
|
||||
if (response.IsSuccessStatusCode)
|
||||
{
|
||||
UpdateDb(dbWorker, id, response, request, ProcessStatus.Success);
|
||||
_log.Debug("Response: " + response);
|
||||
break;
|
||||
}
|
||||
else if (i == _repeatCount - 1)
|
||||
{
|
||||
UpdateDb(dbWorker, id, response, request, ProcessStatus.Failed);
|
||||
_log.Debug("Response: " + response);
|
||||
}
|
||||
UpdateDb(dbWorker, id, response, request, ProcessStatus.Success);
|
||||
_log.Debug("Response: " + response);
|
||||
break;
|
||||
}
|
||||
catch (Exception ex)
|
||||
else if (i == _repeatCount - 1)
|
||||
{
|
||||
if (i == _repeatCount - 1)
|
||||
{
|
||||
UpdateDb(dbWorker, id, response, request, ProcessStatus.Failed);
|
||||
}
|
||||
|
||||
_log.Error(ex.Message);
|
||||
continue;
|
||||
UpdateDb(dbWorker, id, response, request, ProcessStatus.Failed);
|
||||
_log.Debug("Response: " + response);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private string GetSecretHash(string secretKey, string body)
|
||||
{
|
||||
string computedSignature;
|
||||
var secretBytes = Encoding.UTF8.GetBytes(secretKey);
|
||||
|
||||
using (var hasher = new HMACSHA256(secretBytes))
|
||||
catch (Exception ex)
|
||||
{
|
||||
var data = Encoding.UTF8.GetBytes(body);
|
||||
computedSignature = BitConverter.ToString(hasher.ComputeHash(data));
|
||||
if (i == _repeatCount - 1)
|
||||
{
|
||||
UpdateDb(dbWorker, id, response, request, ProcessStatus.Failed);
|
||||
}
|
||||
|
||||
_log.Error(ex.Message);
|
||||
continue;
|
||||
}
|
||||
|
||||
return computedSignature;
|
||||
}
|
||||
|
||||
private void UpdateDb(DbWorker dbWorker, int id, HttpResponseMessage response, HttpRequestMessage request, ProcessStatus status)
|
||||
{
|
||||
var responseHeaders = JsonSerializer.Serialize(response.Headers.ToDictionary(r => r.Key, v => v.Value));
|
||||
var requestHeaders = JsonSerializer.Serialize(request.Headers.ToDictionary(r => r.Key , v => v.Value));
|
||||
string responsePayload;
|
||||
|
||||
using (var streamReader = new StreamReader(response.Content.ReadAsStream()))
|
||||
{
|
||||
var responseContent = streamReader.ReadToEnd();
|
||||
responsePayload = JsonSerializer.Serialize(responseContent);
|
||||
};
|
||||
|
||||
dbWorker.UpdateWebhookJournal(id, status, responsePayload, responseHeaders, requestHeaders);
|
||||
}
|
||||
}
|
||||
|
||||
private string GetSecretHash(string secretKey, string body)
|
||||
{
|
||||
string computedSignature;
|
||||
var secretBytes = Encoding.UTF8.GetBytes(secretKey);
|
||||
|
||||
using (var hasher = new HMACSHA256(secretBytes))
|
||||
{
|
||||
var data = Encoding.UTF8.GetBytes(body);
|
||||
computedSignature = BitConverter.ToString(hasher.ComputeHash(data));
|
||||
}
|
||||
|
||||
return computedSignature;
|
||||
}
|
||||
|
||||
private void UpdateDb(DbWorker dbWorker, int id, HttpResponseMessage response, HttpRequestMessage request, ProcessStatus status)
|
||||
{
|
||||
var responseHeaders = JsonSerializer.Serialize(response.Headers.ToDictionary(r => r.Key, v => v.Value));
|
||||
var requestHeaders = JsonSerializer.Serialize(request.Headers.ToDictionary(r => r.Key , v => v.Value));
|
||||
string responsePayload;
|
||||
|
||||
using (var streamReader = new StreamReader(response.Content.ReadAsStream()))
|
||||
{
|
||||
var responseContent = streamReader.ReadToEnd();
|
||||
responsePayload = JsonSerializer.Serialize(responseContent);
|
||||
};
|
||||
|
||||
dbWorker.UpdateWebhookJournal(id, status, responsePayload, responseHeaders, requestHeaders);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user