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

dark whitelabel

Browse Source
This commit is contained in:
Anton Suhorukov 2022-11-09 16:30:56 +03:00
parent 58e745b59f
commit d733880485
8 changed files with 203 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
View File

@ -195,7 +195,7 @@ public class NotifyHelper
{ {
args.Add(new TagValue(CommonTags.VirtualRootPath, url)); args.Add(new TagValue(CommonTags.VirtualRootPath, url));
args.Add(new TagValue(CommonTags.ProfileUrl, url + _commonLinkUtility.GetMyStaff())); args.Add(new TagValue(CommonTags.ProfileUrl, url + _commonLinkUtility.GetMyStaff()));
args.Add(new TagValue(CommonTags.LetterLogo, _tenantLogoManager.GetLogoDark(true))); args.Add(new TagValue(CommonTags.LetterLogo, _tenantLogoManager.GetLogoDark(true, false)));
} }
return args; return args;

2
products/ASC.Files/Core/Services/DocumentService/Configuration.cs
View File

@ -617,7 +617,7 @@ public class CustomerConfig<T>
public string Address => _settingsManager.LoadForDefaultTenant<CompanyWhiteLabelSettings>().Address; public string Address => _settingsManager.LoadForDefaultTenant<CompanyWhiteLabelSettings>().Address;
public string Logo => _baseCommonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPath(WhiteLabelLogoTypeEnum.Dark, !_configuration.EditorConfig.Customization.IsRetina)); public string Logo => _baseCommonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPath(WhiteLabelLogoTypeEnum.Dark, !_configuration.EditorConfig.Customization.IsRetina, false));
public string Mail => _settingsManager.LoadForDefaultTenant<CompanyWhiteLabelSettings>().Email; public string Mail => _settingsManager.LoadForDefaultTenant<CompanyWhiteLabelSettings>().Email;

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

