From 9811aaca33350aa3998df9f1d441ff1abcf6e47d Mon Sep 17 00:00:00 2001
From: Andrey Savihin <andrey.savihin@onlyoffice.com>
Date: Thu, 28 Sep 2023 11:00:58 +0300
Subject: [PATCH] ASC.Common: DistributedTaskProgress: added own property
 CancellationToken

---
 .../ASC.Common/Threading/DistributedTaskProgress.cs   |  3 +++
 common/ASC.Data.Reassigns/ReassignProgressItem.cs     | 11 +----------
 .../WCFService/FileOperations/FileOperation.cs        |  1 -
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/common/ASC.Common/Threading/DistributedTaskProgress.cs b/common/ASC.Common/Threading/DistributedTaskProgress.cs
index 8d3751d650..987bb8bf0a 100644
--- a/common/ASC.Common/Threading/DistributedTaskProgress.cs
+++ b/common/ASC.Common/Threading/DistributedTaskProgress.cs
@@ -53,10 +53,13 @@ public class DistributedTaskProgress : DistributedTask
     [ProtoMember(3)]
     protected int StepCount { get; set; }
 
+    protected CancellationToken CancellationToken { get; set; }
+
     public virtual async Task RunJob(DistributedTask _, CancellationToken cancellationToken)
     {
         Percentage = 0;
         Status = DistributedTaskStatus.Running;
+        CancellationToken = cancellationToken;
 
         await DoJob();
     }
diff --git a/common/ASC.Data.Reassigns/ReassignProgressItem.cs b/common/ASC.Data.Reassigns/ReassignProgressItem.cs
index b00e58821b..931cd57bde 100644
--- a/common/ASC.Data.Reassigns/ReassignProgressItem.cs
+++ b/common/ASC.Data.Reassigns/ReassignProgressItem.cs
@@ -47,8 +47,6 @@ public class ReassignProgressItem : DistributedTaskProgress
     private bool _notify;
     private bool _deleteProfile;
 
-    private CancellationToken _cancellationToken;
-
     public ReassignProgressItem(IServiceScopeFactory serviceScopeFactory)
     {
         _serviceScopeFactory = serviceScopeFactory;
@@ -70,13 +68,6 @@ public class ReassignProgressItem : DistributedTaskProgress
         IsCompleted = false;
     }
 
-    public override async Task RunJob(DistributedTask distributedTask, CancellationToken cancellationToken)
-    {
-        _cancellationToken = cancellationToken;
-
-        await base.RunJob(distributedTask, cancellationToken);
-    }
-
     protected override async Task DoJob()
     {
         await using var scope = _serviceScopeFactory.CreateAsyncScope();
@@ -167,7 +158,7 @@ public class ReassignProgressItem : DistributedTaskProgress
             PublishChanges();
         }
 
-        _cancellationToken.ThrowIfCancellationRequested();
+        CancellationToken.ThrowIfCancellationRequested();
     }
 
     private async Task SendSuccessNotifyAsync(UserManager userManager, StudioNotifyService studioNotifyService, MessageService messageService, MessageTarget messageTarget, DisplayUserSettingsHelper displayUserSettingsHelper)
diff --git a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperation.cs b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperation.cs
index 2eab0f2c6c..3fc1f90829 100644
--- a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperation.cs
+++ b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperation.cs
@@ -214,7 +214,6 @@ abstract class FileOperation<T, TId> : FileOperation where T : FileOperationData
     protected ILinkDao LinkDao { get; private set; }
     protected IProviderDao ProviderDao { get; private set; }
     protected ILogger Logger { get; private set; }
-    protected CancellationToken CancellationToken { get; private set; }
     protected internal List<TId> Folders { get; private set; }
     protected internal List<TId> Files { get; private set; }
     protected ExternalShareData CurrentShareData { get; private set; }