IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/webhooks-page' of github.com:ONLYOFFICE/DocSpace into feature/webhooks-page

Browse Source
This commit is contained in:
Vladimir Khvan 2023-04-16 15:17:19 +05:00
commit 5c90545fb5
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/ASC.Webhooks.Core/DbWorker.cs
View File

@ -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);

10
web/ASC.Web.Api/Api/Settings/WebhooksController.cs
View File

@ -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);
}