From 02b4031ba04ba0b41c7d0698e15d830921f45a96 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Wed, 8 Jun 2022 12:53:33 +0300
Subject: [PATCH] fix Bug 57463

---
 common/ASC.Data.Storage/S3/S3Storage.cs          |  6 +++---
 .../FileOperations/FileMarkAsReadOperation.cs    | 16 ++++++++--------
 products/ASC.Files/Core/Utils/EntryManager.cs    |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/ASC.Data.Storage/S3/S3Storage.cs b/common/ASC.Data.Storage/S3/S3Storage.cs
index 077dbd8e9a..4f8cb16173 100644
--- a/common/ASC.Data.Storage/S3/S3Storage.cs
+++ b/common/ASC.Data.Storage/S3/S3Storage.cs
@@ -681,7 +681,7 @@ namespace ASC.Data.Storage.S3
                     Key = s3Object.Key
                 };
 
-                var metadata = await  client.GetObjectMetadataAsync(request);
+                var metadata = await client.GetObjectMetadataAsync(request);
                 var privateExpireKey = metadata.Metadata["private-expire"];
                 if (string.IsNullOrEmpty(privateExpireKey)) continue;
 
@@ -805,7 +805,7 @@ namespace ASC.Data.Storage.S3
             }
 
             return policyBase64;
-        }     
+        }
 
         public override async Task<string> GetUploadedUrlAsync(string domain, string directoryPath)
         {
@@ -1029,7 +1029,7 @@ namespace ASC.Data.Storage.S3
             path = MakePath(domain, path) + '/';
             var s30Objects = await GetS3ObjectsByPathAsync(domain, path);
             if (string.IsNullOrEmpty(_recycleDir) || !recycle) return s30Objects;
-            s30Objects.Concat(await GetS3ObjectsByPathAsync(domain, GetRecyclePath(path)));
+            s30Objects = s30Objects.Concat(await GetS3ObjectsByPathAsync(domain, GetRecyclePath(path)));
             return s30Objects;
         }
 
diff --git a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
index 71ba5eef2e..0d9b49f428 100644
--- a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
+++ b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
@@ -91,18 +91,18 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
         {
             var scopeClass = scope.ServiceProvider.GetService<FileMarkAsReadOperationScope>();
             var (fileMarker, globalFolder, daoFactory, settingsManager) = scopeClass;
-            var entries = AsyncEnumerable.Empty<FileEntry<T>>();
+            var entries = Enumerable.Empty<FileEntry<T>>();
             if (Folders.Count > 0)
             {
-                entries.Concat(FolderDao.GetFoldersAsync(Folders));
+                entries = entries.Concat(await FolderDao.GetFoldersAsync(Folders).ToListAsync());
             }
             if (Files.Count > 0)
             {
-                entries.Concat(FileDao.GetFilesAsync(Files));
+                entries = entries.Concat(await FileDao.GetFilesAsync(Files).ToListAsync());
             }
-
-            await entries.ForEachAwaitAsync(async x =>
-            {
+
+            foreach (var x in entries)
+            {
                 CancellationToken.ThrowIfCancellationRequested();
 
                 await fileMarker.RemoveMarkAsNewAsync(x, ((IAccount)Thread.CurrentPrincipal.Identity).ID);
@@ -115,8 +115,8 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
                 {
                     ProcessedFolder(((Folder<T>)x).ID);
                 }
-                ProgressStep();
-            });
+                ProgressStep();
+            }
 
             var rootIds = new List<int>
                 {
diff --git a/products/ASC.Files/Core/Utils/EntryManager.cs b/products/ASC.Files/Core/Utils/EntryManager.cs
index 6f4f78bc59..ccfe0c79b3 100644
--- a/products/ASC.Files/Core/Utils/EntryManager.cs
+++ b/products/ASC.Files/Core/Utils/EntryManager.cs
@@ -651,7 +651,7 @@ namespace ASC.Web.Files.Utils
             var fileIds = tags.Where(tag => tag.EntryType == FileEntryType.File).Select(r => r.EntryId).ToList();
 
             var files = await GetRecentByIdsAsync(fileIds.OfType<int>(), filter, subjectGroup, subjectId, searchText, searchInContent);
-            files.Concat(await GetRecentByIdsAsync(fileIds.OfType<string>(), filter, subjectGroup, subjectId, searchText, searchInContent));
+            files = files.Concat(await GetRecentByIdsAsync(fileIds.OfType<string>(), filter, subjectGroup, subjectId, searchText, searchInContent));
 
             var listFileIds = fileIds.Select(tag => tag.ToString()).ToList();