IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: ignore id

Browse Source
This commit is contained in:
pavelbannov 2022-07-12 15:33:46 +03:00
parent fa8898d522
commit c1be6ecb61
43 changed files with 71 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/ASC.Core.Common/GlobalUsings.cs
View File

@ -160,3 +160,5 @@ global using ProtoBuf;
global using Telegram.Bot;
global using static ASC.Security.Cryptography.EmailValidationKeyProvider;
global using JsonIgnoreAttribute = System.Text.Json.Serialization.JsonIgnoreAttribute;

2
common/ASC.Core.Common/Tenants/TenantAuditSettings.cs
View File

@ -35,6 +35,8 @@ public class TenantAuditSettings : ISettings<TenantAuditSettings>
public int AuditTrailLifeTime { get; set; }
public static readonly Guid Guid = new Guid("{8337D0FB-AD67-4552-8297-802312E7F503}");
[JsonIgnore]
public Guid ID => Guid;
public TenantAuditSettings GetDefault()

5
common/ASC.Core.Common/Tenants/TenantControlPanelSettings.cs
View File

@ -31,8 +31,9 @@ namespace ASC.Core.Tenants;
public class TenantControlPanelSettings : ISettings<TenantControlPanelSettings>
{
[DataMember(Name = "LimitedAccess")]
public bool LimitedAccess { get; set; }
public bool LimitedAccess { get; set; }
[JsonIgnore]
public Guid ID => new Guid("{880585C4-52CD-4AE2-8DA4-3B8E2772753B}");
public TenantControlPanelSettings GetDefault()

1
common/ASC.Core.Common/Tenants/TenantCookieSettings.cs
View File

@ -49,6 +49,7 @@ public class TenantCookieSettings : ISettings<TenantCookieSettings>
return new TenantCookieSettings();
}
[JsonIgnore]
public Guid ID => new Guid("{16FB8E67-E96D-4B22-B217-C80F25C5DE1B}");
}

2
common/ASC.Core.Common/Users/DarkThemeSettings.cs
View File

