From 2ceb8458086880d33e3bf75db3a6820a9a22807b Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Thu, 19 Nov 2020 11:30:00 +0300
Subject: [PATCH] Thirdparty: fix copy

---
 products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs    | 10 +++++-----
 .../Core/Thirdparty/ProviderDao/ProviderDaoBase.cs     |  5 ++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs b/products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
index 9ef4b5429e..ba9db453b6 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
@@ -3,8 +3,8 @@ using System.Linq;
 using System.Threading;
 
 using ASC.Common;
-using ASC.Files.Core.Data;
 using ASC.Files.Core.Resources;
+using ASC.Files.Core.Security;
 using ASC.Files.Thirdparty.Box;
 using ASC.Files.Thirdparty.Dropbox;
 using ASC.Files.Thirdparty.GoogleDrive;
@@ -49,8 +49,8 @@ namespace ASC.Files.Core.Thirdparty
                                                   FileSizeComment.FilesSizeToString(SetupInfo.AvailableFileSize)));
             }
 
-            var securityDao = ServiceProvider.GetService<SecurityDao<TFrom>>();
-            var tagDao = ServiceProvider.GetService<TagDao<TFrom>>();
+            var securityDao = ServiceProvider.GetService<ISecurityDao<TFrom>>();
+            var tagDao = ServiceProvider.GetService<ITagDao<TFrom>>();
 
             var fromFileShareRecords = securityDao.GetPureShareRecords(fromFile).Where(x => x.EntryType == FileEntryType.File);
             var fromFileNewTags = tagDao.GetNewTags(Guid.Empty, fromFile).ToList();
@@ -153,7 +153,7 @@ namespace ASC.Files.Core.Thirdparty
 
             if (deleteSourceFolder)
             {
-                var securityDao = ServiceProvider.GetService<SecurityDao<TFrom>>();
+                var securityDao = ServiceProvider.GetService<ISecurityDao<TFrom>>();
                 var fromFileShareRecords = securityDao.GetPureShareRecords(fromFolder)
                     .Where(x => x.EntryType == FileEntryType.Folder);
 
@@ -166,7 +166,7 @@ namespace ASC.Files.Core.Thirdparty
                     });
                 }
 
-                var tagDao = ServiceProvider.GetService<TagDao<TFrom>>();
+                var tagDao = ServiceProvider.GetService<ITagDao<TFrom>>();
                 var fromFileNewTags = tagDao.GetNewTags(Guid.Empty, fromFolder).ToList();
 
                 if (fromFileNewTags.Any())
diff --git a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
index db20e955b2..755ebbb443 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
@@ -151,12 +151,11 @@ namespace ASC.Files.Thirdparty.ProviderDao
 
         protected Folder<int> PerformCrossDaoFolderCopy(string fromFolderId, int toRootFolderId, bool deleteSourceFolder, CancellationToken? cancellationToken)
         {
-            var fromSelector = GetSelector(fromFolderId);
-            using var scope = ServiceProvider.CreateScope();
+            var fromSelector = GetSelector(fromFolderId);
 
             return CrossDao.PerformCrossDaoFolderCopy(
                 fromFolderId, fromSelector.GetFolderDao(fromFolderId), fromSelector.GetFileDao(fromFolderId), fromSelector.ConvertId,
-                toRootFolderId, scope.ServiceProvider.GetService<FolderDao>(), scope.ServiceProvider.GetService<IFileDao<int>>(), r => r,
+                toRootFolderId, ServiceProvider.GetService<IFolderDao<int>>(), ServiceProvider.GetService<IFileDao<int>>(), r => r,
                 deleteSourceFolder, cancellationToken);
         }