Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/logohandler culture param #469

Merged
merged 1 commit into from
Aug 12, 2024
Merged

Feature/logohandler culture param #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions web/ASC.Web.Core/LogoHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,21 @@
throw new ArgumentException("dark");
}

var culture = context.Request.Query["culture"].FirstOrDefault();

string path;

if (isDefault)
{
path = await tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPathAsync(logoType, dark);
path = await tenantWhiteLabelSettingsHelper.GetAbsoluteDefaultLogoPathAsync(logoType, dark, culture);
}
else
{
var tenantWhiteLabelSettings = await settingsManager.LoadAsync<TenantWhiteLabelSettings>();
path = await tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPathAsync(tenantWhiteLabelSettings, logoType, dark);
path = await tenantWhiteLabelSettingsHelper.GetAbsoluteLogoPathAsync(tenantWhiteLabelSettings, logoType, dark, culture);
}

context.Response.Redirect(commonLinkUtility.GetFullAbsolutePath(path));

Check warning

Code scanning / CodeQL

URL redirection from remote source Medium

Untrusted URL redirection due to
user-provided value
Loading
.
}
}

Expand Down
28 changes: 13 additions & 15 deletions web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,17 +584,17 @@ private byte[] GetData(Stream stream)

#region Get logo path

public async Task<string> GetAbsoluteLogoPathAsync(TenantWhiteLabelSettings tenantWhiteLabelSettings, WhiteLabelLogoType type, bool dark = false)
public async Task<string> GetAbsoluteLogoPathAsync(TenantWhiteLabelSettings tenantWhiteLabelSettings, WhiteLabelLogoType type, bool dark = false, string culture = default)
{
if (tenantWhiteLabelSettings.GetIsDefault(type))
{
return await GetAbsoluteDefaultLogoPathAsync(type, dark);
return await GetAbsoluteDefaultLogoPathAsync(type, dark, culture);
}

return await GetAbsoluteStorageLogoPath(tenantWhiteLabelSettings, type, dark);
return await GetAbsoluteStorageLogoPath(tenantWhiteLabelSettings, type, dark, culture);
}

private async Task<string> GetAbsoluteStorageLogoPath(TenantWhiteLabelSettings tenantWhiteLabelSettings, WhiteLabelLogoType type, bool dark)
private async Task<string> GetAbsoluteStorageLogoPath(TenantWhiteLabelSettings tenantWhiteLabelSettings, WhiteLabelLogoType type, bool dark, string culture = default)
{
var store = await storageFactory.GetStorageAsync(await tenantManager.GetCurrentTenantIdAsync(), ModuleName);
var fileName = BuildLogoFileName(type, tenantWhiteLabelSettings.GetExt(type, dark), dark);
Expand All @@ -603,10 +603,10 @@ private async Task<string> GetAbsoluteStorageLogoPath(TenantWhiteLabelSettings t
{
return await store.GetUrlWithHashAsync(string.Empty, fileName);
}
return await GetAbsoluteDefaultLogoPathAsync(type, dark);
return await GetAbsoluteDefaultLogoPathAsync(type, dark, culture);
}

public async Task<string> GetAbsoluteDefaultLogoPathAsync(WhiteLabelLogoType type, bool dark)
public async Task<string> GetAbsoluteDefaultLogoPathAsync(WhiteLabelLogoType type, bool dark, string culture = default)
{
var partnerLogoPath = await GetPartnerStorageLogoPathAsync(type, dark);
if (!string.IsNullOrEmpty(partnerLogoPath))
Expand All @@ -621,7 +621,7 @@ public async Task<string> GetAbsoluteDefaultLogoPathAsync(WhiteLabelLogoType typ
_ => "svg"
};

var regionalPath = await GetCustomRegionalPath();
var regionalPath = await GetCustomRegionalPath(culture);

var path = type switch
{
Expand Down Expand Up @@ -659,7 +659,7 @@ private async Task<string> GetPartnerStorageLogoPathAsync(WhiteLabelLogoType typ
return (await partnerStorage.IsFileAsync(logoPath)) ? (await partnerStorage.GetUrlWithHashAsync(string.Empty, logoPath)) : null;
}

private async Task<string> GetCustomRegionalPath()
private async Task<string> GetCustomRegionalPath(string culture)
{
var customCultures = configuration.GetSection("web:logo:custom-cultures").Get<string[]>() ?? [];

Expand All @@ -668,19 +668,17 @@ private async Task<string> GetCustomRegionalPath()
return string.Empty;
}

var language = string.Empty;

if (authContext.IsAuthenticated)
if (string.IsNullOrEmpty(culture) && authContext.IsAuthenticated)
{
language = (await userManager.GetUsersAsync(authContext.CurrentAccount.ID)).CultureName;
culture = (await userManager.GetUsersAsync(authContext.CurrentAccount.ID)).CultureName;
}

if (string.IsNullOrEmpty(language))
if (string.IsNullOrEmpty(culture))
{
language = (await tenantManager.GetCurrentTenantAsync()).Language;
culture = (await tenantManager.GetCurrentTenantAsync()).Language;
}

return customCultures.Contains(language, StringComparer.InvariantCultureIgnoreCase) ? $"{language.ToLower()}/" : string.Empty;
return customCultures.Contains(culture, StringComparer.InvariantCultureIgnoreCase) ? $"{culture.ToLower()}/" : string.Empty;
}

#endregion
Expand Down
Loading