From cc7c29c8cfd4969128d8d517630b6d013db53934 Mon Sep 17 00:00:00 2001 From: MaksimChegulov Date: Fri, 3 Jun 2022 13:26:16 +0300 Subject: [PATCH] Files: fix --- .../Core/Core/VirtualRooms/RoomLogoManager.cs | 2 +- .../WCFService/FileOperations/FileDeleteOperation.cs | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/products/ASC.Files/Core/Core/VirtualRooms/RoomLogoManager.cs b/products/ASC.Files/Core/Core/VirtualRooms/RoomLogoManager.cs index 8a619c554e..6d886e26eb 100644 --- a/products/ASC.Files/Core/Core/VirtualRooms/RoomLogoManager.cs +++ b/products/ASC.Files/Core/Core/VirtualRooms/RoomLogoManager.cs @@ -104,7 +104,7 @@ public class RoomLogoManager var folderDao = _daoFactory.GetFolderDao(); var room = await folderDao.GetFolderAsync(id); - if (room.RootFolderType == FolderType.Archive || !await _fileSecurity.CanEditRoomAsync(room)) + if (!await _fileSecurity.CanEditRoomAsync(room)) { throw new InvalidOperationException("You don't have permission to edit the room"); } diff --git a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs index 60a339b1ab..311d6801a8 100644 --- a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs +++ b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs @@ -137,6 +137,16 @@ class FileDeleteOperation : FileOperation, T> { if (ProviderDao != null) { + if (folder.RootFolderType == FolderType.VirtualRooms || folder.RootFolderType == FolderType.Archive) + { + var providerInfo = await ProviderDao.GetProviderInfoAsync(folder.ProviderId); + + if (providerInfo.FolderId != null) + { + await roomLogoManager.DeleteAsync(providerInfo.FolderId); + } + } + await ProviderDao.RemoveProviderInfoAsync(folder.ProviderId); filesMessageService.Send(folder, _headers, MessageAction.ThirdPartyDeleted, folder.Id.ToString(), folder.ProviderKey); }