@ -29,7 +29,7 @@ namespace ASC.Web.Core.Users;
[Serializable]
public class DarkThemeSettings : ISettings<DarkThemeSettings>
{
[System.Text.Json.Serialization.JsonIgnore]
[JsonIgnore]
public Guid ID
{
get { return new Guid("{38362061-066D-4C57-A23E-8953CF34EFC3}"); }

1
common/ASC.Core.Common/Users/DisplayUserSettings.cs
View File

@ -29,6 +29,7 @@ namespace ASC.Web.Core.Users;
[Serializable]
public class DisplayUserSettings : ISettings<DisplayUserSettings>
{
[JsonIgnore]
public Guid ID => new Guid("2EF59652-E1A7-4814-BF71-FEB990149428");
public bool IsDisableGettingStarted { get; set; }

1
common/ASC.Core.Common/Users/PersonalQuotaSettings.cs
View File

@ -31,6 +31,7 @@ public class PersonalQuotaSettings : ISettings<PersonalQuotaSettings>
{
public long MaxSpace { get; set; }
[JsonIgnore]
public Guid ID => new Guid("{C634A747-C39B-4517-8698-B3B39BF2BD8E}");
public PersonalQuotaSettings GetDefault()

1
common/ASC.Core.Common/WhiteLabel/MailWhiteLabelSettings.cs
View File

@ -40,6 +40,7 @@ public class MailWhiteLabelSettings : ISettings<MailWhiteLabelSettings>
public string DemoUrl { get; set; }
public string SiteUrl { get; set; }
[JsonIgnore]
public Guid ID => new Guid("{C3602052-5BA2-452A-BD2A-ADD0FAF8EB88}");
public MailWhiteLabelSettings(IConfiguration configuration)

2
common/ASC.Data.Storage/Configuration/StorageSettings.cs
View File

@ -97,6 +97,7 @@ public abstract class BaseStorageSettings<T> : ISettings<BaseStorageSettings<T>>
[Serializable]
public class StorageSettings : BaseStorageSettings<StorageSettings>, ISettings<StorageSettings>
{
[JsonIgnore]
public override Guid ID => new Guid("F13EAF2D-FA53-44F1-A6D6-A5AEDA46FA2B");
StorageSettings ISettings<StorageSettings>.GetDefault()
@ -109,6 +110,7 @@ public class StorageSettings : BaseStorageSettings<StorageSettings>, ISettings<S
[Serializable]
public class CdnStorageSettings : BaseStorageSettings<CdnStorageSettings>, ISettings<CdnStorageSettings>
{
[JsonIgnore]
public override Guid ID => new Guid("0E9AE034-F398-42FE-B5EE-F86D954E9FB2");
public override Func<DataStoreConsumer, DataStoreConsumer> Switch => d => d.Cdn;

3
common/ASC.IPSecurity/IpRestrictionsSettings.cs
View File

@ -24,6 +24,8 @@
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
using System.Text.Json.Serialization;
namespace ASC.IPSecurity;
[Serializable]
@ -31,6 +33,7 @@ public class IPRestrictionsSettings : ISettings<IPRestrictionsSettings>
{
public bool Enable { get; set; }
[JsonIgnore]
public Guid ID => new Guid("{2EDDDF64-F792-4498-A638-2E3E6EBB13C9}");
public IPRestrictionsSettings GetDefault()

2
common/services/ASC.ElasticSearch/Core/SearchSettings.cs
View File

@ -30,6 +30,8 @@ namespace ASC.ElasticSearch.Core;
public class SearchSettings : ISettings<SearchSettings>
{
public string Data { get; set; }
[JsonIgnore]
public Guid ID => new Guid("{93784AB2-10B5-4C2F-9B36-F2662CCCF316}");
internal List<SearchSettingsItem> Items
{

1
products/ASC.Files/Core/Configuration/FilesSettings.cs
View File

@ -110,6 +110,7 @@ public class FilesSettings : ISettings<FilesSettings>
};
}
[JsonIgnore]
public Guid ID => new Guid("{03B382BD-3C20-4f03-8AB9-5A33F016316E}");
}

3
web/ASC.Web.Api/Core/AdminHelperSettings.cs
View File

@ -29,7 +29,8 @@ namespace ASC.Web.Studio.Core;
public class AdminHelperSettings : ISettings<AdminHelperSettings>
{
public bool Viewed { get; set; }
[JsonIgnore]
public Guid ID
{
get { return new Guid("{342CBBF7-FE08-4261-AB38-9C6BA8FA22B9}"); }

7
web/ASC.Web.Api/Core/OpensourceGiftSettings.cs
View File

@ -28,10 +28,11 @@ namespace ASC.Web.Studio.Core;
public class OpensourceGiftSettings : ISettings<OpensourceGiftSettings>
{
public bool Readed { get; set; }
public bool Readed { get; set; }
#region ISettings Members
[JsonIgnore]
public Guid ID
{
get { return new Guid("{1F4FEA2C-2D9F-47A6-ADEF-CEC4D1E1E243}"); }

1
web/ASC.Web.Core/CollaboratorSettings.cs
View File

@ -31,6 +31,7 @@ public class CollaboratorSettings : ISettings<CollaboratorSettings>
{
public bool FirstVisit { get; set; }
[JsonIgnore]
public Guid ID
{
get { return new Guid("{73537E08-17F6-4706-BFDA-1414108AA7D2}"); }

3
web/ASC.Web.Core/CustomNavigationSettings.cs
View File

@ -30,7 +30,8 @@ namespace ASC.Web.Studio.Core;
public class CustomNavigationSettings : ISettings<CustomNavigationSettings>
{
public List<CustomNavigationItem> Items { get; set; }
[JsonIgnore]
public Guid ID
{
get { return new Guid("{32E02E4C-925D-4391-BAA4-3B5D223A2104}"); }

3
web/ASC.Web.Core/EmailActivationSettings.cs
View File

@ -30,7 +30,8 @@ namespace ASC.Web.Studio.Core;
public class EmailActivationSettings : ISettings<EmailActivationSettings>
{
public bool Show { get; set; }
[JsonIgnore]
public Guid ID
{
get { return new Guid("{85987929-1339-48EB-B06D-B9D097BDACF6}"); }

1
web/ASC.Web.Core/GlobalUsings.cs
View File

@ -150,3 +150,4 @@ global using static ASC.Web.Core.Files.DocumentService;
global using License = ASC.Core.Billing.License;
global using SecurityContext = ASC.Core.SecurityContext;
global using JsonIgnoreAttribute = System.Text.Json.Serialization.JsonIgnoreAttribute;

1
web/ASC.Web.Core/Notify/SpamEmailSettings.cs
View File

@ -33,6 +33,7 @@ public class SpamEmailSettings : ISettings<SpamEmailSettings>
public DateTime MailsSendedDate { get; set; }
[JsonIgnore]
public Guid ID
{
get { return new Guid("{A9819A62-60AF-48E3-989C-08259772FA57}"); }

1
web/ASC.Web.Core/PersonalSettings.cs
View File

@ -36,6 +36,7 @@ public class PersonalSettings : ISettings<PersonalSettings>
[JsonPropertyName("IsNotActivated")]
public bool IsNotActivatedSetting { get; set; }
[JsonIgnore]
public Guid ID
{
get { return new Guid("{B3427865-8E32-4E66-B6F3-91C61922239F}"); }

1
web/ASC.Web.Core/PrivacyRoomSettings.cs
View File

@ -31,6 +31,7 @@ public class PrivacyRoomSettings : ISettings<PrivacyRoomSettings>
[JsonPropertyName("enbaled")]
public bool EnabledSetting { get; set; }
[JsonIgnore]
public Guid ID
{
get { return new Guid("{FCF002BC-EC4B-4DAB-A6CE-BDE0ABDA44D3}"); }

1
web/ASC.Web.Core/PromotionsSettings.cs
View File

@ -31,6 +31,7 @@ public class PromotionsSettings : ISettings<PromotionsSettings>
{
public bool Show { get; set; }
[JsonIgnore]
public Guid ID
{
get { return new Guid("{D291A4C1-179D-4ced-895A-E094E809C859}"); }

1
web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
View File

@ -29,6 +29,7 @@ namespace ASC.Web.Studio.Core.SMS;
[Serializable]
public class StudioSmsNotificationSettings : ISettings<StudioSmsNotificationSettings>
{
[JsonIgnore]
public Guid ID
{
get { return new Guid("{2802df61-af0d-40d4-abc5-a8506a5352ff}"); }

3
web/ASC.Web.Core/SsoSettingsV2.cs
View File

@ -28,7 +28,8 @@ namespace ASC.Web.Studio.UserControls.Management.SingleSignOnSettings;
[Serializable]
public class SsoSettingsV2 : ISettings<SsoSettingsV2>
{
{
[JsonIgnore]
public Guid ID
{
get { return new Guid("{1500187F-B8AB-406F-97B8-04BFE8261DBE}"); }

1
web/ASC.Web.Core/StudioAdminMessageSettings.cs
View File

@ -30,6 +30,7 @@ public class StudioAdminMessageSettings : ISettings<StudioAdminMessageSettings>
{
public bool Enable { get; set; }
[JsonIgnore]
public Guid ID
{
get { return new Guid("{28902650-58A9-11E1-B6A9-0F194924019B}"); }

1
web/ASC.Web.Core/StudioDefaultPageSettings.cs
View File

@ -31,6 +31,7 @@ public class StudioDefaultPageSettings : ISettings<StudioDefaultPageSettings>
{
public Guid DefaultProductID { get; set; }
[JsonIgnore]
public Guid ID
{
get { return new Guid("{F3FF27C5-BDE3-43ae-8DD0-2E8E0D7044F1}"); }

1
web/ASC.Web.Core/StudioTrustedDomainSettings.cs
View File

@ -30,6 +30,7 @@ public class StudioTrustedDomainSettings : ISettings<StudioTrustedDomainSettings
{
public bool InviteUsersAsVisitors { get; set; }
[JsonIgnore]
public Guid ID
{
get { return new Guid("{00A2DB01-BAE3-48aa-BE32-CE768D7C874E}"); }

3
web/ASC.Web.Core/TariffSettings.cs
View File

@ -49,7 +49,8 @@ public class TariffSettings : ISettings<TariffSettings>
LicenseAcceptSetting = DateTime.MinValue.ToString(_cultureInfo),
};
}
[JsonIgnore]
public Guid ID
{
get { return new Guid("{07956D46-86F7-433b-A657-226768EF9B0D}"); }

1
web/ASC.Web.Core/Tfa/TfaAppAuthSettings.cs
View File

@ -29,6 +29,7 @@ namespace ASC.Web.Studio.Core.TFA;
[Serializable]
public class TfaAppAuthSettings : ISettings<TfaAppAuthSettings>
{
[JsonIgnore]
public Guid ID
{
get { return new Guid("{822CA059-AA8F-4588-BEE3-6CD2AA920CDB}"); }

1
web/ASC.Web.Core/Tfa/TfaAppUserSettings.cs
View File

@ -35,6 +35,7 @@ public class TfaAppUserSettings : ISettings<TfaAppUserSettings>
[JsonPropertyName("Salt")]
public long SaltSetting { get; set; }
[JsonIgnore]
public Guid ID
{
get { return new Guid("{EAF10611-BE1E-4634-B7A1-57F913042F78}"); }

1
web/ASC.Web.Core/TipsSettings.cs
View File

@ -32,6 +32,7 @@ public class TipsSettings : ISettings<TipsSettings>
[DataMember(Name = "Show")]
public bool Show { get; set; }
[JsonIgnore]
public Guid ID
{
get { return new Guid("{27909339-B4D4-466F-8F40-A64C9D2FC041}"); }

1
web/ASC.Web.Core/Users/CustomNamingPeople.cs
View File

@ -29,6 +29,7 @@ namespace ASC.Web.Core.Users;
[Serializable]
public class PeopleNamesSettings : ISettings<PeopleNamesSettings>
{
[JsonIgnore]
public Guid ID
{
get { return new Guid("47F34957-6A70-4236-9681-C8281FB762FA"); }

1
web/ASC.Web.Core/Users/UserHelpTourSettings.cs
View File

@ -29,6 +29,7 @@ namespace ASC.Web.Core.Users;
[Serializable]
public class UserHelpTourSettings : ISettings<UserHelpTourSettings>
{
[JsonIgnore]
public Guid ID
{
get { return new Guid("{DF4B94B7-42C8-4fce-AAE2-D479F3B39BDD}"); }

1
web/ASC.Web.Core/Users/UserPhotoThumbnailSettings.cs
View File

@ -29,6 +29,7 @@ namespace ASC.Web.Core.Users;
[Serializable]
public class UserPhotoThumbnailSettings : ISettings<UserPhotoThumbnailSettings>
{
[JsonIgnore]
public Guid ID
{
get { return new Guid("{CC3AA821-43CA-421B-BDCD-81FB6D3361CF}"); }

1
web/ASC.Web.Core/Utility/ColorThemesSettings.cs
View File

@ -46,6 +46,7 @@ public class ColorThemesSettings : ISettings<ColorThemesSettings>
};
}
[JsonIgnore]
public Guid ID
{
get { return new Guid("{AB5B3C97-A972-475C-BB13-71936186C4E6}"); }

1
web/ASC.Web.Core/Utility/PasswordSettings.cs
View File

@ -29,6 +29,7 @@ namespace ASC.Web.Core.Utility;
[Serializable]
public sealed class PasswordSettings : ISettings<PasswordSettings>
{
[JsonIgnore]
public Guid ID
{
get { return new Guid("aa93a4d1-012d-4ccd-895a-e094e809c840"); }

1
web/ASC.Web.Core/Utility/Settings/TenantAccessSettings.cs
View File

@ -33,6 +33,7 @@ public class TenantAccessSettings : ISettings<TenantAccessSettings>
public bool RegisterUsersImmediately { get; set; }
[JsonIgnore]
public Guid ID
{
get { return new Guid("{0CB4C871-0040-45AB-AE79-4CC292B91EF1}"); }

1
web/ASC.Web.Core/Utility/Settings/WebItemSettings.cs
View File

@ -30,6 +30,7 @@ public class WebItemSettings : ISettings<WebItemSettings>
{
private readonly WebItemManager _webItemManager;
[JsonIgnore]
public Guid ID
{
get { return new Guid("{C888CF56-585B-4c78-9E64-FE1093649A62}"); }

3
web/ASC.Web.Core/Utility/Settings/WizardSettings.cs
View File

@ -30,7 +30,8 @@ namespace ASC.Web.Core.Utility.Settings;
public class WizardSettings : ISettings<WizardSettings>
{
public bool Completed { get; set; }
[JsonIgnore]
public Guid ID
{
get { return new Guid("{9A925891-1F92-4ed7-B277-D6F649739F06}"); }

3
web/ASC.Web.Core/WhiteLabel/AdditionalWhiteLabelSettings.cs
View File

@ -77,7 +77,8 @@ public class AdditionalWhiteLabelSettings : ISettings<AdditionalWhiteLabelSettin
LicenseAgreementsEnabled == defaultSettings.LicenseAgreementsEnabled &&
LicenseAgreementsUrl == defaultSettings.LicenseAgreementsUrl;
}
[JsonIgnore]
public Guid ID
{
get { return new Guid("{0108422F-C05D-488E-B271-30C4032494DA}"); }

5
web/ASC.Web.Core/WhiteLabel/CompanyWhiteLabelSettings.cs
View File

@ -70,9 +70,10 @@ public class CompanyWhiteLabelSettings : ISettings<CompanyWhiteLabelSettings>
Phone == defaultSettings.Phone &&
IsLicensor == defaultSettings.IsLicensor;
}
#region ISettings Members
[JsonIgnore]
public Guid ID
{
get { return new Guid("{C3C5A846-01A3-476D-A962-1CFD78C04ADB}"); }

3
web/ASC.Web.Core/WhiteLabel/TenantInfoSettings.cs
View File

@ -45,7 +45,8 @@ public class TenantInfoSettings : ISettings<TenantInfoSettings>
IsDefault = true
};
}
[JsonIgnore]
public Guid ID
{
get { return new Guid("{5116B892-CCDD-4406-98CD-4F18297C0C0A}"); }

15
web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
View File

@ -129,6 +129,7 @@ public class TenantWhiteLabelSettings : ISettings<TenantWhiteLabelSettings>
}
#endregion
[JsonIgnore]
public Guid ID
{
get { return new Guid("{05d35540-c80b-4b17-9277-abd9e543bf93}"); }
@ -466,13 +467,13 @@ public class TenantWhiteLabelSettingsHelper
return type switch
{
WhiteLabelLogoTypeEnum.LightSmall => _webImageSupplier.GetAbsoluteWebPath("logo/light_small_doc_space.svg"),
WhiteLabelLogoTypeEnum.Dark => _webImageSupplier.GetAbsoluteWebPath("logo/dark_doc_space.svg"),
WhiteLabelLogoTypeEnum.DocsEditor => general ? _webImageSupplier.GetAbsoluteWebPath("logo/editor_logo_general.png") : _webImageSupplier.GetAbsoluteWebPath("logo/editor_logo.png"),
WhiteLabelLogoTypeEnum.DocsEditorEmbed => general ? _webImageSupplier.GetAbsoluteWebPath("logo/editor_logo_embed_general.png") : _webImageSupplier.GetAbsoluteWebPath("logo/editor_logo_embed.png"),
WhiteLabelLogoTypeEnum.Favicon => general ? _webImageSupplier.GetAbsoluteWebPath("logo/favicon_general.ico") : _webImageSupplier.GetAbsoluteWebPath("logo/favicon.ico"),
WhiteLabelLogoTypeEnum.LeftMenu => _webImageSupplier.GetAbsoluteWebPath("logo/left_menu_general.svg"),
WhiteLabelLogoTypeEnum.AboutPage => _webImageSupplier.GetAbsoluteWebPath("logo/about_doc_space.svg"),
WhiteLabelLogoTypeEnum.LightSmall => _webImageSupplier.GetAbsoluteWebPath("logo/light_small_doc_space.svg"),
WhiteLabelLogoTypeEnum.Dark => _webImageSupplier.GetAbsoluteWebPath("logo/dark_doc_space.svg"),
WhiteLabelLogoTypeEnum.DocsEditor => general ? _webImageSupplier.GetAbsoluteWebPath("logo/editor_logo_general.png") : _webImageSupplier.GetAbsoluteWebPath("logo/editor_logo.png"),
WhiteLabelLogoTypeEnum.DocsEditorEmbed => general ? _webImageSupplier.GetAbsoluteWebPath("logo/editor_logo_embed_general.png") : _webImageSupplier.GetAbsoluteWebPath("logo/editor_logo_embed.png"),
WhiteLabelLogoTypeEnum.Favicon => general ? _webImageSupplier.GetAbsoluteWebPath("logo/favicon_general.ico") : _webImageSupplier.GetAbsoluteWebPath("logo/favicon.ico"),
WhiteLabelLogoTypeEnum.LeftMenu => _webImageSupplier.GetAbsoluteWebPath("logo/left_menu_general.svg"),
WhiteLabelLogoTypeEnum.AboutPage => _webImageSupplier.GetAbsoluteWebPath("logo/about_doc_space.svg"),
_ => "",
};
}