From 70006499f153f24c7f6ebb84baa774b6dd2433b6 Mon Sep 17 00:00:00 2001 From: MaksimChegulov Date: Fri, 22 Apr 2022 11:33:08 +0300 Subject: [PATCH] Files: removed unnecessary multipart api methods --- .../Server/Api/VirtualRoomsController.cs | 89 +++---------------- 1 file changed, 10 insertions(+), 79 deletions(-) diff --git a/products/ASC.Files/Server/Api/VirtualRoomsController.cs b/products/ASC.Files/Server/Api/VirtualRoomsController.cs index 2de81a6bcb..6d29469a6c 100644 --- a/products/ASC.Files/Server/Api/VirtualRoomsController.cs +++ b/products/ASC.Files/Server/Api/VirtualRoomsController.cs @@ -83,17 +83,6 @@ public abstract class VirtualRoomsController : ApiControllerBase return await _folderDtoHelper.GetAsync(room); } - [Create("room")] - [Consumes("application/x-www-form-urlencoded")] - public async Task> CreateRoomFromFormAsync([FromForm] CreateRoomRequestDto inDto) - { - ErrorIfNotDocSpace(); - - var room = await _fileStorageService.CreateRoom(inDto.Title, inDto.RoomType); - - return await _folderDtoHelper.GetAsync(room); - } - [Update("room/{roomId}")] public async Task> RenameRoomFromBodyAsync(T roomId, [FromBody] RenameRoomRequestDto inDto) { @@ -104,17 +93,6 @@ public abstract class VirtualRoomsController : ApiControllerBase return await _folderDtoHelper.GetAsync(room); } - [Update("room/{roomId}")] - [Consumes("application/x-www-form-urlencoded")] - public async Task> RenameRoomFromFormAsync(T roomId, [FromForm] RenameRoomRequestDto inDto) - { - ErrorIfNotDocSpace(); - - var room = await _fileStorageService.FolderRenameAsync(roomId, inDto.Title); - - return await _folderDtoHelper.GetAsync(room); - } - [Delete("room")] public async IAsyncEnumerable DeleteRoomsFromBodyAsync([FromBody] BatchRoomsRequestDto inDto) { @@ -128,64 +106,8 @@ public abstract class VirtualRoomsController : ApiControllerBase } } - [Delete("room")] - [Consumes("application/x-www-form-urlencoded")] - public async IAsyncEnumerable DeleteRoomsFromFormAsync([FromForm][ModelBinder(BinderType = typeof(BatchModelBinder))] BatchRoomsRequestDto inDto) - { - ErrorIfNotDocSpace(); - - var tasks = _fileStorageService.DeleteItems("delete", inDto.FileIds.ToList(), inDto.FolderIds.ToList(), false, inDto.DeleteAfter, true); - - foreach (var e in tasks) - { - yield return await _fileOperationDtoHelper.GetAsync(e); - } - } - [Update("room/archive")] public async Task> ArchiveRoomsFromBodyAsync([FromBody] BatchRoomsRequestDto inDto) - { - return await ArchiveRoomsAsync(inDto); - } - - [Update("room/archive")] - [Consumes("application/x-www-form-urlencoded")] - public async Task> ArchiveRoomsFromFormAsync([FromForm][ModelBinder(BinderType = typeof(BatchModelBinder))] BatchRoomsRequestDto inDto) - { - return await ArchiveRoomsAsync(inDto); - } - - [Update("room/unarchive")] - public async Task> UnarchiveRoomsFromBodyAsync([FromBody] BatchRoomsRequestDto inDto) - { - return await UnarchiveRoomsAsync(inDto); - } - - [Update("room/unarchive")] - [Consumes("application/x-www-form-urlencoded")] - public async Task> UnarchiveRoomsFromFormAsync([FromForm][ModelBinder(BinderType = typeof(BatchModelBinder))] BatchRoomsRequestDto inDto) - { - return await UnarchiveRoomsAsync(inDto); - } - - [Update("room/{roomId}/share")] - public Task> SetRoomSecurityFromBodyAsync(T roomId, [FromBody] SecurityInfoRequestDto inDto) - { - ErrorIfNotDocSpace(); - - return _securityControllerHelper.SetFolderSecurityInfoAsync(roomId, inDto.Share, inDto.Notify, inDto.SharingMessage); - } - - [Update("room/{roomId}/share")] - [Consumes("application/x-www-form-urlencoded")] - public Task> SetRoomSecurityFromFormAsync(T roomId, [FromForm] SecurityInfoRequestDto inDto) - { - ErrorIfNotDocSpace(); - - return _securityControllerHelper.SetFolderSecurityInfoAsync(roomId, inDto.Share, inDto.Notify, inDto.SharingMessage); - } - - private async Task> ArchiveRoomsAsync(BatchRoomsRequestDto inDto) { ErrorIfNotDocSpace(); @@ -201,7 +123,8 @@ public abstract class VirtualRoomsController : ApiControllerBase return result; } - private async Task> UnarchiveRoomsAsync(BatchRoomsRequestDto inDto) + [Update("room/unarchive")] + public async Task> UnarchiveRoomsFromBodyAsync([FromBody] BatchRoomsRequestDto inDto) { ErrorIfNotDocSpace(); @@ -217,6 +140,14 @@ public abstract class VirtualRoomsController : ApiControllerBase return result; } + [Update("room/{roomId}/share")] + public Task> SetRoomSecurityFromBodyAsync(T roomId, [FromBody] SecurityInfoRequestDto inDto) + { + ErrorIfNotDocSpace(); + + return _securityControllerHelper.SetFolderSecurityInfoAsync(roomId, inDto.Share, inDto.Notify, inDto.SharingMessage); + } + private void ErrorIfNotDocSpace() { if (!_coreBaseSettings.DocSpace)