Merge pull request 'feature/license-feature-branding' (#35) from feat…

…ure/license-feature-branding into develop Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/DocSpace-server/pulls/35 Reviewed-by: pavelbannov <[email protected]>
ONLYOFFICE · Oct 3, 2024 · 100b9d1 · 100b9d1
2 parents 4f8ff45 + 7cc1635
commit 100b9d1
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/common/ASC.Core.Common/Billing/License/License.cs b/common/ASC.Core.Common/Billing/License/License.cs
@@ -35,6 +35,10 @@ public class License
     /// <type>System.String, System</type>
     public string OriginalLicense { get; set; }
 
+    /// <summary>Specifies if the license supports branding or not</summary>
+    /// <type>System.Boolean, System</type>
+    public bool Branding { get; set; }
+
     /// <summary>Specifies if the license is customizable or not</summary>
     /// <type>System.Boolean, System</type>
     public bool Customization { get; set; }

diff --git a/common/ASC.Core.Common/Billing/License/LicenseReader.cs b/common/ASC.Core.Common/Billing/License/LicenseReader.cs
@@ -194,6 +194,7 @@ private async Task LicenseToDBAsync(License license)
             ContentSearch = true,
             MaxFileSize = defaultQuota.MaxFileSize,
             DocsEdition = true,
+            Branding = license.Branding,
             Customization = license.Customization,
             Lifetime = !license.TimeLimited,
             Statistic = true

diff --git a/common/ASC.Core.Common/Tenants/TenantQuota.cs b/common/ASC.Core.Common/Tenants/TenantQuota.cs
@@ -236,6 +236,16 @@ public bool Statistic
         set => _statisticFeature.Value = value;
     }
 
+    private readonly TenantQuotaFeatureFlag _brandingFeature;
+
+    /// <summary>Specifies if the branding settings are available or not</summary>
+    /// <type>System.Boolean, System</type>
+    public bool Branding
+    {
+        get => _brandingFeature.Value;
+        set => _brandingFeature.Value = value;
+    }
+
     private readonly TenantQuotaFeatureFlag _customizationFeature;
 
     /// <summary>Specifies if the customization settings are available or not</summary>
@@ -324,6 +334,7 @@ public TenantQuota()
         _docsEditionFeature = new TenantQuotaFeatureFlag(this) { Name = "docs", Visible = false };
         _ldapFeature = new TenantQuotaFeatureFlag(this) { Name = "ldap", Order = 3 };
         _ssoFeature = new TenantQuotaFeatureFlag(this) { Name = "sso", Order = 5 };
+        _brandingFeature = new TenantQuotaFeatureFlag(this) { Name = "branding", Visible = false };
         _customizationFeature = new TenantQuotaFeatureFlag(this) { Name = "customization", Order = 4 };
         _lifetimeFeature = new TenantQuotaFeatureFlag(this) { Name = "lifetime", Standalone = true };
         _customFeature = new TenantQuotaFeatureFlag(this) { Name = "custom", Visible = false };
@@ -349,6 +360,7 @@ public TenantQuota()
             _docsEditionFeature,
             _ldapFeature,
             _ssoFeature,
+            _brandingFeature,
             _customizationFeature,
             _lifetimeFeature,
             _customFeature,

diff --git a/web/ASC.Web.Api/Api/Settings/SettingsController.cs b/web/ASC.Web.Api/Api/Settings/SettingsController.cs
@@ -104,7 +104,8 @@ public async Task<SettingsDto> GetSettingsAsync(bool? withpassword)
             LicenseUrl = setupInfo.LicenseUrl,
             CookieSettingsEnabled = tenantCookieSettings.Enabled,
             UserNameRegex = userFormatter.UserNameRegex.ToString(),
-            ForumLink = await commonLinkUtility.GetUserForumLinkAsync(settingsManager)
+            ForumLink = await commonLinkUtility.GetUserForumLinkAsync(settingsManager),
+            DisplayAbout = (!coreBaseSettings.Standalone && !coreBaseSettings.CustomMode) || !(await tenantManager.GetCurrentTenantQuotaAsync()).Branding
         };
 
         if (!authContext.IsAuthenticated && await externalShare.GetLinkIdAsync() != default)

diff --git a/web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs b/web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
@@ -138,6 +138,10 @@ public class SettingsDto
     /// <type>System.String, System</type>
     public string ForumLink { get; set; }
 
+    /// <summary>Specifies whether to display the About section</summary>
+    /// <type>System.Boolean, System</type>
+    public bool DisplayAbout { get; set; }
+
     /// <summary>API documentation link</summary>
     /// <type>System.String, System</type>
     public string ApiDocsLink { get; set; }