@ -80,11 +80,11 @@ public class WhitelabelController : BaseSettingsController
if (inDto.Logo != null) if (inDto.Logo != null)
{ {
var logoDict = new Dictionary<int, string>(); var logoDict = new Dictionary<int, KeyValuePair<string, string>>();
foreach (var l in inDto.Logo) foreach (var l in inDto.Logo)
{ {
logoDict.Add(Int32.Parse(l.Key), l.Value); logoDict.Add(Int32.Parse(l.Key), new KeyValuePair<string, string>(l.Value.Light, l.Value.Dark));
} }
_tenantWhiteLabelSettingsHelper.SetLogo(settings, logoDict, null); _tenantWhiteLabelSettingsHelper.SetLogo(settings, logoDict, null);
@ -112,16 +112,42 @@ public class WhitelabelController : BaseSettingsController
var settings = _settingsManager.Load<TenantWhiteLabelSettings>(); var settings = _settingsManager.Load<TenantWhiteLabelSettings>();
foreach (var f in HttpContext.Request.Form.Files) foreach (var f in HttpContext.Request.Form.Files)
{ {
var parts = f.FileName.Split('.'); if (f.FileName.Contains("dark"))
var logoType = (WhiteLabelLogoTypeEnum)Convert.ToInt32(parts[0]); {
var fileExt = parts[1]; GetParts(f.FileName, out var logoType, out var fileExt);
_tenantWhiteLabelSettingsHelper.SetLogoFromStream(settings, logoType, fileExt, f.OpenReadStream(), null); if (HttpContext.Request.Form.Files.Any(f => f.FileName == $"{logoType}.{fileExt}"))
{
continue;
}
_tenantWhiteLabelSettingsHelper.SetLogoFromStream(settings, logoType, fileExt, null, f.OpenReadStream(), null);
}
else
{
GetParts(f.FileName, out var logoType, out var fileExt);
IFormFile darkFile;
if (HttpContext.Request.Form.Files.Any(f => f.FileName == $"{logoType}.dark.{fileExt}"))
{
darkFile = HttpContext.Request.Form.Files.Single(f => f.FileName == $"{logoType}.dark.{fileExt}");
}
else
{
darkFile = null;
}
_tenantWhiteLabelSettingsHelper.SetLogoFromStream(settings, logoType, fileExt, f.OpenReadStream(), darkFile?.OpenReadStream(), null);
}
} }
_settingsManager.SaveForTenant(settings, Tenant.Id); _settingsManager.SaveForTenant(settings, Tenant.Id);
return true; return true;
}
private void GetParts(string fileName, out WhiteLabelLogoTypeEnum logoType, out string fileExt)
{
var parts = fileName.Split('.');
logoType = (WhiteLabelLogoTypeEnum)Convert.ToInt32(parts[0]);
fileExt = parts.Last();
} }
///<visible>false</visible> ///<visible>false</visible>
@ -157,13 +183,13 @@ public class WhitelabelController : BaseSettingsController
result = new Dictionary<string, string> result = new Dictionary<string, string>
{ {
{ ((int)WhiteLabelLogoTypeEnum.LightSmall).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(_tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.LightSmall, !inDto.IsRetina)) }, { ((int)WhiteLabelLogoTypeEnum.LightSmall).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(_tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.LightSmall, !inDto.IsRetina, inDto.IsDark)) },
{ ((int)WhiteLabelLogoTypeEnum.Dark).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(_tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.Dark, !inDto.IsRetina)) }, { ((int)WhiteLabelLogoTypeEnum.Dark).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(_tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.Dark, !inDto.IsRetina, inDto.IsDark)) },
{ ((int)WhiteLabelLogoTypeEnum.Favicon).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(_tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.Favicon, !inDto.IsRetina)) }, { ((int)WhiteLabelLogoTypeEnum.Favicon).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(_tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.Favicon, !inDto.IsRetina, inDto.IsDark)) },
{ ((int)WhiteLabelLogoTypeEnum.DocsEditor).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(_tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.DocsEditor, !inDto.IsRetina)) }, { ((int)WhiteLabelLogoTypeEnum.DocsEditor).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(_tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.DocsEditor, !inDto.IsRetina, inDto.IsDark)) },
{ ((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, inDto.IsDark)) },
{ ((int)WhiteLabelLogoTypeEnum.LeftMenu).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(_tenantWhiteLabelSettings,WhiteLabelLogoTypeEnum.LeftMenu, !inDto.IsRetina)) }, { ((int)WhiteLabelLogoTypeEnum.LeftMenu).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(_tenantWhiteLabelSettings,WhiteLabelLogoTypeEnum.LeftMenu, !inDto.IsRetina, inDto.IsDark)) },
{ ((int)WhiteLabelLogoTypeEnum.AboutPage).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(_tenantWhiteLabelSettings,WhiteLabelLogoTypeEnum.AboutPage, !inDto.IsRetina)) } { ((int)WhiteLabelLogoTypeEnum.AboutPage).ToString(), _commonLinkUtility.GetFullAbsolutePath(_tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(_tenantWhiteLabelSettings,WhiteLabelLogoTypeEnum.AboutPage, !inDto.IsRetina, inDto.IsDark)) }
}; };
return result; return result;

9
web/ASC.Web.Api/ApiModels/RequestsDto/WhiteLabelRequestsDto.cs
View File

@ -29,11 +29,18 @@ namespace ASC.Web.Api.ApiModel.RequestsDto;
public class WhiteLabelRequestsDto public class WhiteLabelRequestsDto
{ {
public string LogoText { get; set; } public string LogoText { get; set; }
public IEnumerable<ItemKeyValuePair<string, string>> Logo { get; set; } public IEnumerable<ItemKeyValuePair<string, LogoDto>> Logo { get; set; }
}
public class LogoDto
{
public string Light { get; set; }
public string Dark { get; set; }
} }
public class WhiteLabelQueryRequestsDto public class WhiteLabelQueryRequestsDto
{ {
public bool IsDefault { get; set; } public bool IsDefault { get; set; }
public bool IsRetina { get; set; } public bool IsRetina { get; set; }
public bool IsDark { get; set; }
} }

2
web/ASC.Web.Core/Notify/NotifyConfiguration.cs
View File

