From 26c566e7d2f663b68b4f1e030b780640c44b8aed Mon Sep 17 00:00:00 2001
From: NikitaVashchuk <nikita.vashchuk@onlyoffice.com>
Date: Fri, 14 Apr 2023 21:31:36 +0500
Subject: [PATCH] fix CreateWebhook, added query parameters for UpdateWebhook

---
 common/ASC.Webhooks.Core/DbWorker.cs               |  6 ++++--
 web/ASC.Web.Api/Api/Settings/WebhooksController.cs | 10 +++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/common/ASC.Webhooks.Core/DbWorker.cs b/common/ASC.Webhooks.Core/DbWorker.cs
index fa8cdd74c4..01b6292ff0 100644
--- a/common/ASC.Webhooks.Core/DbWorker.cs
+++ b/common/ASC.Webhooks.Core/DbWorker.cs
@@ -56,7 +56,7 @@ public class DbWorker
         _mapper = mapper;
     }
 
-    public async Task<WebhooksConfig> AddWebhookConfig(string uri, string name, string secretKey)
+    public async Task<WebhooksConfig> AddWebhookConfig(string uri, string name, string secretKey, bool? enabled, bool? ssl)
     {
         using var webhooksDbContext = _dbContextFactory.CreateDbContext();
 
@@ -74,7 +74,9 @@ public class DbWorker
             TenantId = Tenant,
             Uri = uri,
             SecretKey = secretKey,
-            Name = name
+            Name = name,
+            Enabled = enabled ?? true,
+            SSL = ssl ?? true
         };
 
         toAdd = await webhooksDbContext.AddOrUpdateAsync(r => r.WebhooksConfigs, toAdd);
diff --git a/web/ASC.Web.Api/Api/Settings/WebhooksController.cs b/web/ASC.Web.Api/Api/Settings/WebhooksController.cs
index f31109430f..4e516408d3 100644
--- a/web/ASC.Web.Api/Api/Settings/WebhooksController.cs
+++ b/web/ASC.Web.Api/Api/Settings/WebhooksController.cs
@@ -62,7 +62,7 @@ public class WebhooksController : BaseSettingsController
     {
         _permissionContext.DemandPermissions(SecutiryConstants.EditPortalSettings);
 
-        await foreach(var webhook in _webhookDbWorker.GetTenantWebhooksWithStatus())
+        await foreach (var webhook in _webhookDbWorker.GetTenantWebhooksWithStatus())
         {
             yield return _mapper.Map<WebhooksConfigWithStatusDto>(webhook);
         }
@@ -77,7 +77,7 @@ public class WebhooksController : BaseSettingsController
         ArgumentNullException.ThrowIfNull(model.SecretKey);
         ArgumentNullException.ThrowIfNull(model.Name);
 
-        var webhook = await _webhookDbWorker.AddWebhookConfig(model.Uri, model.Name, model.SecretKey);
+        var webhook = await _webhookDbWorker.AddWebhookConfig(model.Uri, model.Name, model.SecretKey, model.Enabled, model.SSL);
 
         return _mapper.Map<WebhooksConfig, WebhooksConfigDto>(webhook);
     }
@@ -106,13 +106,13 @@ public class WebhooksController : BaseSettingsController
     }
 
     [HttpGet("webhooks/log")]
-    public async IAsyncEnumerable<WebhooksLogDto> GetJournal(WebhooksLogRequest model)
+    public async IAsyncEnumerable<WebhooksLogDto> GetJournal(DateTime? deliveryFrom, DateTime? deliveryTo, string hookUri, int? webhookId, int? configId, int? eventId, WebhookGroupStatus? groupStatus)
     {
         _permissionContext.DemandPermissions(SecutiryConstants.EditPortalSettings);
         var startIndex = Convert.ToInt32(_context.StartIndex);
         var count = Convert.ToInt32(_context.Count);
-
-        await foreach (var j in _webhookDbWorker.ReadJournal(startIndex, count, model.DeliveryFrom, model.DeliveryTo, model.HookUri, model.WebhookId, model.ConfigId, model.EventId, model.GroupStatus))
+
+        await foreach (var j in _webhookDbWorker.ReadJournal(startIndex, count, deliveryFrom, deliveryTo, hookUri, webhookId, configId, eventId, groupStatus))
         {
             yield return _mapper.Map<WebhooksLog, WebhooksLogDto>(j);
         }