From 6ac10fac2f02e7076a489386eb6440c69b584ef2 Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Fri, 8 Nov 2019 18:11:30 +0300 Subject: [PATCH] ISettings replaced with ISettingsExt --- .../ASC.Core.Common/Data/DbSettingsManager.cs | 14 ++------- common/ASC.Core.Common/Settings/ISettings.cs | 5 ---- .../Tenants/TenantAnalyticsSettings.cs | 2 +- .../Tenants/TenantAuditSettings.cs | 2 +- .../Tenants/TenantCookieSettings.cs | 2 +- .../Users/DisplayUserSettings.cs | 2 +- .../Users/PersonalQuotaSettings.cs | 2 +- .../WhiteLabel/MailWhiteLabelSettings.cs | 11 +------ .../Configuration/StorageSettings.cs | 2 +- .../ASC.IPSecurity/IpRestrictionsSettings.cs | 2 +- .../Controllers/SettingsController.cs | 11 ++++--- web/ASC.Web.Core/CollaboratorSettings.cs | 2 +- web/ASC.Web.Core/CustomNavigationSettings.cs | 2 +- web/ASC.Web.Core/EmailActivationSettings.cs | 2 +- .../Sms/StudioSmsNotificationSettings.cs | 2 +- web/ASC.Web.Core/StudioDefaultPageSettings.cs | 2 +- web/ASC.Web.Core/TariffSettings.cs | 2 +- web/ASC.Web.Core/Tfa/TfaAppAuthSettings.cs | 2 +- web/ASC.Web.Core/Tfa/TfaAppUserSettings.cs | 6 ++-- web/ASC.Web.Core/TipsSettings.cs | 2 +- web/ASC.Web.Core/Users/CustomNamingPeople.cs | 2 +- .../Users/UserHelpTourSettings.cs | 2 +- web/ASC.Web.Core/Users/UserPhotoManager.cs | 7 +++-- .../Users/UserPhotoThumbnailSettings.cs | 2 +- .../Utility/ColorThemesSettings.cs | 29 +++++++++---------- web/ASC.Web.Core/Utility/PasswordSettings.cs | 6 +--- .../Utility/Settings/TenantAccessSettings.cs | 2 +- .../Utility/Settings/WebItemSettings.cs | 7 +---- .../Utility/Settings/WizardSettings.cs | 2 +- .../AdditionalWhiteLabelSettings.cs | 2 +- .../WhiteLabel/CompanyWhiteLabelSettings.cs | 9 ++---- .../WhiteLabel/TenantInfoSettings.cs | 3 +- .../WhiteLabel/TenantWhiteLabelSettings.cs | 2 +- 33 files changed, 58 insertions(+), 94 deletions(-) diff --git a/common/ASC.Core.Common/Data/DbSettingsManager.cs b/common/ASC.Core.Common/Data/DbSettingsManager.cs index e73fa1b8d3..5463516ef5 100644 --- a/common/ASC.Core.Common/Data/DbSettingsManager.cs +++ b/common/ASC.Core.Common/Data/DbSettingsManager.cs @@ -136,12 +136,7 @@ namespace ASC.Core.Data var data = Serialize(settings); var db = DbManager; - var def = (T)settings.GetDefault(); - - if (def is ISettingsExt) - { - def = (T)((ISettingsExt)settings).GetDefault(ServiceProvider); - } + var def = (T)settings.GetDefault(ServiceProvider); var defaultData = Serialize(def); @@ -181,12 +176,7 @@ namespace ASC.Core.Data { var settingsInstance = Activator.CreateInstance(); var key = settingsInstance.ID.ToString() + tenantId + userId; - var def = (T)settingsInstance.GetDefault(); - - if (def is ISettingsExt) - { - def = (T)((ISettingsExt)settingsInstance).GetDefault(ServiceProvider); - } + var def = (T)settingsInstance.GetDefault(ServiceProvider); try { diff --git a/common/ASC.Core.Common/Settings/ISettings.cs b/common/ASC.Core.Common/Settings/ISettings.cs index 8622464d59..c4c4f8b845 100644 --- a/common/ASC.Core.Common/Settings/ISettings.cs +++ b/common/ASC.Core.Common/Settings/ISettings.cs @@ -31,11 +31,6 @@ namespace ASC.Core.Common.Settings public interface ISettings { Guid ID { get; } - ISettings GetDefault(); - } - - public interface ISettingsExt : ISettings - { ISettings GetDefault(IServiceProvider serviceProvider); } } diff --git a/common/ASC.Core.Common/Tenants/TenantAnalyticsSettings.cs b/common/ASC.Core.Common/Tenants/TenantAnalyticsSettings.cs index 4074e04be9..dc92645925 100644 --- a/common/ASC.Core.Common/Tenants/TenantAnalyticsSettings.cs +++ b/common/ASC.Core.Common/Tenants/TenantAnalyticsSettings.cs @@ -42,7 +42,7 @@ namespace ASC.Core.Tenants get { return new Guid("{02943039-F399-421E-A552-23D70651AEBD}"); } } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new TenantAnalyticsSettings { diff --git a/common/ASC.Core.Common/Tenants/TenantAuditSettings.cs b/common/ASC.Core.Common/Tenants/TenantAuditSettings.cs index 5a0f10171d..d084b550ab 100644 --- a/common/ASC.Core.Common/Tenants/TenantAuditSettings.cs +++ b/common/ASC.Core.Common/Tenants/TenantAuditSettings.cs @@ -49,7 +49,7 @@ namespace ASC.Core.Tenants get { return Guid; } } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new TenantAuditSettings { diff --git a/common/ASC.Core.Common/Tenants/TenantCookieSettings.cs b/common/ASC.Core.Common/Tenants/TenantCookieSettings.cs index 79dabdbcac..2b1d2a9749 100644 --- a/common/ASC.Core.Common/Tenants/TenantCookieSettings.cs +++ b/common/ASC.Core.Common/Tenants/TenantCookieSettings.cs @@ -45,7 +45,7 @@ namespace ASC.Core.Tenants public int LifeTime { get; set; } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return GetInstance(); } diff --git a/common/ASC.Core.Common/Users/DisplayUserSettings.cs b/common/ASC.Core.Common/Users/DisplayUserSettings.cs index 917db27362..7f3bdc98fa 100644 --- a/common/ASC.Core.Common/Users/DisplayUserSettings.cs +++ b/common/ASC.Core.Common/Users/DisplayUserSettings.cs @@ -47,7 +47,7 @@ namespace ASC.Web.Core.Users [DataMember(Name = "IsDisableGettingStarted")] public bool IsDisableGettingStarted { get; set; } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new DisplayUserSettings { diff --git a/common/ASC.Core.Common/Users/PersonalQuotaSettings.cs b/common/ASC.Core.Common/Users/PersonalQuotaSettings.cs index 9bbf0bfde7..5b47163831 100644 --- a/common/ASC.Core.Common/Users/PersonalQuotaSettings.cs +++ b/common/ASC.Core.Common/Users/PersonalQuotaSettings.cs @@ -43,7 +43,7 @@ namespace ASC.Core.Tenants } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new PersonalQuotaSettings { diff --git a/common/ASC.Core.Common/WhiteLabel/MailWhiteLabelSettings.cs b/common/ASC.Core.Common/WhiteLabel/MailWhiteLabelSettings.cs index 51492848ba..34458b409f 100644 --- a/common/ASC.Core.Common/WhiteLabel/MailWhiteLabelSettings.cs +++ b/common/ASC.Core.Common/WhiteLabel/MailWhiteLabelSettings.cs @@ -36,7 +36,7 @@ namespace ASC.Web.Core.WhiteLabel { [Serializable] [DataContract] - public class MailWhiteLabelSettings : ISettingsExt + public class MailWhiteLabelSettings : ISettings { [DataMember(Name = "FooterEnabled")] public bool FooterEnabled { get; set; } @@ -62,15 +62,6 @@ namespace ASC.Web.Core.WhiteLabel public Guid ID { get { return new Guid("{C3602052-5BA2-452A-BD2A-ADD0FAF8EB88}"); } - } - - public ISettings GetDefault() - { - return new MailWhiteLabelSettings - { - FooterEnabled = true, - FooterSocialEnabled = true - }; } public ISettings GetDefault(IConfiguration configuration) diff --git a/common/ASC.Data.Storage/Configuration/StorageSettings.cs b/common/ASC.Data.Storage/Configuration/StorageSettings.cs index 11e002e718..ea2e9b502e 100644 --- a/common/ASC.Data.Storage/Configuration/StorageSettings.cs +++ b/common/ASC.Data.Storage/Configuration/StorageSettings.cs @@ -79,7 +79,7 @@ namespace ASC.Data.Storage.Configuration [DataMember(Name = "Props")] public Dictionary Props { get; set; } - public ISettings GetDefault() => new T(); + public ISettings GetDefault(IServiceProvider serviceProvider) => new T(); public virtual Func Switch { get { return d => d; } } public ICacheNotify Cache { get; internal set; } diff --git a/common/ASC.IPSecurity/IpRestrictionsSettings.cs b/common/ASC.IPSecurity/IpRestrictionsSettings.cs index 2af8addf16..c14b70a8a4 100644 --- a/common/ASC.IPSecurity/IpRestrictionsSettings.cs +++ b/common/ASC.IPSecurity/IpRestrictionsSettings.cs @@ -42,7 +42,7 @@ namespace ASC.IPSecurity get { return new Guid("{2EDDDF64-F792-4498-A638-2E3E6EBB13C9}"); } } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new IPRestrictionsSettings { Enable = false }; } diff --git a/web/ASC.Web.Api/Controllers/SettingsController.cs b/web/ASC.Web.Api/Controllers/SettingsController.cs index d4a3799a6b..e05ac3f5c3 100644 --- a/web/ASC.Web.Api/Controllers/SettingsController.cs +++ b/web/ASC.Web.Api/Controllers/SettingsController.cs @@ -92,6 +92,7 @@ namespace ASC.Api.Settings public MessageService MessageService { get; } public StudioNotifyService StudioNotifyService { get; } public IWebHostEnvironment WebHostEnvironment { get; } + public IServiceProvider ServiceProvider { get; } public UserManager UserManager { get; } public TenantManager TenantManager { get; } public TenantExtra TenantExtra { get; } @@ -169,10 +170,12 @@ namespace ASC.Api.Settings StudioSmsNotificationSettingsHelper studioSmsNotificationSettingsHelper, CoreSettings coreSettings, StorageSettingsHelper storageSettingsHelper, - IWebHostEnvironment webHostEnvironment) + IWebHostEnvironment webHostEnvironment, + IServiceProvider serviceProvider) { Log = option.Get("ASC.Api"); WebHostEnvironment = webHostEnvironment; + ServiceProvider = serviceProvider; MessageService = messageService; StudioNotifyService = studioNotifyService; ApiContext = apiContext; @@ -458,7 +461,7 @@ namespace ASC.Api.Settings } else if (productId == defaultPageSettings.DefaultProductID) { - SettingsManager.Save(defaultPageSettings.GetDefault() as StudioDefaultPageSettings); + SettingsManager.Save(defaultPageSettings.GetDefault(ServiceProvider) as StudioDefaultPageSettings); } WebItemSecurity.SetSecurity(item.Key, item.Value, subjects); @@ -848,7 +851,7 @@ namespace ASC.Api.Settings if (user.IsVisitor(UserManager) || user.IsOutsider(UserManager)) throw new NotSupportedException("Not available."); - TfaAppUserSettings.DisableForUser(SettingsManager, user.ID); + TfaAppUserSettings.DisableForUser(ServiceProvider, SettingsManager, user.ID); MessageService.Send(MessageAction.UserDisconnectedTfaApp, MessageTarget.Create(user.ID), user.DisplayUserName(false, DisplayUserSettingsHelper)); if (isMe) @@ -1066,7 +1069,7 @@ namespace ASC.Api.Settings if (!instance.IsDefault(CoreSettings) && !instance.IsLicensor) { - result.Add(instance.GetDefault() as CompanyWhiteLabelSettings); + result.Add(instance.GetDefault(ServiceProvider) as CompanyWhiteLabelSettings); } return result; diff --git a/web/ASC.Web.Core/CollaboratorSettings.cs b/web/ASC.Web.Core/CollaboratorSettings.cs index 4b1d4d33f7..c4413767df 100644 --- a/web/ASC.Web.Core/CollaboratorSettings.cs +++ b/web/ASC.Web.Core/CollaboratorSettings.cs @@ -42,7 +42,7 @@ namespace ASC.Web.Studio.Core get { return new Guid("{73537E08-17F6-4706-BFDA-1414108AA7D2}"); } } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new CollaboratorSettings() { diff --git a/web/ASC.Web.Core/CustomNavigationSettings.cs b/web/ASC.Web.Core/CustomNavigationSettings.cs index c084c76fd0..e44597d633 100644 --- a/web/ASC.Web.Core/CustomNavigationSettings.cs +++ b/web/ASC.Web.Core/CustomNavigationSettings.cs @@ -43,7 +43,7 @@ namespace ASC.Web.Studio.Core get { return new Guid("{32E02E4C-925D-4391-BAA4-3B5D223A2104}"); } } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new CustomNavigationSettings { Items = new List() }; } diff --git a/web/ASC.Web.Core/EmailActivationSettings.cs b/web/ASC.Web.Core/EmailActivationSettings.cs index 32a1c1e784..29a1edbfe5 100644 --- a/web/ASC.Web.Core/EmailActivationSettings.cs +++ b/web/ASC.Web.Core/EmailActivationSettings.cs @@ -42,7 +42,7 @@ namespace ASC.Web.Studio.Core get { return new Guid("{85987929-1339-48EB-B06D-B9D097BDACF6}"); } } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new EmailActivationSettings { Show = true }; } diff --git a/web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs b/web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs index ed46ce7947..86f2832e56 100644 --- a/web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs +++ b/web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs @@ -44,7 +44,7 @@ namespace ASC.Web.Studio.Core.SMS get { return new Guid("{2802df61-af0d-40d4-abc5-a8506a5352ff}"); } } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new StudioSmsNotificationSettings { EnableSetting = false, }; } diff --git a/web/ASC.Web.Core/StudioDefaultPageSettings.cs b/web/ASC.Web.Core/StudioDefaultPageSettings.cs index 3d5d6fbec5..c71ed19864 100644 --- a/web/ASC.Web.Core/StudioDefaultPageSettings.cs +++ b/web/ASC.Web.Core/StudioDefaultPageSettings.cs @@ -47,7 +47,7 @@ namespace ASC.Web.Studio.Core get { return new Guid("{48328C27-4C85-4987-BA0E-D6BB17356B10}"); } } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new StudioDefaultPageSettings { DefaultProductID = Guid.Empty }; } diff --git a/web/ASC.Web.Core/TariffSettings.cs b/web/ASC.Web.Core/TariffSettings.cs index 0913d2a4e5..acee1f35c4 100644 --- a/web/ASC.Web.Core/TariffSettings.cs +++ b/web/ASC.Web.Core/TariffSettings.cs @@ -49,7 +49,7 @@ namespace ASC.Web.Studio.UserControls.Management [DataMember(Name = "LicenseAccept")] public string LicenseAcceptSetting { get; set; } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new TariffSettings { diff --git a/web/ASC.Web.Core/Tfa/TfaAppAuthSettings.cs b/web/ASC.Web.Core/Tfa/TfaAppAuthSettings.cs index 43d7a634e6..c27fdfceeb 100644 --- a/web/ASC.Web.Core/Tfa/TfaAppAuthSettings.cs +++ b/web/ASC.Web.Core/Tfa/TfaAppAuthSettings.cs @@ -39,7 +39,7 @@ namespace ASC.Web.Studio.Core.TFA get { return new Guid("{822CA059-AA8F-4588-BEE3-6CD2AA920CDB}"); } } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new TfaAppAuthSettings { EnableSetting = false, }; } diff --git a/web/ASC.Web.Core/Tfa/TfaAppUserSettings.cs b/web/ASC.Web.Core/Tfa/TfaAppUserSettings.cs index 6bf8857ae1..73dc907ba8 100644 --- a/web/ASC.Web.Core/Tfa/TfaAppUserSettings.cs +++ b/web/ASC.Web.Core/Tfa/TfaAppUserSettings.cs @@ -47,7 +47,7 @@ namespace ASC.Web.Studio.Core.TFA get { return new Guid("{EAF10611-BE1E-4634-B7A1-57F913042F78}"); } } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new TfaAppUserSettings { @@ -91,9 +91,9 @@ namespace ASC.Web.Studio.Core.TFA return settingsManager.LoadForUser(guid).CodesSetting.Any(); } - public static void DisableForUser(SettingsManager settingsManager, Guid guid) + public static void DisableForUser(IServiceProvider serviceProvider, SettingsManager settingsManager, Guid guid) { - if (new TfaAppUserSettings().GetDefault() is TfaAppUserSettings defaultSettings) + if (new TfaAppUserSettings().GetDefault(serviceProvider) is TfaAppUserSettings defaultSettings) { settingsManager.SaveForUser(defaultSettings, guid); } diff --git a/web/ASC.Web.Core/TipsSettings.cs b/web/ASC.Web.Core/TipsSettings.cs index f20a39ff2b..0132af3f30 100644 --- a/web/ASC.Web.Core/TipsSettings.cs +++ b/web/ASC.Web.Core/TipsSettings.cs @@ -42,7 +42,7 @@ namespace ASC.Web.Studio.Core get { return new Guid("{27909339-B4D4-466F-8F40-A64C9D2FC041}"); } } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new TipsSettings { Show = true }; } diff --git a/web/ASC.Web.Core/Users/CustomNamingPeople.cs b/web/ASC.Web.Core/Users/CustomNamingPeople.cs index fec0a8fa02..37d02fdd14 100644 --- a/web/ASC.Web.Core/Users/CustomNamingPeople.cs +++ b/web/ASC.Web.Core/Users/CustomNamingPeople.cs @@ -53,7 +53,7 @@ namespace ASC.Web.Core.Users [DataMember(Name = "ItemId")] public string ItemID { get; set; } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new PeopleNamesSettings { ItemID = PeopleNamesItem.DefaultID }; } diff --git a/web/ASC.Web.Core/Users/UserHelpTourSettings.cs b/web/ASC.Web.Core/Users/UserHelpTourSettings.cs index 83f532a3a9..030d9026c8 100644 --- a/web/ASC.Web.Core/Users/UserHelpTourSettings.cs +++ b/web/ASC.Web.Core/Users/UserHelpTourSettings.cs @@ -46,7 +46,7 @@ namespace ASC.Web.Core.Users [DataMember(Name = "IsNewUser")] public bool IsNewUser { get; set; } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new UserHelpTourSettings { diff --git a/web/ASC.Web.Core/Users/UserPhotoManager.cs b/web/ASC.Web.Core/Users/UserPhotoManager.cs index 80cf152610..c7e791a94d 100644 --- a/web/ASC.Web.Core/Users/UserPhotoManager.cs +++ b/web/ASC.Web.Core/Users/UserPhotoManager.cs @@ -202,6 +202,7 @@ namespace ASC.Web.Core.Users public StorageFactory StorageFactory { get; } public UserPhotoManagerCache UserPhotoManagerCache { get; } public SettingsManager SettingsManager { get; } + public IServiceProvider ServiceProvider { get; } public ILog Log { get; } private Tenant tenant; @@ -218,7 +219,8 @@ namespace ASC.Web.Core.Users UserPhotoManagerCache userPhotoManagerCache, IOptionsMonitor options, WorkerQueueOptionsManager optionsQueue, - SettingsManager settingsManager) + SettingsManager settingsManager, + IServiceProvider serviceProvider) { ResizeQueue = optionsQueue.Value; UserManager = userManager; @@ -227,6 +229,7 @@ namespace ASC.Web.Core.Users StorageFactory = storageFactory; UserPhotoManagerCache = userPhotoManagerCache; SettingsManager = settingsManager; + ServiceProvider = serviceProvider; Log = options.Get("ASC.Web.Photo"); } @@ -505,7 +508,7 @@ namespace ASC.Web.Core.Users } public void ResetThumbnailSettings(Guid userId) { - var thumbSettings = new UserPhotoThumbnailSettings().GetDefault() as UserPhotoThumbnailSettings; + var thumbSettings = new UserPhotoThumbnailSettings().GetDefault(ServiceProvider) as UserPhotoThumbnailSettings; SettingsManager.SaveForUser(thumbSettings, userId); } diff --git a/web/ASC.Web.Core/Users/UserPhotoThumbnailSettings.cs b/web/ASC.Web.Core/Users/UserPhotoThumbnailSettings.cs index dc7ef339d6..cbebdb35e3 100644 --- a/web/ASC.Web.Core/Users/UserPhotoThumbnailSettings.cs +++ b/web/ASC.Web.Core/Users/UserPhotoThumbnailSettings.cs @@ -65,7 +65,7 @@ namespace ASC.Web.Core.Users [DataMember(Name = "IsDefault")] public bool IsDefault { get; private set; } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new UserPhotoThumbnailSettings { diff --git a/web/ASC.Web.Core/Utility/ColorThemesSettings.cs b/web/ASC.Web.Core/Utility/ColorThemesSettings.cs index a65efb210f..6134962fd8 100644 --- a/web/ASC.Web.Core/Utility/ColorThemesSettings.cs +++ b/web/ASC.Web.Core/Utility/ColorThemesSettings.cs @@ -28,10 +28,10 @@ using System; using System.IO; using System.Runtime.Serialization; using ASC.Core.Common.Settings; -using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; +using Microsoft.Extensions.Hosting; namespace ASC.Web.Core.Utility { @@ -49,7 +49,7 @@ namespace ASC.Web.Core.Utility [DataMember(Name = "FirstRequest")] public bool FirstRequest { get; set; } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new ColorThemesSettings { @@ -67,31 +67,28 @@ namespace ASC.Web.Core.Utility public class ColorThemesSettingsHelper { public SettingsManager SettingsManager { get; } - public IUrlHelper UrlHelper { get; } - public IWebHostEnvironment WebHostEnvironment { get; } + public IHostEnvironment HostEnvironment { get; } public ColorThemesSettingsHelper( SettingsManager settingsManager, - IUrlHelper urlHelper, - IWebHostEnvironment webHostEnvironment) + IHostEnvironment hostEnvironment) { SettingsManager = settingsManager; - UrlHelper = urlHelper; - WebHostEnvironment = webHostEnvironment; + HostEnvironment = hostEnvironment; } - public string GetThemeFolderName(string path) + public string GetThemeFolderName(IUrlHelper urlHelper, string path) { var folderName = GetColorThemesSettings(); var resolvedPath = path.ToLower().Replace(ColorThemesSettings.ThemeFolderTemplate, folderName); //TODO check - if (!UrlHelper.IsLocalUrl(resolvedPath)) - resolvedPath = UrlHelper.Action(resolvedPath); + if (!urlHelper.IsLocalUrl(resolvedPath)) + resolvedPath = urlHelper.Action(resolvedPath); try { - var filePath = Path.Combine(WebHostEnvironment.ContentRootPath, resolvedPath); + var filePath = Path.Combine(HostEnvironment.ContentRootPath, resolvedPath); if (!File.Exists(filePath)) throw new FileNotFoundException("", path); } @@ -99,10 +96,10 @@ namespace ASC.Web.Core.Utility { resolvedPath = path.ToLower().Replace(ColorThemesSettings.ThemeFolderTemplate, "default"); - if (!UrlHelper.IsLocalUrl(resolvedPath)) - resolvedPath = UrlHelper.Action(resolvedPath); + if (!urlHelper.IsLocalUrl(resolvedPath)) + resolvedPath = urlHelper.Action(resolvedPath); - var filePath = Path.Combine(WebHostEnvironment.ContentRootPath, resolvedPath); + var filePath = Path.Combine(HostEnvironment.ContentRootPath, resolvedPath); if (!File.Exists(filePath)) throw new FileNotFoundException("", path); @@ -133,7 +130,7 @@ namespace ASC.Web.Core.Utility try { - var filePath = Path.Combine(WebHostEnvironment.ContentRootPath, resolvedPath); + var filePath = Path.Combine(HostEnvironment.ContentRootPath, resolvedPath); if (Directory.Exists(filePath)) { SettingsManager.Save(settings); diff --git a/web/ASC.Web.Core/Utility/PasswordSettings.cs b/web/ASC.Web.Core/Utility/PasswordSettings.cs index c61472928c..a2e1d7d124 100644 --- a/web/ASC.Web.Core/Utility/PasswordSettings.cs +++ b/web/ASC.Web.Core/Utility/PasswordSettings.cs @@ -34,7 +34,7 @@ namespace ASC.Web.Core.Utility { [Serializable] [DataContract] - public sealed class PasswordSettings : ISettingsExt + public sealed class PasswordSettings : ISettings { public Guid ID { @@ -67,10 +67,6 @@ namespace ASC.Web.Core.Utility [DataMember] public bool SpecSymbols { get; set; } - public ISettings GetDefault() - { - return new PasswordSettings { MinLength = 6, UpperCase = false, Digits = false, SpecSymbols = false }; - } public ISettings GetDefault(IConfiguration configuration) { var def = new PasswordSettings { MinLength = 6, UpperCase = false, Digits = false, SpecSymbols = false }; diff --git a/web/ASC.Web.Core/Utility/Settings/TenantAccessSettings.cs b/web/ASC.Web.Core/Utility/Settings/TenantAccessSettings.cs index 66764aa113..0780843446 100644 --- a/web/ASC.Web.Core/Utility/Settings/TenantAccessSettings.cs +++ b/web/ASC.Web.Core/Utility/Settings/TenantAccessSettings.cs @@ -45,7 +45,7 @@ namespace ASC.Web.Core.Utility.Settings get { return new Guid("{0CB4C871-0040-45AB-AE79-4CC292B91EF1}"); } } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new TenantAccessSettings { Anyone = false, RegisterUsersImmediately = false }; } diff --git a/web/ASC.Web.Core/Utility/Settings/WebItemSettings.cs b/web/ASC.Web.Core/Utility/Settings/WebItemSettings.cs index d7c47e4000..05f9fc8e0e 100644 --- a/web/ASC.Web.Core/Utility/Settings/WebItemSettings.cs +++ b/web/ASC.Web.Core/Utility/Settings/WebItemSettings.cs @@ -34,7 +34,7 @@ namespace ASC.Web.Core.Utility.Settings { [Serializable] [DataContract] - public class WebItemSettings : ISettingsExt + public class WebItemSettings : ISettings { public Guid ID { @@ -49,11 +49,6 @@ namespace ASC.Web.Core.Utility.Settings SettingsCollection = new List(); } - public ISettings GetDefault() - { - return new WebItemSettings(); - } - public ISettings GetDefault(IServiceProvider serviceProvider) { var settings = new WebItemSettings(); diff --git a/web/ASC.Web.Core/Utility/Settings/WizardSettings.cs b/web/ASC.Web.Core/Utility/Settings/WizardSettings.cs index f2d758bce1..103418e38a 100644 --- a/web/ASC.Web.Core/Utility/Settings/WizardSettings.cs +++ b/web/ASC.Web.Core/Utility/Settings/WizardSettings.cs @@ -46,7 +46,7 @@ namespace ASC.Web.Core.Utility.Settings } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new WizardSettings { diff --git a/web/ASC.Web.Core/WhiteLabel/AdditionalWhiteLabelSettings.cs b/web/ASC.Web.Core/WhiteLabel/AdditionalWhiteLabelSettings.cs index f83312dc11..9d67f5c0df 100644 --- a/web/ASC.Web.Core/WhiteLabel/AdditionalWhiteLabelSettings.cs +++ b/web/ASC.Web.Core/WhiteLabel/AdditionalWhiteLabelSettings.cs @@ -36,7 +36,7 @@ namespace ASC.Web.Core.WhiteLabel { [Serializable] [DataContract] - public class AdditionalWhiteLabelSettings : ISettingsExt + public class AdditionalWhiteLabelSettings : ISettings { [DataMember(Name = "StartDocsEnabled")] public bool StartDocsEnabled { get; set; } diff --git a/web/ASC.Web.Core/WhiteLabel/CompanyWhiteLabelSettings.cs b/web/ASC.Web.Core/WhiteLabel/CompanyWhiteLabelSettings.cs index fab13a86b5..d033b21a0b 100644 --- a/web/ASC.Web.Core/WhiteLabel/CompanyWhiteLabelSettings.cs +++ b/web/ASC.Web.Core/WhiteLabel/CompanyWhiteLabelSettings.cs @@ -35,7 +35,7 @@ namespace ASC.Web.Core.WhiteLabel { [Serializable] [DataContract] - public class CompanyWhiteLabelSettings : ISettingsExt + public class CompanyWhiteLabelSettings : ISettings { [DataMember(Name = "CompanyName")] public string CompanyName { get; set; } @@ -74,12 +74,7 @@ namespace ASC.Web.Core.WhiteLabel get { return new Guid("{C3C5A846-01A3-476D-A962-1CFD78C04ADB}"); } } - private static CompanyWhiteLabelSettings _default; - - public ISettings GetDefault() - { - return new CompanyWhiteLabelSettings(); - } + private static CompanyWhiteLabelSettings _default; public ISettings GetDefault(IServiceProvider serviceProvider) { diff --git a/web/ASC.Web.Core/WhiteLabel/TenantInfoSettings.cs b/web/ASC.Web.Core/WhiteLabel/TenantInfoSettings.cs index 7e00edbaf8..ea49bc80c5 100644 --- a/web/ASC.Web.Core/WhiteLabel/TenantInfoSettings.cs +++ b/web/ASC.Web.Core/WhiteLabel/TenantInfoSettings.cs @@ -51,7 +51,7 @@ namespace ASC.Web.Core.WhiteLabel [DataMember(Name = "Default")] internal bool _isDefault { get; set; } - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new TenantInfoSettings() { @@ -178,7 +178,6 @@ namespace ASC.Web.Core.WhiteLabel .AddWebImageSupplierService() .AddStorageFactoryService() .AddTenantManagerService() - .AddTenantLogoManagerService() .AddSettingsManagerService(); } } diff --git a/web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs b/web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs index aba98788e4..5e345c5f25 100644 --- a/web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs +++ b/web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs @@ -108,7 +108,7 @@ namespace ASC.Web.Core.WhiteLabel #region ISettings Members - public ISettings GetDefault() + public ISettings GetDefault(IServiceProvider serviceProvider) { return new TenantWhiteLabelSettings {