@ -404,7 +404,7 @@ public class NotifyTransferRequest : INotifyEngineAction
} }
} }
var logoUrl = _commonLinkUtility.GetFullAbsolutePath(_tenantLogoManager.GetLogoDark(true)); var logoUrl = _commonLinkUtility.GetFullAbsolutePath(_tenantLogoManager.GetLogoDark(true, false));
request.Arguments.Add(new TagValue(CommonTags.LetterLogo, logoUrl)); request.Arguments.Add(new TagValue(CommonTags.LetterLogo, logoUrl));
} }

8
web/ASC.Web.Core/Utility/TenantLogoHelper.cs
View File

@ -46,19 +46,19 @@ public class TenantLogoHelper
_tenantInfoSettingsHelper = tenantInfoSettingsHelper; _tenantInfoSettingsHelper = tenantInfoSettingsHelper;
} }
public string GetLogo(WhiteLabelLogoTypeEnum type, bool general = true, bool isDefIfNoWhiteLabel = false) public string GetLogo(WhiteLabelLogoTypeEnum type, bool general = true, bool isDefIfNoWhiteLabel = false, bool dark = false)
{ {
string imgUrl; string imgUrl;
if (_tenantLogoManager.WhiteLabelEnabled) if (_tenantLogoManager.WhiteLabelEnabled)
{ {
var _tenantWhiteLabelSettings = _settingsManager.Load<TenantWhiteLabelSettings>(); var _tenantWhiteLabelSettings = _settingsManager.Load<TenantWhiteLabelSettings>();
return _tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(_tenantWhiteLabelSettings, type, general); return _tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(_tenantWhiteLabelSettings, type, general, dark);
} }
else else
{ {
if (isDefIfNoWhiteLabel) if (isDefIfNoWhiteLabel)
{ {
imgUrl = _tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPath(type, general); imgUrl = _tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPath(type, general, dark);
} }
else else
{ {
@ -71,7 +71,7 @@ public class TenantLogoHelper
} }
else else
{ {
imgUrl = _tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPath(type, general); imgUrl = _tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPath(type, general, dark);
} }
} }
} }

28
web/ASC.Web.Core/WhiteLabel/TenantLogoManager.cs
View File

@ -61,13 +61,13 @@ public class TenantLogoManager
_cacheNotify = cacheNotify; _cacheNotify = cacheNotify;
} }
public string GetFavicon(bool general, bool timeParam) public string GetFavicon(bool general, bool timeParam, bool dark)
{ {
string faviconPath; string faviconPath;
var tenantWhiteLabelSettings = _settingsManager.Load<TenantWhiteLabelSettings>(); var tenantWhiteLabelSettings = _settingsManager.Load<TenantWhiteLabelSettings>();
if (WhiteLabelEnabled) if (WhiteLabelEnabled)
{ {
faviconPath = _tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.Favicon, general); faviconPath = _tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.Favicon, general, dark);
if (timeParam) if (timeParam)
{ {
var now = DateTime.Now; var now = DateTime.Now;
@ -76,29 +76,29 @@ public class TenantLogoManager
} }
else else
{ {
faviconPath = _tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPath(WhiteLabelLogoTypeEnum.Favicon, general); faviconPath = _tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPath(WhiteLabelLogoTypeEnum.Favicon, general, dark);
} }
return faviconPath; return faviconPath;
} }
public string GetTopLogo(bool general)//LogoLightSmall public string GetTopLogo(bool general, bool dark)//LogoLightSmall
{ {
var tenantWhiteLabelSettings = _settingsManager.Load<TenantWhiteLabelSettings>(); var tenantWhiteLabelSettings = _settingsManager.Load<TenantWhiteLabelSettings>();
if (WhiteLabelEnabled) if (WhiteLabelEnabled)
{ {
return _tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.LightSmall, general); return _tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.LightSmall, general, dark);
} }
return _tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPath(WhiteLabelLogoTypeEnum.LightSmall, general); return _tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPath(WhiteLabelLogoTypeEnum.LightSmall, general, dark);
} }
public string GetLogoDark(bool general) public string GetLogoDark(bool general, bool dark)
{ {
if (WhiteLabelEnabled) if (WhiteLabelEnabled)
{ {
var tenantWhiteLabelSettings = _settingsManager.Load<TenantWhiteLabelSettings>(); var tenantWhiteLabelSettings = _settingsManager.Load<TenantWhiteLabelSettings>();
return _tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.Dark, general); return _tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.Dark, general, dark);
} }
/*** simple scheme ***/ /*** simple scheme ***/
@ -106,26 +106,26 @@ public class TenantLogoManager
/***/ /***/
} }
public string GetLogoDocsEditor(bool general) public string GetLogoDocsEditor(bool general, bool dark)
{ {
var tenantWhiteLabelSettings = _settingsManager.Load<TenantWhiteLabelSettings>(); var tenantWhiteLabelSettings = _settingsManager.Load<TenantWhiteLabelSettings>();
if (WhiteLabelEnabled) if (WhiteLabelEnabled)
{ {
return _tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.DocsEditor, general); return _tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.DocsEditor, general, dark);
} }
return _tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPath(WhiteLabelLogoTypeEnum.DocsEditor, general); return _tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPath(WhiteLabelLogoTypeEnum.DocsEditor, general, dark);
} }
public string GetLogoDocsEditorEmbed(bool general) public string GetLogoDocsEditorEmbed(bool general, bool dark)
{ {
var tenantWhiteLabelSettings = _settingsManager.Load<TenantWhiteLabelSettings>(); var tenantWhiteLabelSettings = _settingsManager.Load<TenantWhiteLabelSettings>();
if (WhiteLabelEnabled) if (WhiteLabelEnabled)
{ {
return _tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.DocsEditorEmbed, general); return _tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPath(tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.DocsEditorEmbed, general, dark);
} }
return _tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPath(WhiteLabelLogoTypeEnum.DocsEditorEmbed, general); return _tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPath(WhiteLabelLogoTypeEnum.DocsEditorEmbed, general, dark);
} }

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

