diff --git a/web/ASC.Web.Api/Api/Settings/WebhooksController.cs b/web/ASC.Web.Api/Api/Settings/WebhooksController.cs index d5ec7b3bdc..6ad3868ea6 100644 --- a/web/ASC.Web.Api/Api/Settings/WebhooksController.cs +++ b/web/ASC.Web.Api/Api/Settings/WebhooksController.cs @@ -90,7 +90,7 @@ public class WebhooksController : BaseSettingsController return _mapper.Map(webhook); } - [HttpDelete("webhook")] + [HttpDelete("webhook/{id}")] public async Task RemoveWebhook(int id) { _permissionContext.DemandPermissions(SecutiryConstants.EditPortalSettings); @@ -101,13 +101,13 @@ public class WebhooksController : BaseSettingsController } [HttpGet("webhooks/log")] - public async IAsyncEnumerable GetJournal(DateTime? delivery, string hookname, string route) + public async IAsyncEnumerable GetJournal(WebhooksLogRequest model) { _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, delivery, hookname, route)) + await foreach (var j in _webhookDbWorker.ReadJournal(startIndex, count, model.Delivery, model.Hookname, model.Route)) { yield return _mapper.Map(j); } diff --git a/web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksLogRequest.cs b/web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksLogRequest.cs new file mode 100644 index 0000000000..7d4d0035c6 --- /dev/null +++ b/web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksLogRequest.cs @@ -0,0 +1,36 @@ +// (c) Copyright Ascensio System SIA 2010-2022 +// +// This program is a free software product. +// You can redistribute it and/or modify it under the terms +// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software +// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended +// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of +// any third-party rights. +// +// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty +// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see +// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html +// +// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021. +// +// The interactive user interfaces in modified source and object code versions of the Program must +// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3. +// +// Pursuant to Section 7(b) of the License you must retain the original Product logo when +// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under +// trademark law for use of our trademarks. +// +// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing +// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 +// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + +namespace ASC.Web.Api.ApiModels.RequestsDto; + +public class WebhooksLogRequest +{ + public DateTime? Delivery { get; set; } + + public string Hookname { get; set; } + + public string Route { get; set; } +} diff --git a/web/ASC.Web.Api/ApiModels/ResponseDto/WebhooksConfigDto.cs b/web/ASC.Web.Api/ApiModels/ResponseDto/WebhooksConfigDto.cs index 1fc80d61a5..626204763c 100644 --- a/web/ASC.Web.Api/ApiModels/ResponseDto/WebhooksConfigDto.cs +++ b/web/ASC.Web.Api/ApiModels/ResponseDto/WebhooksConfigDto.cs @@ -28,6 +28,8 @@ namespace ASC.Web.Api.ApiModels.ResponseDto; public class WebhooksConfigDto : IMapFrom { + public int Id { get; set; } + public string Name { get; set; } public string Uri { get; set; } public string SecretKey { get; set; } public bool Enabled { get; set; }