nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-06 05:28:15 -05:00
Code

formats

Browse Source
This commit is contained in:
Kyle Spearrin 2017-10-09 14:34:44 -04:00
parent c88f4064f1
commit 309c7f81ba
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Icons/Controllers/IconsController.cs
View File

@ -28,8 +28,16 @@ namespace Bit.Icons.Controllers
}
[HttpGet("")]
public async Task<IActionResult> Get([FromQuery]string domain, [FromQuery]string size = "16..24..200")
public async Task<IActionResult> Get(
[FromQuery]string domain,
[FromQuery]string size = "16..24..200",
[FromQuery]string formats = null)
{
if(string.IsNullOrWhiteSpace(domain))
{
return new BadRequestResult();
}
if(!domain.StartsWith("http://") || !domain.StartsWith("https://"))
{
domain = "http://" + domain;
@ -41,12 +49,12 @@ namespace Bit.Icons.Controllers
}
var mappedDomain = _domainMappingService.MapDomain(uri.Host);
var cacheKey = $"{mappedDomain}_{size}";
var cacheKey = $"{mappedDomain}_{size}_{formats}";
var icon = await _memoryCache.GetOrCreateAsync(cacheKey, async entry =>
{
entry.AbsoluteExpiration = DateTime.UtcNow.AddHours(_iconsSettings.CacheHours);
var iconUrl = $"{_iconsSettings.BestIconBaseUrl}/icon?url={mappedDomain}&size={size}";
var iconUrl = $"{_iconsSettings.BestIconBaseUrl}/icon?url={mappedDomain}&size={size}&formats={formats}";
var response = await _httpClient.GetAsync(iconUrl);
if(!response.IsSuccessStatusCode)
{