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

Merge branch 'develop' into feature/get-thumbnail-from-thirdparty

Browse Source
This commit is contained in:
Anton Suhorukov 2022-06-28 15:32:06 +03:00
commit d1063df40c
17 changed files with 128 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.nuget/packages/Microsoft.Graph.Core.1.6.0.nupkg Normal file
View File

Binary file not shown.

BIN
.nuget/packages/Microsoft.OneDriveSDK.2.1.0.nupkg Normal file
View File

Binary file not shown.

BIN
.nuget/packages/Openstack.net.1.8.0.nupkg Normal file
View File

Binary file not shown.

BIN
.nuget/packages/Rackspace.1.0.0.nupkg Normal file
View File

Binary file not shown.

BIN
.nuget/packages/SimpleRESTServicesNET60.1.4.0.nupkg Normal file
View File

Binary file not shown.

2
common/ASC.Data.Storage/ASC.Data.Storage.csproj
View File

@ -43,7 +43,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="openstack.net" Version="1.8.0" />
<PackageReference Include="Rackspace" Version="1.0.0" />
</ItemGroup>
<ItemGroup>

11
config/nginx/onlyoffice.conf
View File

@ -180,14 +180,13 @@ server {
proxy_pass http://localhost:5034;
proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
}
location ~* /sso {
rewrite api/2.0/sso/(.*) /$1 break;
proxy_pass http://localhost:9834;
proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
}
}
location /sso {
rewrite sso/(.*) /$1 break;
proxy_pass http://localhost:9834;
proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
}
location ~* /(ssologin.ashx|login.ashx|storage) {
proxy_pass http://localhost:5003;
proxy_set_header X-REWRITER-URL $X_REWRITER_URL;

2
products/ASC.Files/Core/ASC.Files.Core.csproj
View File

@ -25,7 +25,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.OneDriveSDK" Version="2.1.0" />
<PackageReference Include="Microsoft.OneDriveSDK" Version="2.1.0" />
<PackageReference Include="Microsoft.SharePoint.Client" Version="14.0.4762.1000" />
<PackageReference Include="SharpZipLib" Version="1.3.3" />
</ItemGroup>

3
web/ASC.Web.Api/Api/Settings/SettingsController.cs
View File

@ -142,7 +142,8 @@ public class SettingsController : BaseSettingsController
{
Culture = Tenant.GetCulture().ToString(),
GreetingSettings = Tenant.Name,
Personal = _coreBaseSettings.Personal,
Personal = _coreBaseSettings.Personal,
DocSpace = !_coreBaseSettings.DisableDocSpace,
Version = _configuration["version:number"] ?? "",
TenantStatus = _tenantManager.GetCurrentTenant().Status,
TenantAlias = Tenant.Alias,

10
web/ASC.Web.Api/Api/Settings/SsoController.cs
View File

@ -134,9 +134,15 @@ public class SsoController : BaseSettingsController
if (string.IsNullOrEmpty(serializeSettings))
{
throw new ArgumentException(Resource.SsoSettingsCouldNotBeNull);
}
}
var options = new JsonSerializerOptions
{
AllowTrailingCommas = true,
PropertyNameCaseInsensitive = true
};
var settings = JsonSerializer.Deserialize<SsoSettingsV2>(serializeSettings);
var settings = JsonSerializer.Deserialize<SsoSettingsV2>(serializeSettings, options);
if (settings == null)
{

79
web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
View File

@ -29,8 +29,7 @@ namespace ASC.Web.Api.Controllers.Settings;
public class WhitelabelController : BaseSettingsController
{
private Tenant Tenant { get { return ApiContext.Tenant; } }
private readonly TenantManager _tenantManager;
private readonly TenantExtra _tenantExtra;
private readonly PermissionContext _permissionContext;
private readonly SettingsManager _settingsManager;
@ -42,8 +41,7 @@ public class WhitelabelController : BaseSettingsController
private readonly StorageFactory _storageFactory;
public WhitelabelController(
ApiContext apiContext,
TenantManager tenantManager,
ApiContext apiContext,
TenantExtra tenantExtra,
PermissionContext permissionContext,
SettingsManager settingsManager,
@ -56,8 +54,7 @@ public class WhitelabelController : BaseSettingsController
IMemoryCache memoryCache,
StorageFactory storageFactory,
IHttpContextAccessor httpContextAccessor) : base(apiContext, memoryCache, webItemManager, httpContextAccessor)
{
_tenantManager = tenantManager;
{
_tenantExtra = tenantExtra;
_permissionContext = permissionContext;
_settingsManager = settingsManager;
@ -192,8 +189,9 @@ public class WhitelabelController : BaseSettingsController
new {type = (int)WhiteLabelLogoTypeEnum.Dark, name = nameof(WhiteLabelLogoTypeEnum.Dark), height = TenantWhiteLabelSettings.LogoDarkSize.Height, width = TenantWhiteLabelSettings.LogoDarkSize.Width},
new {type = (int)WhiteLabelLogoTypeEnum.Favicon, name = nameof(WhiteLabelLogoTypeEnum.Favicon), height = TenantWhiteLabelSettings.LogoFaviconSize.Height, width = TenantWhiteLabelSettings.LogoFaviconSize.Width},
new {type = (int)WhiteLabelLogoTypeEnum.DocsEditor, name = nameof(WhiteLabelLogoTypeEnum.DocsEditor), height = TenantWhiteLabelSettings.LogoDocsEditorSize.Height, width = TenantWhiteLabelSettings.LogoDocsEditorSize.Width},
new {type = (int)WhiteLabelLogoTypeEnum.DocsEditorEmbed, name = nameof(WhiteLabelLogoTypeEnum.DocsEditorEmbed), height = TenantWhiteLabelSettings.LogoDocsEditorEmbedSize.Height, width = TenantWhiteLabelSettings.LogoDocsEditorEmbedSize.Width}
new {type = (int)WhiteLabelLogoTypeEnum.DocsEditorEmbed, name = nameof(WhiteLabelLogoTypeEnum.DocsEditorEmbed), height = TenantWhiteLabelSettings.LogoDocsEditorEmbedSize.Height, width = TenantWhiteLabelSettings.LogoDocsEditorEmbedSize.Width},
new {type = (int)WhiteLabelLogoTypeEnum.LeftMenu, name = nameof(WhiteLabelLogoTypeEnum.LeftMenu), height = TenantWhiteLabelSettings.LogoLeftMenuSize.Height, width = TenantWhiteLabelSettings.LogoLeftMenuSize.Width},
new {type = (int)WhiteLabelLogoTypeEnum.AboutPage, name = nameof(WhiteLabelLogoTypeEnum.AboutPage), height = TenantWhiteLabelSettings.LogoAboutPageSize.Height, width = TenantWhiteLabelSettings.LogoAboutPageSize.Width}
};
}
@ -217,7 +215,9 @@ public class WhitelabelController : BaseSettingsController
{ ((int)WhiteLabelLogoTypeEnum.Dark).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPath(WhiteLabelLogoTypeEnum.Dark, !inDto.IsRetina)) },
{ ((int)WhiteLabelLogoTypeEnum.Favicon).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPath(WhiteLabelLogoTypeEnum.Favicon, !inDto.IsRetina)) },
{ ((int)WhiteLabelLogoTypeEnum.DocsEditor).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPath(WhiteLabelLogoTypeEnum.DocsEditor, !inDto.IsRetina)) },
{ ((int)WhiteLabelLogoTypeEnum.DocsEditorEmbed).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPath(WhiteLabelLogoTypeEnum.DocsEditorEmbed, !inDto.IsRetina)) }
{ ((int)WhiteLabelLogoTypeEnum.DocsEditorEmbed).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPath(WhiteLabelLogoTypeEnum.DocsEditorEmbed, !inDto.IsRetina)) },
{ ((int)WhiteLabelLogoTypeEnum.LeftMenu).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPath(WhiteLabelLogoTypeEnum.LeftMenu, !inDto.IsRetina)) },
{ ((int)WhiteLabelLogoTypeEnum.AboutPage).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPath(WhiteLabelLogoTypeEnum.AboutPage, !inDto.IsRetina)) }
};
}
else
@ -230,7 +230,9 @@ public class WhitelabelController : BaseSettingsController
{ ((int)WhiteLabelLogoTypeEnum.Dark).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(_tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.Dark, !inDto.IsRetina)) },
{ ((int)WhiteLabelLogoTypeEnum.Favicon).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(_tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.Favicon, !inDto.IsRetina)) },
{ ((int)WhiteLabelLogoTypeEnum.DocsEditor).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(_tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.DocsEditor, !inDto.IsRetina)) },
{ ((int)WhiteLabelLogoTypeEnum.DocsEditorEmbed).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(_tenantWhiteLabelSettings,WhiteLabelLogoTypeEnum.DocsEditorEmbed, !inDto.IsRetina)) }
{ ((int)WhiteLabelLogoTypeEnum.DocsEditorEmbed).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(_tenantWhiteLabelSettings,WhiteLabelLogoTypeEnum.DocsEditorEmbed, !inDto.IsRetina)) },
{ ((int)WhiteLabelLogoTypeEnum.LeftMenu).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(_tenantWhiteLabelSettings,WhiteLabelLogoTypeEnum.LeftMenu, !inDto.IsRetina)) },
{ ((int)WhiteLabelLogoTypeEnum.AboutPage).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(_tenantWhiteLabelSettings,WhiteLabelLogoTypeEnum.AboutPage, !inDto.IsRetina)) }
};
}
@ -320,32 +322,33 @@ public class WhitelabelController : BaseSettingsController
if (companyWhiteLabelSettingsWrapper.Settings == null)
{
throw new ArgumentNullException("settings");
}
}
DemandRebrandingPermission();
companyWhiteLabelSettingsWrapper.Settings.IsLicensor = false;
_settingsManager.SaveForDefaultTenant(companyWhiteLabelSettingsWrapper.Settings);
DemandRebrandingPermission();
companyWhiteLabelSettingsWrapper.Settings.IsLicensor = false; //TODO: CoreContext.TenantManager.GetTenantQuota(TenantProvider.CurrentTenantID).Branding && settings.IsLicensor
_settingsManager.SaveForDefaultTenant(companyWhiteLabelSettingsWrapper.Settings);
return true;
}
///<visible>false</visible>
[HttpGet("rebranding/company")]
public CompanyWhiteLabelSettings GetCompanyWhiteLabelSettings()
{
{
return _settingsManager.LoadForDefaultTenant<CompanyWhiteLabelSettings>();
}
///<visible>false</visible>
[HttpDelete("rebranding/company")]
public CompanyWhiteLabelSettings DeleteCompanyWhiteLabelSettings()
{
DemandRebrandingPermission();
var defaultSettings = _settingsManager.GetDefault<CompanyWhiteLabelSettings>();
_settingsManager.SaveForDefaultTenant(defaultSettings);
{
DemandRebrandingPermission();
var defaultSettings = _settingsManager.GetDefault<CompanyWhiteLabelSettings>();
_settingsManager.SaveForDefaultTenant(defaultSettings);
return defaultSettings;
}
@ -357,30 +360,31 @@ public class WhitelabelController : BaseSettingsController
if (wrapper.Settings == null)
{
throw new ArgumentNullException("settings");
}
}
DemandRebrandingPermission();
_settingsManager.SaveForDefaultTenant(wrapper.Settings);
DemandRebrandingPermission();
_settingsManager.SaveForDefaultTenant(wrapper.Settings);
return true;
}
///<visible>false</visible>
[HttpGet("rebranding/additional")]
public AdditionalWhiteLabelSettings GetAdditionalWhiteLabelSettings()
{
{
return _settingsManager.LoadForDefaultTenant<AdditionalWhiteLabelSettings>();
}
///<visible>false</visible>
[HttpDelete("rebranding/additional")]
public AdditionalWhiteLabelSettings DeleteAdditionalWhiteLabelSettings()
{
DemandRebrandingPermission();
var defaultSettings = _settingsManager.GetDefault<AdditionalWhiteLabelSettings>();
_settingsManager.SaveForDefaultTenant(defaultSettings);
{
DemandRebrandingPermission();
var defaultSettings = _settingsManager.GetDefault<AdditionalWhiteLabelSettings>();
_settingsManager.SaveForDefaultTenant(defaultSettings);
return defaultSettings;
}
@ -453,14 +457,9 @@ public class WhitelabelController : BaseSettingsController
}
private void DemandRebrandingPermission()
{
{
_tenantExtra.DemandControlPanelPermission();
if (!_coreBaseSettings.Standalone)
{
throw new BillingException(Resource.ErrorNotAllowedOption, "SSBranding");
}
if (_coreBaseSettings.CustomMode)
{
throw new SecurityException();

3
web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
View File

@ -40,7 +40,8 @@ public class SettingsDto
public bool? EnabledJoin { get; set; }
public bool? EnableAdmMess { get; set; }
public bool? ThirdpartyEnable { get; set; }
public bool Personal { get; set; }
public bool Personal { get; set; }
public bool DocSpace { get; set; }
public string WizardToken { get; set; }
public PasswordHasher PasswordHash { get; set; }
public FirebaseDto Firebase { get; set; }

5
web/ASC.Web.Client/public/images/left_menu_general.svg Normal file
View File

@ -0,0 +1,5 @@
<svg width="56" height="54" viewBox="0 0 56 54" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M24.5775 52.6067L1.47594 41.7982C-0.491979 40.8546 -0.491979 39.3964 1.47594 38.5385L9.51872 34.7642L24.492 41.7982C26.4599 42.7418 29.6257 42.7418 31.508 41.7982L46.4813 34.7642L54.5241 38.5385C56.492 39.4821 56.492 40.9404 54.5241 41.7982L31.4225 52.6067C29.6257 53.4645 26.4599 53.4645 24.5775 52.6067Z" fill="#FF6F3D"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M24.5027 39.2315L1.47144 28.4105C-0.49048 27.4658 -0.49048 26.0058 1.47144 25.147L9.31912 21.4541L24.5027 28.5822C26.4646 29.5269 29.6207 29.5269 31.4973 28.5822L46.6809 21.4541L54.5286 25.147C56.4905 26.0917 56.4905 27.5517 54.5286 28.4105L31.4973 39.2315C29.5354 40.1762 26.3793 40.1762 24.5027 39.2315Z" fill="#95C038"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M24.5027 25.9954L1.47144 15.3301C-0.49048 14.399 -0.49048 12.9601 1.47144 12.1136L24.5027 1.44832C26.4646 0.517226 29.6207 0.517226 31.4973 1.44832L54.5286 12.1136C56.4905 13.0447 56.4905 14.4837 54.5286 15.3301L31.4973 25.9954C29.5354 26.8419 26.3793 26.8419 24.5027 25.9954Z" fill="#5DC0E8"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

6
web/ASC.Web.Client/public/images/logo/about_doc_space.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 9.4 KiB

5
web/ASC.Web.Client/public/images/logo/left_menu_general.svg Normal file
View File

@ -0,0 +1,5 @@
<svg width="56" height="54" viewBox="0 0 56 54" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M24.5775 52.6067L1.47594 41.7982C-0.491979 40.8546 -0.491979 39.3964 1.47594 38.5385L9.51872 34.7642L24.492 41.7982C26.4599 42.7418 29.6257 42.7418 31.508 41.7982L46.4813 34.7642L54.5241 38.5385C56.492 39.4821 56.492 40.9404 54.5241 41.7982L31.4225 52.6067C29.6257 53.4645 26.4599 53.4645 24.5775 52.6067Z" fill="#FF6F3D"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M24.5027 39.2315L1.47144 28.4105C-0.49048 27.4658 -0.49048 26.0058 1.47144 25.147L9.31912 21.4541L24.5027 28.5822C26.4646 29.5269 29.6207 29.5269 31.4973 28.5822L46.6809 21.4541L54.5286 25.147C56.4905 26.0917 56.4905 27.5517 54.5286 28.4105L31.4973 39.2315C29.5354 40.1762 26.3793 40.1762 24.5027 39.2315Z" fill="#95C038"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M24.5027 25.9954L1.47144 15.3301C-0.49048 14.399 -0.49048 12.9601 1.47144 12.1136L24.5027 1.44832C26.4646 0.517226 29.6207 0.517226 31.4973 1.44832L54.5286 12.1136C56.4905 13.0447 56.4905 14.4837 54.5286 15.3301L31.4973 25.9954C29.5354 26.8419 26.3793 26.8419 24.5027 25.9954Z" fill="#5DC0E8"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

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

@ -60,6 +60,16 @@ public class TenantWhiteLabelSettings : ISettings<TenantWhiteLabelSettings>
[JsonPropertyName("DefaultLogoDocsEditorEmbed")]
internal bool IsDefaultLogoDocsEditorEmbed { get; set; }
internal string LogoLeftMenuExt { get; set; }
[JsonPropertyName("DefaultLogoLeftMenu")]
internal bool IsDefaultLogoLeftMenu { get; set; }
internal string LogoAboutPageExt { get; set; }
[JsonPropertyName("DefaultLogoAboutPage")]
internal bool IsDefaultLogoAboutPage { get; set; }
public string LogoText { get; set; }
public string GetLogoText(SettingsManager settingsManager)
@ -82,11 +92,13 @@ public class TenantWhiteLabelSettings : ISettings<TenantWhiteLabelSettings>
#region Logo available sizes
public static readonly Size LogoLightSmallSize = new Size(284, 46);
public static readonly Size LogoDarkSize = new Size(432, 70);
public static readonly Size LogoLightSmallSize = new Size(422, 48);
public static readonly Size LogoDarkSize = new Size(810, 92);
public static readonly Size LogoFaviconSize = new Size(32, 32);
public static readonly Size LogoDocsEditorSize = new Size(172, 40);
public static readonly Size LogoDocsEditorEmbedSize = new Size(172, 40);
public static readonly Size LogoLeftMenuSize = new Size(56, 56);
public static readonly Size LogoAboutPageSize = new Size(810, 92);
#endregion
@ -101,12 +113,16 @@ public class TenantWhiteLabelSettings : ISettings<TenantWhiteLabelSettings>
LogoFaviconExt = null,
LogoDocsEditorExt = null,
LogoDocsEditorEmbedExt = null,
LogoLeftMenuExt = null,
LogoAboutPageExt = null,
IsDefaultLogoLightSmall = true,
IsDefaultLogoDark = true,
IsDefaultLogoFavicon = true,
IsDefaultLogoDocsEditor = true,
IsDefaultLogoDocsEditorEmbed = true,
IsDefaultLogoLeftMenu = true,
IsDefaultLogoAboutPage = true,
LogoText = null
};
@ -129,6 +145,8 @@ public class TenantWhiteLabelSettings : ISettings<TenantWhiteLabelSettings>
WhiteLabelLogoTypeEnum.Favicon => IsDefaultLogoFavicon,
WhiteLabelLogoTypeEnum.DocsEditor => IsDefaultLogoDocsEditor,
WhiteLabelLogoTypeEnum.DocsEditorEmbed => IsDefaultLogoDocsEditorEmbed,
WhiteLabelLogoTypeEnum.LeftMenu => IsDefaultLogoLeftMenu,
WhiteLabelLogoTypeEnum.AboutPage => IsDefaultLogoAboutPage,
_ => true,
};
}
@ -152,6 +170,12 @@ public class TenantWhiteLabelSettings : ISettings<TenantWhiteLabelSettings>
case WhiteLabelLogoTypeEnum.DocsEditorEmbed:
IsDefaultLogoDocsEditorEmbed = value;
break;
case WhiteLabelLogoTypeEnum.LeftMenu:
IsDefaultLogoLeftMenu = value;
break;
case WhiteLabelLogoTypeEnum.AboutPage:
IsDefaultLogoAboutPage = value;
break;
}
}
@ -164,6 +188,8 @@ public class TenantWhiteLabelSettings : ISettings<TenantWhiteLabelSettings>
WhiteLabelLogoTypeEnum.Favicon => LogoFaviconExt,
WhiteLabelLogoTypeEnum.DocsEditor => LogoDocsEditorExt,
WhiteLabelLogoTypeEnum.DocsEditorEmbed => LogoDocsEditorEmbedExt,
WhiteLabelLogoTypeEnum.LeftMenu => LogoLeftMenuExt,
WhiteLabelLogoTypeEnum.AboutPage => LogoAboutPageExt,
_ => "",
};
}
@ -187,6 +213,12 @@ public class TenantWhiteLabelSettings : ISettings<TenantWhiteLabelSettings>
case WhiteLabelLogoTypeEnum.DocsEditorEmbed:
LogoDocsEditorEmbedExt = fileExt;
break;
case WhiteLabelLogoTypeEnum.LeftMenu:
LogoLeftMenuExt = fileExt;
break;
case WhiteLabelLogoTypeEnum.AboutPage:
LogoAboutPageExt = fileExt;
break;
}
}
@ -235,12 +267,16 @@ public class TenantWhiteLabelSettingsHelper
tenantWhiteLabelSettings.LogoFaviconExt == defaultSettings.LogoFaviconExt &&
tenantWhiteLabelSettings.LogoDocsEditorExt == defaultSettings.LogoDocsEditorExt &&
tenantWhiteLabelSettings.LogoDocsEditorEmbedExt == defaultSettings.LogoDocsEditorEmbedExt &&
tenantWhiteLabelSettings.LogoLeftMenuExt == defaultSettings.LogoLeftMenuExt &&
tenantWhiteLabelSettings.LogoAboutPageExt == defaultSettings.LogoAboutPageExt &&
tenantWhiteLabelSettings.IsDefaultLogoLightSmall == defaultSettings.IsDefaultLogoLightSmall &&
tenantWhiteLabelSettings.IsDefaultLogoDark == defaultSettings.IsDefaultLogoDark &&
tenantWhiteLabelSettings.IsDefaultLogoFavicon == defaultSettings.IsDefaultLogoFavicon &&
tenantWhiteLabelSettings.IsDefaultLogoDocsEditor == defaultSettings.IsDefaultLogoDocsEditor &&
tenantWhiteLabelSettings.IsDefaultLogoDocsEditorEmbed == defaultSettings.IsDefaultLogoDocsEditorEmbed &&
tenantWhiteLabelSettings.IsDefaultLogoLeftMenu == defaultSettings.IsDefaultLogoLeftMenu &&
tenantWhiteLabelSettings.IsDefaultLogoAboutPage == defaultSettings.IsDefaultLogoAboutPage &&
tenantWhiteLabelSettings.LogoText == defaultSettings.LogoText;
}
@ -252,12 +288,16 @@ public class TenantWhiteLabelSettingsHelper
tenantWhiteLabelSettings.LogoFaviconExt = null;
tenantWhiteLabelSettings.LogoDocsEditorExt = null;
tenantWhiteLabelSettings.LogoDocsEditorEmbedExt = null;
tenantWhiteLabelSettings.LogoLeftMenuExt = null;
tenantWhiteLabelSettings.LogoAboutPageExt = null;
tenantWhiteLabelSettings.IsDefaultLogoLightSmall = true;
tenantWhiteLabelSettings.IsDefaultLogoDark = true;
tenantWhiteLabelSettings.IsDefaultLogoFavicon = true;
tenantWhiteLabelSettings.IsDefaultLogoDocsEditor = true;
tenantWhiteLabelSettings.IsDefaultLogoDocsEditorEmbed = true;
tenantWhiteLabelSettings.IsDefaultLogoLeftMenu = true;
tenantWhiteLabelSettings.IsDefaultLogoAboutPage = true;
tenantWhiteLabelSettings.SetLogoText(null);
@ -430,7 +470,9 @@ public class TenantWhiteLabelSettingsHelper
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.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"),
_ => "",
};
}
@ -534,6 +576,12 @@ public class TenantWhiteLabelSettingsHelper
WhiteLabelLogoTypeEnum.DocsEditorEmbed => new Size(
general ? TenantWhiteLabelSettings.LogoDocsEditorEmbedSize.Width / 2 : TenantWhiteLabelSettings.LogoDocsEditorEmbedSize.Width,
general ? TenantWhiteLabelSettings.LogoDocsEditorEmbedSize.Height / 2 : TenantWhiteLabelSettings.LogoDocsEditorEmbedSize.Height),
WhiteLabelLogoTypeEnum.LeftMenu => new Size(
general ? TenantWhiteLabelSettings.LogoLeftMenuSize.Width / 2 : TenantWhiteLabelSettings.LogoLeftMenuSize.Width,
general ? TenantWhiteLabelSettings.LogoLeftMenuSize.Height / 2 : TenantWhiteLabelSettings.LogoLeftMenuSize.Height),
WhiteLabelLogoTypeEnum.AboutPage => new Size(
general ? TenantWhiteLabelSettings.LogoAboutPageSize.Width / 2 : TenantWhiteLabelSettings.LogoAboutPageSize.Width,
general ? TenantWhiteLabelSettings.LogoAboutPageSize.Height / 2 : TenantWhiteLabelSettings.LogoAboutPageSize.Height),
_ => new Size(0, 0),
};
}

4
web/ASC.Web.Core/WhiteLabel/WhiteLabelLogoTypeEnum.cs
View File

@ -32,5 +32,7 @@ public enum WhiteLabelLogoTypeEnum
Dark = 2,
Favicon = 3,
DocsEditor = 4,
DocsEditorEmbed = 5
DocsEditorEmbed = 5,
LeftMenu = 6,
AboutPage = 7
}