From d134398167372d30ff3ad9273e84f6cbaf363d20 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Wed, 2 Jun 2021 16:28:05 +0300
Subject: [PATCH 1/2] Storage: fix resolve

---
 .../Configuration/StorageSettings.cs                | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/common/ASC.Data.Storage/Configuration/StorageSettings.cs b/common/ASC.Data.Storage/Configuration/StorageSettings.cs
index c533a93760..f6713c6181 100644
--- a/common/ASC.Data.Storage/Configuration/StorageSettings.cs
+++ b/common/ASC.Data.Storage/Configuration/StorageSettings.cs
@@ -136,6 +136,7 @@ namespace ASC.Data.Storage.Configuration
         private SettingsManager SettingsManager { get; }
         private IHttpContextAccessor HttpContextAccessor { get; }
         private ConsumerFactory ConsumerFactory { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         public StorageSettingsHelper(
             BaseStorageSettingsListener baseStorageSettingsListener,
@@ -145,7 +146,8 @@ namespace ASC.Data.Storage.Configuration
             IOptionsMonitor<ILog> options,
             TenantManager tenantManager,
             SettingsManager settingsManager,
-            ConsumerFactory consumerFactory)
+            ConsumerFactory consumerFactory,
+            IServiceProvider serviceProvider)
         {
             baseStorageSettingsListener.Subscribe();
             StorageFactoryConfig = storageFactoryConfig;
@@ -155,6 +157,7 @@ namespace ASC.Data.Storage.Configuration
             TenantManager = tenantManager;
             SettingsManager = settingsManager;
             ConsumerFactory = consumerFactory;
+            ServiceProvider = serviceProvider;
         }
         public StorageSettingsHelper(
             BaseStorageSettingsListener baseStorageSettingsListener,
@@ -165,8 +168,9 @@ namespace ASC.Data.Storage.Configuration
             TenantManager tenantManager,
             SettingsManager settingsManager,
             IHttpContextAccessor httpContextAccessor,
-            ConsumerFactory consumerFactory)
-            : this(baseStorageSettingsListener, storageFactoryConfig, pathUtils, cache, options, tenantManager, settingsManager, consumerFactory)
+            ConsumerFactory consumerFactory,
+            IServiceProvider serviceProvider)
+            : this(baseStorageSettingsListener, storageFactoryConfig, pathUtils, cache, options, tenantManager, settingsManager, consumerFactory, serviceProvider)
         {
             HttpContextAccessor = httpContextAccessor;
         }
@@ -221,8 +225,7 @@ namespace ASC.Data.Storage.Configuration
 
             if (DataStoreConsumer(baseStorageSettings).HandlerType == null) return null;
 
-            return dataStore = ((IDataStore)
-                Activator.CreateInstance(DataStoreConsumer(baseStorageSettings).HandlerType, TenantManager, PathUtils, HttpContextAccessor, Options))
+            return dataStore = ((IDataStore)ServiceProvider.GetService(DataStoreConsumer(baseStorageSettings).HandlerType))
                 .Configure(TenantManager.GetCurrentTenant().TenantId.ToString(), null, null, DataStoreConsumer(baseStorageSettings));
         }
     }

From 36359051678e832d724a174f8842fee96fb4b1eb Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Wed, 2 Jun 2021 17:02:19 +0300
Subject: [PATCH 2/2] Backup: fixed link

---
 .../ASC.Data.Backup/Service/BackupWorker.cs      | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/common/services/ASC.Data.Backup/Service/BackupWorker.cs b/common/services/ASC.Data.Backup/Service/BackupWorker.cs
index 952c6daf6c..91f28f8f67 100644
--- a/common/services/ASC.Data.Backup/Service/BackupWorker.cs
+++ b/common/services/ASC.Data.Backup/Service/BackupWorker.cs
@@ -343,7 +343,21 @@ namespace ASC.Data.Backup.Service
         private string StorageBasePath { get; set; }
         public bool BackupMail { get; set; }
         public Dictionary<string, string> StorageParams { get; set; }
-        public string Link { get; private set; }
+
+        private string link;
+        public string Link
+        {
+            get
+            {
+                return link ?? GetProperty<string>(nameof(link));
+            }
+            set
+            {
+                link = value;
+                SetProperty(nameof(link), value);
+            }
+        }
+
         public string TempFolder { get; set; }
         private string CurrentRegion { get; set; }
         private Dictionary<string, string> ConfigPaths { get; set; }