@ -324,7 +324,8 @@ public class TenantWhiteLabelSettingsHelper
{ {
tenantWhiteLabelSettings.SetIsDefault(type, true); tenantWhiteLabelSettings.SetIsDefault(type, true);
var store = _storageFactory.GetStorage(_tenantManager.GetCurrentTenant().Id, ModuleName); var store = _storageFactory.GetStorage(_tenantManager.GetCurrentTenant().Id, ModuleName);
DeleteLogoFromStore(tenantWhiteLabelSettings, store, type); DeleteLogoFromStore(tenantWhiteLabelSettings, store, type, false);
DeleteLogoFromStore(tenantWhiteLabelSettings, store, type, true);
} }
catch (Exception e) catch (Exception e)
{ {
@ -337,7 +338,7 @@ public class TenantWhiteLabelSettingsHelper
#region Set logo #region Set logo
public void SetLogo(TenantWhiteLabelSettings tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum type, string logoFileExt, byte[] data, IDataStore storage = null) public void SetLogo(TenantWhiteLabelSettings tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum type, string logoFileExt, byte[] data, bool dark, IDataStore storage = null)
{ {
var store = storage ?? _storageFactory.GetStorage(_tenantManager.GetCurrentTenant().Id, ModuleName); var store = storage ?? _storageFactory.GetStorage(_tenantManager.GetCurrentTenant().Id, ModuleName);
@ -349,7 +350,7 @@ public class TenantWhiteLabelSettingsHelper
{ {
try try
{ {
DeleteLogoFromStore(tenantWhiteLabelSettings, store, type); DeleteLogoFromStore(tenantWhiteLabelSettings, store, type, dark);
} }
catch (Exception e) catch (Exception e)
{ {
@ -361,73 +362,134 @@ public class TenantWhiteLabelSettingsHelper
using (var memory = new MemoryStream(data)) using (var memory = new MemoryStream(data))
using (var image = Image.Load(memory)) using (var image = Image.Load(memory))
{ {
var logoFileName = BuildLogoFileName(type, logoFileExt, false); var logoFileName = BuildLogoFileName(type, logoFileExt, false, dark);
memory.Seek(0, SeekOrigin.Begin); memory.Seek(0, SeekOrigin.Begin);
store.SaveAsync(logoFileName, memory).Wait(); store.SaveAsync(logoFileName, memory).Wait();
} }
tenantWhiteLabelSettings.SetExt(type, logoFileExt);
tenantWhiteLabelSettings.SetIsDefault(type, false);
var generalSize = GetSize(type, true); var generalSize = GetSize(type, true);
var generalFileName = BuildLogoFileName(type, logoFileExt, true); var generalFileName = BuildLogoFileName(type, logoFileExt, true, dark);
ResizeLogo(generalFileName, data, -1, generalSize, store); ResizeLogo(generalFileName, data, -1, generalSize, store);
} }
public void SetLogo(TenantWhiteLabelSettings tenantWhiteLabelSettings, Dictionary<int, string> logo, IDataStore storage = null) public void SetLogo(TenantWhiteLabelSettings tenantWhiteLabelSettings, Dictionary<int, KeyValuePair<string, string>> logo, IDataStore storage = null)
{ {
var xStart = @"data:image/png;base64,";
foreach (var currentLogo in logo) foreach (var currentLogo in logo)
{ {
var currentLogoType = (WhiteLabelLogoTypeEnum)currentLogo.Key; var currentLogoType = (WhiteLabelLogoTypeEnum)currentLogo.Key;
var currentLogoPath = currentLogo.Value;
if (!string.IsNullOrEmpty(currentLogoPath)) var lightData = GetLogoData(currentLogo.Value.Key, out var extLight);
var darkData = GetLogoData(currentLogo.Value.Value, out var extDark);
if(lightData == null && darkData == null)
{ {
var fileExt = "png"; return;
byte[] data; }
if (!currentLogoPath.StartsWith(xStart))
{
var fileName = Path.GetFileName(currentLogoPath);
fileExt = fileName.Split('.').Last();
data = _userPhotoManager.GetTempPhotoData(fileName);
try
{
_userPhotoManager.RemoveTempPhoto(fileName);
}
catch (Exception ex)
{
_log.ErrorSetLogo(ex);
}
}
else
{
var xB64 = currentLogoPath.Substring(xStart.Length); // Get the Base64 string
data = Convert.FromBase64String(xB64); // Convert the Base64 string to binary data
}
if (data != null) if (tenantWhiteLabelSettings.GetIsDefault(currentLogoType)) {
if (lightData == null)
{ {
SetLogo(tenantWhiteLabelSettings, currentLogoType, fileExt, data, storage); lightData = darkData;
}
if (darkData == null)
{
darkData = lightData;
} }
} }
tenantWhiteLabelSettings.SetExt(currentLogoType, extLight);
tenantWhiteLabelSettings.SetIsDefault(currentLogoType, false);
if (lightData!= null)
{
SetLogo(tenantWhiteLabelSettings, currentLogoType, extLight, lightData, false, storage);
}
if(darkData != null)
{
SetLogo(tenantWhiteLabelSettings, currentLogoType, extDark, darkData, true, storage);
}
} }
} }
public void SetLogoFromStream(TenantWhiteLabelSettings tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum type, string fileExt, Stream fileStream, IDataStore storage = null) private byte[] GetLogoData(string logo, out string ext)
{ {
byte[] data; var xStart = @"data:image/png;base64,";
ext = "png";
if (!string.IsNullOrEmpty(logo))
{
byte[] data;
if (!logo.StartsWith(xStart))
{
var fileName = Path.GetFileName(logo);
ext = fileName.Split('.').Last();
data = _userPhotoManager.GetTempPhotoData(fileName);
try
{
_userPhotoManager.RemoveTempPhoto(fileName);
}
catch (Exception ex)
{
_log.ErrorSetLogo(ex);
}
}
else
{
var xB64 = logo.Substring(xStart.Length); // Get the Base64 string
data = Convert.FromBase64String(xB64); // Convert the Base64 string to binary data
}
return data;
}
else
{
return null;
}
}
public void SetLogoFromStream(TenantWhiteLabelSettings tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum type, string fileExt, Stream fileStream, Stream fileDarkStream, IDataStore storage = null)
{
byte[] lightData;
using (var memoryStream = new MemoryStream()) using (var memoryStream = new MemoryStream())
{ {
fileStream.CopyTo(memoryStream); fileStream.CopyTo(memoryStream);
data = memoryStream.ToArray(); lightData = memoryStream.ToArray();
} }
if (data != null) byte[] darkData;
using (var memoryStream = new MemoryStream())
{ {
SetLogo(tenantWhiteLabelSettings, type, fileExt, data, storage); fileStream.CopyTo(fileDarkStream);
darkData = memoryStream.ToArray();
}
if (lightData == null && darkData == null)
{
return;
}
if (tenantWhiteLabelSettings.GetIsDefault(type))
{
if (lightData == null)
{
lightData = darkData;
}
if (darkData == null)
{
darkData = lightData;
}
}
tenantWhiteLabelSettings.SetExt(type, fileExt);
tenantWhiteLabelSettings.SetIsDefault(type, false);
if (lightData != null)
{
SetLogo(tenantWhiteLabelSettings, type, fileExt, lightData, false, storage);
}
if (darkData != null)
{
SetLogo(tenantWhiteLabelSettings, type, fileExt, darkData, true, storage);
} }
} }
@ -435,50 +497,52 @@ public class TenantWhiteLabelSettingsHelper
#region Get logo path #region Get logo path
public string GetAbsoluteLogoPath(TenantWhiteLabelSettings tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum type, bool general = true) public string GetAbsoluteLogoPath(TenantWhiteLabelSettings tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum type, bool general = true, bool dark = false)
{ {
if (tenantWhiteLabelSettings.GetIsDefault(type)) if (tenantWhiteLabelSettings.GetIsDefault(type))
{ {
return GetAbsoluteDefaultLogoPath(type, general); return GetAbsoluteDefaultLogoPath(type, general, dark);
} }
return GetAbsoluteStorageLogoPath(tenantWhiteLabelSettings, type, general); return GetAbsoluteStorageLogoPath(tenantWhiteLabelSettings, type, general, dark);
} }
private string GetAbsoluteStorageLogoPath(TenantWhiteLabelSettings tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum type, bool general) private string GetAbsoluteStorageLogoPath(TenantWhiteLabelSettings tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum type, bool general, bool dark)
{ {
var store = _storageFactory.GetStorage(_tenantManager.GetCurrentTenant().Id, ModuleName); var store = _storageFactory.GetStorage(_tenantManager.GetCurrentTenant().Id, ModuleName);
var fileName = BuildLogoFileName(type, tenantWhiteLabelSettings.GetExt(type), general); var fileName = BuildLogoFileName(type, tenantWhiteLabelSettings.GetExt(type), general, dark);
if (store.IsFileAsync(fileName).Result) if (store.IsFileAsync(fileName).Result)
{ {
return store.GetUriAsync(fileName).Result.ToString(); return store.GetUriAsync(fileName).Result.ToString();
} }
return GetAbsoluteDefaultLogoPath(type, general); return GetAbsoluteDefaultLogoPath(type, general, dark);
} }
public string GetAbsoluteDefaultLogoPath(WhiteLabelLogoTypeEnum type, bool general) public string GetAbsoluteDefaultLogoPath(WhiteLabelLogoTypeEnum type, bool general, bool dark)
{ {
var partnerLogoPath = GetPartnerStorageLogoPath(type, general); var partnerLogoPath = GetPartnerStorageLogoPath(type, general, dark);
if (!string.IsNullOrEmpty(partnerLogoPath)) if (!string.IsNullOrEmpty(partnerLogoPath))
{ {
return partnerLogoPath; return partnerLogoPath;
} }
var generalStr = general ? "_general" : "";
var darkStr = dark ? "_dark" : "";
return type switch return type switch
{ {
WhiteLabelLogoTypeEnum.LightSmall => _webImageSupplier.GetAbsoluteWebPath("logo/light_small_doc_space.svg"), WhiteLabelLogoTypeEnum.LightSmall => _webImageSupplier.GetAbsoluteWebPath("logo/light_small_doc_space.svg"),
WhiteLabelLogoTypeEnum.Dark => _webImageSupplier.GetAbsoluteWebPath("logo/dark_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.DocsEditor => _webImageSupplier.GetAbsoluteWebPath($"logo/editor_logo{generalStr}{darkStr}.png"),
WhiteLabelLogoTypeEnum.DocsEditorEmbed => general ? _webImageSupplier.GetAbsoluteWebPath("logo/editor_logo_embed_general.png") : _webImageSupplier.GetAbsoluteWebPath("logo/editor_logo_embed.png"), WhiteLabelLogoTypeEnum.DocsEditorEmbed => _webImageSupplier.GetAbsoluteWebPath($"logo/editor_logo_embed{generalStr}{darkStr}.png"),
WhiteLabelLogoTypeEnum.Favicon => general ? _webImageSupplier.GetAbsoluteWebPath("logo/favicon_general.ico") : _webImageSupplier.GetAbsoluteWebPath("logo/favicon.ico"), WhiteLabelLogoTypeEnum.Favicon => _webImageSupplier.GetAbsoluteWebPath($"logo/favicon{generalStr}{darkStr}.ico"),
WhiteLabelLogoTypeEnum.LeftMenu => _webImageSupplier.GetAbsoluteWebPath("logo/left_menu_general.svg"), WhiteLabelLogoTypeEnum.LeftMenu => _webImageSupplier.GetAbsoluteWebPath($"logo/left_menu{generalStr}{darkStr}.svg"),
WhiteLabelLogoTypeEnum.AboutPage => _webImageSupplier.GetAbsoluteWebPath("logo/about_doc_space.svg"), WhiteLabelLogoTypeEnum.AboutPage => _webImageSupplier.GetAbsoluteWebPath("logo/about_doc_space.svg"),
_ => "", _ => "",
}; };
} }
private string GetPartnerStorageLogoPath(WhiteLabelLogoTypeEnum type, bool general) private string GetPartnerStorageLogoPath(WhiteLabelLogoTypeEnum type, bool general, bool dark)
{ {
var partnerSettings = _settingsManager.LoadForDefaultTenant<TenantWhiteLabelSettings>(); var partnerSettings = _settingsManager.LoadForDefaultTenant<TenantWhiteLabelSettings>();
@ -494,7 +558,7 @@ public class TenantWhiteLabelSettingsHelper
return null; return null;
} }
var logoPath = BuildLogoFileName(type, partnerSettings.GetExt(type), general); var logoPath = BuildLogoFileName(type, partnerSettings.GetExt(type), general, dark);
return partnerStorage.IsFileAsync(logoPath).Result ? partnerStorage.GetUriAsync(logoPath).Result.ToString() : null; return partnerStorage.IsFileAsync(logoPath).Result ? partnerStorage.GetUriAsync(logoPath).Result.ToString() : null;
} }
@ -506,17 +570,17 @@ public class TenantWhiteLabelSettingsHelper
/// <summary> /// <summary>
/// Get logo stream or null in case of default whitelabel /// Get logo stream or null in case of default whitelabel
/// </summary> /// </summary>
public Stream GetWhitelabelLogoData(TenantWhiteLabelSettings tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum type, bool general) public Stream GetWhitelabelLogoData(TenantWhiteLabelSettings tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum type, bool general, bool dark = false)
{ {
if (tenantWhiteLabelSettings.GetIsDefault(type)) if (tenantWhiteLabelSettings.GetIsDefault(type))
{ {
return GetPartnerStorageLogoData(type, general); return GetPartnerStorageLogoData(type, general, dark);
} }
return GetStorageLogoData(tenantWhiteLabelSettings, type, general); return GetStorageLogoData(tenantWhiteLabelSettings, type, general, dark);
} }
private Stream GetStorageLogoData(TenantWhiteLabelSettings tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum type, bool general) private Stream GetStorageLogoData(TenantWhiteLabelSettings tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum type, bool general, bool dark)
{ {
var storage = _storageFactory.GetStorage(_tenantManager.GetCurrentTenant().Id, ModuleName); var storage = _storageFactory.GetStorage(_tenantManager.GetCurrentTenant().Id, ModuleName);
@ -525,12 +589,12 @@ public class TenantWhiteLabelSettingsHelper
return null; return null;
} }
var fileName = BuildLogoFileName(type, tenantWhiteLabelSettings.GetExt(type), general); var fileName = BuildLogoFileName(type, tenantWhiteLabelSettings.GetExt(type), general, dark);
return storage.IsFileAsync(fileName).Result ? storage.GetReadStreamAsync(fileName).Result : null; return storage.IsFileAsync(fileName).Result ? storage.GetReadStreamAsync(fileName).Result : null;
} }
private Stream GetPartnerStorageLogoData(WhiteLabelLogoTypeEnum type, bool general) private Stream GetPartnerStorageLogoData(WhiteLabelLogoTypeEnum type, bool general, bool dark)
{ {
var partnerSettings = _settingsManager.LoadForDefaultTenant<TenantWhiteLabelSettings>(); var partnerSettings = _settingsManager.LoadForDefaultTenant<TenantWhiteLabelSettings>();
@ -546,16 +610,16 @@ public class TenantWhiteLabelSettingsHelper
return null; return null;
} }
var fileName = BuildLogoFileName(type, partnerSettings.GetExt(type), general); var fileName = BuildLogoFileName(type, partnerSettings.GetExt(type), general, dark);
return partnerStorage.IsFileAsync(fileName).Result ? partnerStorage.GetReadStreamAsync(fileName).Result : null; return partnerStorage.IsFileAsync(fileName).Result ? partnerStorage.GetReadStreamAsync(fileName).Result : null;
} }
#endregion #endregion
public static string BuildLogoFileName(WhiteLabelLogoTypeEnum type, string fileExt, bool general) public static string BuildLogoFileName(WhiteLabelLogoTypeEnum type, string fileExt, bool general, bool dark)
{ {
return $"logo_{type.ToString().ToLowerInvariant()}{(general ? "_general" : "")}.{fileExt}"; return $"logo_{type.ToString().ToLowerInvariant()}{(general ? "_general" : "")}{(dark ? "_dark" : "")}.{fileExt}";
} }
public static Size GetSize(WhiteLabelLogoTypeEnum type, bool general) public static Size GetSize(WhiteLabelLogoTypeEnum type, bool general)
@ -679,16 +743,17 @@ public class TenantWhiteLabelSettingsHelper
#region Delete from Store #region Delete from Store
private void DeleteLogoFromStore(TenantWhiteLabelSettings tenantWhiteLabelSettings, IDataStore store, WhiteLabelLogoTypeEnum type) private void DeleteLogoFromStore(TenantWhiteLabelSettings tenantWhiteLabelSettings, IDataStore store, WhiteLabelLogoTypeEnum type, bool dark)
{ {
DeleteLogoFromStoreByGeneral(tenantWhiteLabelSettings, store, type, false);
DeleteLogoFromStoreByGeneral(tenantWhiteLabelSettings, store, type, true); DeleteLogoFromStoreByGeneral(tenantWhiteLabelSettings, store, type, false, dark);
DeleteLogoFromStoreByGeneral(tenantWhiteLabelSettings, store, type, true, dark);
} }
private void DeleteLogoFromStoreByGeneral(TenantWhiteLabelSettings tenantWhiteLabelSettings, IDataStore store, WhiteLabelLogoTypeEnum type, bool general) private void DeleteLogoFromStoreByGeneral(TenantWhiteLabelSettings tenantWhiteLabelSettings, IDataStore store, WhiteLabelLogoTypeEnum type, bool general, bool dark)
{ {
var fileExt = tenantWhiteLabelSettings.GetExt(type); var fileExt = tenantWhiteLabelSettings.GetExt(type);
var logo = BuildLogoFileName(type, fileExt, general); var logo = BuildLogoFileName(type, fileExt, general, dark);
if (store.IsFileAsync(logo).Result) if (store.IsFileAsync(logo).Result)
{ {
store.DeleteAsync(logo).Wait(); store.DeleteAsync(logo).Wait();