Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Update icon display in client (#2159)

Leendert de Borstdd484e9d0f7b
diff --git a/apps/server/AliasVault.Client/Main/Components/Items/ItemIcon.razor b/apps/server/AliasVault.Client/Main/Components/Items/ItemIcon.razor
index 9930c8a42..f3be73c9b 100644
--- a/apps/server/AliasVault.Client/Main/Components/Items/ItemIcon.razor
+++ b/apps/server/AliasVault.Client/Main/Components/Items/ItemIcon.razor
@@ -38,7 +38,7 @@ else
/// <summary>
/// Gets or sets the pre-computed data URI for the logo, used directly as the &lt;img src&gt; value.
- /// Callers with raw bytes should run them through <see cref="LogoConverter.ToDataUri"/> first.
+ /// Callers with a logo row should run it through <see cref="LogoConverter.ToDataUri(Logo?)"/> first.
/// </summary>
[Parameter]
public string? LogoDataUri { get; set; }
diff --git a/apps/server/AliasVault.Client/Main/Components/Widgets/SearchWidget.razor b/apps/server/AliasVault.Client/Main/Components/Widgets/SearchWidget.razor
index cfe29808c..08c45429f 100644
--- a/apps/server/AliasVault.Client/Main/Components/Widgets/SearchWidget.razor
+++ b/apps/server/AliasVault.Client/Main/Components/Widgets/SearchWidget.razor
@@ -71,7 +71,7 @@
@onclick="() => SelectResult(result)">
<ItemIcon
ItemType="@result.ItemType"
- LogoDataUri="@LogoConverter.ToDataUri(result.Logo?.FileData)"
+ LogoDataUri="@LogoConverter.ToDataUri(result.Logo)"
CardNumber="@ItemService.GetFieldValue(result, FieldKey.CardNumber)"
AltText="@(result.Name ?? string.Empty)"
SizeClass="w-6 h-6" />
diff --git a/apps/server/AliasVault.Client/Main/Pages/Items/RecentlyDeleted.razor b/apps/server/AliasVault.Client/Main/Pages/Items/RecentlyDeleted.razor
index 655aa0bde..6b2a2967c 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Items/RecentlyDeleted.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Items/RecentlyDeleted.razor
@@ -66,7 +66,7 @@ else
<div class="flex items-center gap-2">
<ItemIcon
ItemType="@(item.ItemType ?? ItemType.Login)"
- LogoDataUri="@LogoConverter.ToDataUri(item.Logo?.FileData)"
+ LogoDataUri="@LogoConverter.ToDataUri(item.Logo)"
CardNumber="@ItemService.GetFieldValue(item, FieldKey.CardNumber)"
SizeClass="w-6 h-6" />
<span data-item-name class="font-medium text-gray-900 dark:text-white truncate">
diff --git a/apps/server/AliasVault.Client/Main/Pages/Items/View.razor b/apps/server/AliasVault.Client/Main/Pages/Items/View.razor
index 5365e77c3..e3d2c85ce 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Items/View.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Items/View.razor
@@ -43,7 +43,7 @@ else
<div class="items-center flex space-x-4">
<ItemIcon
ItemType="@(Item.ItemType ?? ItemType.Login)"
- LogoDataUri="@LogoConverter.ToDataUri(Item.Logo?.FileData)"
+ LogoDataUri="@LogoConverter.ToDataUri(Item.Logo)"
CardNumber="@GetCardNumber()"
AltText="@(Item.Name ?? "Item")"
SizeClass="w-14 h-14" />
diff --git a/apps/server/AliasVault.Client/Main/Utilities/LogoConverter.cs b/apps/server/AliasVault.Client/Main/Utilities/LogoConverter.cs
index e7ffbef80..2f767b085 100644
--- a/apps/server/AliasVault.Client/Main/Utilities/LogoConverter.cs
+++ b/apps/server/AliasVault.Client/Main/Utilities/LogoConverter.cs
@@ -9,12 +9,35 @@ namespace AliasVault.Client.Main.Utilities;
using System;
using System.Text;
+using AliasClientDb;
+using AliasClientDb.Models;
/// <summary>
-/// Converts raw logo bytes into a data URI suitable for use as an img src value.
+/// Converts an item's logo into a data URI suitable for use as an img src value.
/// </summary>
public static class LogoConverter
{
+ /// <summary>
+ /// Converts a logo row into a data URI: a built-in logo is drawn from the shared catalog, any other from its bytes.
+ /// </summary>
+ /// <param name="logo">The logo row, or null when the item has none.</param>
+ /// <returns>A data URI string, or null when there is nothing to draw.</returns>
+ public static string? ToDataUri(Logo? logo)
+ {
+ if (logo is null)
+ {
+ return null;
+ }
+
+ if (logo.Kind == Logo.KindBuiltin)
+ {
+ var svg = AppIcons.GetSvg(logo.Source);
+ return svg is null ? null : $"data:image/svg+xml;base64,{Convert.ToBase64String(Encoding.UTF8.GetBytes(svg))}";
+ }
+
+ return ToDataUri(logo.FileData);
+ }
+
/// <summary>
/// Converts the given logo bytes into a data URI. Returns null for null/empty input.
/// </summary>
diff --git a/apps/server/AliasVault.Client/Services/ItemService.cs b/apps/server/AliasVault.Client/Services/ItemService.cs
index 6500a09cf..23b75828f 100644
--- a/apps/server/AliasVault.Client/Services/ItemService.cs
+++ b/apps/server/AliasVault.Client/Services/ItemService.cs
@@ -542,7 +542,7 @@ public sealed class ItemService(HttpClient httpClient, DbService dbService, Conf
{
Id = x.Id,
ItemType = x.ItemType ?? AliasClientDb.Models.ItemType.Login,
- LogoDataUri = LogoConverter.ToDataUri(x.Logo?.FileData),
+ LogoDataUri = LogoConverter.ToDataUri(x.Logo),
Service = x.Name,
Username = GetFieldValue(x, FieldKey.LoginUsername),
Email = GetFieldValue(x, FieldKey.LoginEmail),