Merge branch 'develop' into feature/personal

ONLYOFFICE · Jul 12, 2021 · 8388a4e · 8388a4e
2 parents 2950f72 + 354b742
commit 8388a4e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs b/common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
@@ -82,7 +82,9 @@ protected override Task<AuthenticateResult> HandleAuthenticateAsync()
                     }
                     else
                     {
-                        if(emailValidationKeyModel.Type == Web.Studio.Utility.ConfirmType.EmailActivation)
+                        if(emailValidationKeyModel.Type == Web.Studio.Utility.ConfirmType.EmailActivation ||
+                            emailValidationKeyModel.Type == Web.Studio.Utility.ConfirmType.EmpInvite ||
+                            emailValidationKeyModel.Type == Web.Studio.Utility.ConfirmType.LinkInvite)
                         {
                             userId = ASC.Core.Configuration.Constants.CoreSystem.ID;
                         }

diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
@@ -1264,17 +1264,15 @@ public IEnumerable<int> GetTenantsWithFeeds(DateTime fromTime)
         {
             var q1 = FilesDbContext.Files
                 .Where(r => r.ModifiedOn > fromTime)
-                .Select(r => r.TenantId)
-                .GroupBy(r => r)
-                .Where(r => r.Any())
+                .GroupBy(r => r.TenantId)
+                .Where(r => r.Count() > 0)
                 .Select(r => r.Key)
                 .ToList();
 
             var q2 = FilesDbContext.Security
                 .Where(r => r.TimeStamp > fromTime)
-                .Select(r => r.TenantId)
-                .GroupBy(r => r)
-                .Where(r => r.Any())
+                .GroupBy(r => r.TenantId)
+                .Where(r => r.Count() > 0)
                 .Select(r => r.Key)
                 .ToList();
 

diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
@@ -1211,16 +1211,14 @@ public IEnumerable<int> GetTenantsWithFeedsForFolders(DateTime fromTime)
         {
             var q1 = FilesDbContext.Files
                 .Where(r => r.ModifiedOn > fromTime)
-                .Select(r => r.TenantId)
-                .GroupBy(r => r)
+                .GroupBy(r => r.TenantId)
                 .Where(r => r.Count() > 0)
                 .Select(r => r.Key)
                 .ToList();
 
             var q2 = FilesDbContext.Security
                 .Where(r => r.TimeStamp > fromTime)
-                .Select(r => r.TenantId)
-                .GroupBy(r => r)
+                .GroupBy(r => r.TenantId)
                 .Where(r => r.Count() > 0)
                 .Select(r => r.Key)
                 .ToList();