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

Merge pull request #1151 from ONLYOFFICE/feature/fix-webhooks

Browse Source 
Feature/fix webhooks
This commit is contained in:
Pavel Bannov 2023-01-24 16:50:56 +03:00 committed by GitHub
commit 63af9c3329
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,7 @@ public class WebhooksController : BaseSettingsController
return _mapper.Map<WebhooksConfig, WebhooksConfigDto>(webhook);
}
[HttpDelete("webhook")]
[HttpDelete("webhook/{id}")]
public async Task<WebhooksConfigDto> RemoveWebhook(int id)
{
_permissionContext.DemandPermissions(SecutiryConstants.EditPortalSettings);
@ -101,13 +101,13 @@ public class WebhooksController : BaseSettingsController
}
[HttpGet("webhooks/log")]
public async IAsyncEnumerable<WebhooksLogDto> GetJournal(DateTime? delivery, string hookname, string route)
public async IAsyncEnumerable<WebhooksLogDto> 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<WebhooksLog, WebhooksLogDto>(j);
}

36
web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksLogRequest.cs Normal file
View File

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

2
web/ASC.Web.Api/ApiModels/ResponseDto/WebhooksConfigDto.cs
View File

@ -28,6 +28,8 @@ namespace ASC.Web.Api.ApiModels.ResponseDto;
public class WebhooksConfigDto : IMapFrom<WebhooksConfig>
{
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; }