Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Add generic username display component to admin app (#1986)
Leendert de Borst871235d4ab3f
diff --git a/apps/server/AliasVault.Admin/Main/Components/Users/UserNameDisplay.razor b/apps/server/AliasVault.Admin/Main/Components/Users/UserNameDisplay.razornew file mode 100644index 000000000..f9ac31e52--- /dev/null+++ b/apps/server/AliasVault.Admin/Main/Components/Users/UserNameDisplay.razor@@ -0,0 +1,59 @@+@inherits ComponentBase++@if (User is null || string.IsNullOrEmpty(User.UserName))+{+ <span class="line-clamp-1 italic text-gray-500 dark:text-gray-400">@EmptyText</span>+}+else+{+ <div class="inline-flex items-center gap-2">+ @if (RenderAsLink)+ {+ <a href="users/@User.UserId" class="line-clamp-1">@User.UserName</a>+ }+ else if (!string.IsNullOrEmpty(User.UserId))+ {+ <span class="line-clamp-1">@User.UserName</span>+ }+ else+ {+ <span class="line-clamp-1 italic">@User.UserName</span>+ }+ @if (User.Blocked)+ {+ <StatusPill Enabled="false" TextFalse="Blocked" />+ }+ @if (User.IsInactive)+ {+ <StatusPill Enabled="false" TextFalse="Inactive" />+ }+ @if (User.TwoFactorEnabled)+ {+ <StatusPill Enabled="true" TextTrue="2FA" />+ }+ </div>+}++@code {+ /// <summary>+ /// Gets or sets the user information to display. When the user (or its UserName) is null+ /// the <see cref="EmptyText"/> fallback is rendered.+ /// </summary>+ [Parameter]+ public UserDisplay? User { get; set; }++ /// <summary>+ /// Gets or sets a value indicating whether the username should render as a link to the user+ /// edit page when a UserId is available. Defaults to true.+ /// </summary>+ [Parameter]+ public bool AsLink { get; set; } = true;++ /// <summary>+ /// Gets or sets the text to show when there is no user (or no username).+ /// </summary>+ [Parameter]+ public string EmptyText { get; set; } = "n/a";++ private bool RenderAsLink => AsLink && !string.IsNullOrEmpty(User?.UserId);+}diff --git a/apps/server/AliasVault.Admin/Main/Models/RecentUsageAliases.cs b/apps/server/AliasVault.Admin/Main/Models/RecentUsageAliases.csindex 86326e253..c271eb527 100644--- a/apps/server/AliasVault.Admin/Main/Models/RecentUsageAliases.cs+++ b/apps/server/AliasVault.Admin/Main/Models/RecentUsageAliases.cs@@ -13,25 +13,15 @@ namespace AliasVault.Admin.Main.Models;public class RecentUsageAliases{/// <summary>- /// Gets or sets the user ID.+ /// Gets or sets the user display info (id, username, status badges)./// </summary>- public string UserId { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets the username.- /// </summary>- public string Username { get; set; } = string.Empty;+ public UserDisplay User { get; set; } = new();/// <summary>/// Gets or sets the number of aliases created in the last 72 hours./// </summary>public int AliasCount72h { get; set; }- /// <summary>- /// Gets or sets a value indicating whether the account is disabled/blocked.- /// </summary>- public bool IsDisabled { get; set; }-/// <summary>/// Gets or sets the date when the user registered their account./// </summary>diff --git a/apps/server/AliasVault.Admin/Main/Models/RecentUsageEmails.cs b/apps/server/AliasVault.Admin/Main/Models/RecentUsageEmails.csindex 11219bea6..cdc701abb 100644--- a/apps/server/AliasVault.Admin/Main/Models/RecentUsageEmails.cs+++ b/apps/server/AliasVault.Admin/Main/Models/RecentUsageEmails.cs@@ -13,25 +13,15 @@ namespace AliasVault.Admin.Main.Models;public class RecentUsageEmails{/// <summary>- /// Gets or sets the user ID.+ /// Gets or sets the user display info (id, username, status badges)./// </summary>- public string UserId { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets the username.- /// </summary>- public string Username { get; set; } = string.Empty;+ public UserDisplay User { get; set; } = new();/// <summary>/// Gets or sets the number of emails received in the last 72 hours./// </summary>public int EmailCount72h { get; set; }- /// <summary>- /// Gets or sets a value indicating whether the account is disabled/blocked.- /// </summary>- public bool IsDisabled { get; set; }-/// <summary>/// Gets or sets the date when the user registered their account./// </summary>diff --git a/apps/server/AliasVault.Admin/Main/Models/TopUserByAliases.cs b/apps/server/AliasVault.Admin/Main/Models/TopUserByAliases.csindex 9434f057e..b56720091 100644--- a/apps/server/AliasVault.Admin/Main/Models/TopUserByAliases.cs+++ b/apps/server/AliasVault.Admin/Main/Models/TopUserByAliases.cs@@ -13,14 +13,9 @@ namespace AliasVault.Admin.Main.Models;public class TopUserByAliases{/// <summary>- /// Gets or sets the user ID.+ /// Gets or sets the user display info (id, username, status badges)./// </summary>- public string UserId { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets the username.- /// </summary>- public string Username { get; set; } = string.Empty;+ public UserDisplay User { get; set; } = new();/// <summary>/// Gets or sets the number of aliases.diff --git a/apps/server/AliasVault.Admin/Main/Models/TopUserByCredentials.cs b/apps/server/AliasVault.Admin/Main/Models/TopUserByCredentials.csindex d53b05ee3..aa3958689 100644--- a/apps/server/AliasVault.Admin/Main/Models/TopUserByCredentials.cs+++ b/apps/server/AliasVault.Admin/Main/Models/TopUserByCredentials.cs@@ -13,14 +13,9 @@ namespace AliasVault.Admin.Main.Models;public class TopUserByCredentials{/// <summary>- /// Gets or sets the user ID.+ /// Gets or sets the user display info (id, username, status badges)./// </summary>- public string UserId { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets the username.- /// </summary>- public string Username { get; set; } = string.Empty;+ public UserDisplay User { get; set; } = new();/// <summary>/// Gets or sets the number of credentials.diff --git a/apps/server/AliasVault.Admin/Main/Models/TopUserByEmails.cs b/apps/server/AliasVault.Admin/Main/Models/TopUserByEmails.csindex 86547be5b..000304332 100644--- a/apps/server/AliasVault.Admin/Main/Models/TopUserByEmails.cs+++ b/apps/server/AliasVault.Admin/Main/Models/TopUserByEmails.cs@@ -13,14 +13,9 @@ namespace AliasVault.Admin.Main.Models;public class TopUserByEmails{/// <summary>- /// Gets or sets the user ID.+ /// Gets or sets the user display info (id, username, status badges)./// </summary>- public string UserId { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets the username.- /// </summary>- public string Username { get; set; } = string.Empty;+ public UserDisplay User { get; set; } = new();/// <summary>/// Gets or sets the number of emails.diff --git a/apps/server/AliasVault.Admin/Main/Models/TopUserByStorage.cs b/apps/server/AliasVault.Admin/Main/Models/TopUserByStorage.csindex baad6a100..d2280a8c5 100644--- a/apps/server/AliasVault.Admin/Main/Models/TopUserByStorage.cs+++ b/apps/server/AliasVault.Admin/Main/Models/TopUserByStorage.cs@@ -13,14 +13,9 @@ namespace AliasVault.Admin.Main.Models;public class TopUserByStorage{/// <summary>- /// Gets or sets the user ID.+ /// Gets or sets the user display info (id, username, status badges)./// </summary>- public string UserId { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets the username.- /// </summary>- public string Username { get; set; } = string.Empty;+ public UserDisplay User { get; set; } = new();/// <summary>/// Gets or sets the storage size in bytes.diff --git a/apps/server/AliasVault.Admin/Main/Models/UserDisplay.cs b/apps/server/AliasVault.Admin/Main/Models/UserDisplay.csnew file mode 100644index 000000000..edde678eb--- /dev/null+++ b/apps/server/AliasVault.Admin/Main/Models/UserDisplay.cs@@ -0,0 +1,40 @@+//-----------------------------------------------------------------------+// <copyright file="UserDisplay.cs" company="aliasvault">+// Copyright (c) aliasvault. All rights reserved.+// Licensed under the AGPLv3 license. See LICENSE.md file in the project root for full license information.+// </copyright>+//-----------------------------------------------------------------------++namespace AliasVault.Admin.Main.Models;++/// <summary>+/// Minimal user information used to render a username with status badges.+/// Designed to be projected from EF queries without pulling navigation properties.+/// </summary>+public class UserDisplay+{+ /// <summary>+ /// Gets or sets the user ID. When null/empty the username is rendered as plain text instead of a link.+ /// </summary>+ public string? UserId { get; set; }++ /// <summary>+ /// Gets or sets the username.+ /// </summary>+ public string? UserName { get; set; }++ /// <summary>+ /// Gets or sets a value indicating whether the user is blocked.+ /// </summary>+ public bool Blocked { get; set; }++ /// <summary>+ /// Gets or sets a value indicating whether the user is considered inactive.+ /// </summary>+ public bool IsInactive { get; set; }++ /// <summary>+ /// Gets or sets a value indicating whether the user has two-factor authentication enabled.+ /// </summary>+ public bool TwoFactorEnabled { get; set; }+}diff --git a/apps/server/AliasVault.Admin/Main/Models/UserViewModel.cs b/apps/server/AliasVault.Admin/Main/Models/UserViewModel.csindex 86aafb868..3c7b1c3fd 100644--- a/apps/server/AliasVault.Admin/Main/Models/UserViewModel.cs+++ b/apps/server/AliasVault.Admin/Main/Models/UserViewModel.cs@@ -18,24 +18,14 @@ public class UserViewModelpublic string Id { get; set; } = string.Empty;/// <summary>- /// Gets or sets the CreatedAt timestamp.+ /// Gets or sets the user display info (username + status badges)./// </summary>- public DateTime CreatedAt { get; set; }+ public UserDisplay User { get; set; } = new();/// <summary>- /// Gets or sets the user name.- /// </summary>- public string UserName { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets a value indicating whether the user has two-factor authentication enabled.- /// </summary>- public bool TwoFactorEnabled { get; set; }-- /// <summary>- /// Gets or sets a value indicating whether the user is blocked.+ /// Gets or sets the CreatedAt timestamp./// </summary>- public bool Blocked { get; set; }+ public DateTime CreatedAt { get; set; }/// <summary>/// Gets or sets the vault count.@@ -66,9 +56,4 @@ public class UserViewModel/// Gets or sets the last activity date of the user./// </summary>public DateTime? LastActivityDate { get; set; }-- /// <summary>- /// Gets or sets a value indicating whether the user is considered inactive.- /// </summary>- public bool IsInactive { get; set; }}diff --git a/apps/server/AliasVault.Admin/Main/Pages/Dashboard/AllTimeStats.razor b/apps/server/AliasVault.Admin/Main/Pages/Dashboard/AllTimeStats.razorindex 78c2efc86..00b46eefc 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Dashboard/AllTimeStats.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Dashboard/AllTimeStats.razor@@ -109,9 +109,7 @@<tr class="hover:bg-gray-50 dark:hover:bg-gray-700"><td class="px-2 py-4 whitespace-nowrap text-sm text-gray-500 dark:text-gray-400 text-center w-12">@storageIndex</td><td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-900 dark:text-gray-100">- <a href="users/@user.UserId" class="text-gray-900 dark:text-gray-100 hover:text-blue-600 dark:hover:text-blue-400 cursor-pointer">- @user.Username- </a>+ <UserNameDisplay User="@user.User" /></td><td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500 dark:text-gray-400 text-right w-32">@user.StorageDisplaySize</td></tr>@@ -151,9 +149,7 @@<tr class="hover:bg-gray-50 dark:hover:bg-gray-700"><td class="px-2 py-4 whitespace-nowrap text-sm text-gray-500 dark:text-gray-400 text-center w-12">@credentialIndex</td><td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-900 dark:text-gray-100">- <a href="users/@user.UserId" class="text-gray-900 dark:text-gray-100 hover:text-blue-600 dark:hover:text-blue-400 cursor-pointer">- @user.Username- </a>+ <UserNameDisplay User="@user.User" /></td><td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500 dark:text-gray-400 text-right w-24">@user.CredentialCount.ToString("N0")</td></tr>@@ -192,9 +188,7 @@<tr class="hover:bg-gray-50 dark:hover:bg-gray-700"><td class="px-2 py-4 whitespace-nowrap text-sm text-gray-500 dark:text-gray-400 text-center w-12">@aliasIndex</td><td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-900 dark:text-gray-100">- <a href="users/@user.UserId" class="text-gray-900 dark:text-gray-100 hover:text-blue-600 dark:hover:text-blue-400 cursor-pointer">- @user.Username- </a>+ <UserNameDisplay User="@user.User" /></td><td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500 dark:text-gray-400 text-right w-24">@user.AliasCount.ToString("N0")</td></tr>@@ -233,9 +227,7 @@<tr class="hover:bg-gray-50 dark:hover:bg-gray-700"><td class="px-2 py-4 whitespace-nowrap text-sm text-gray-500 dark:text-gray-400 text-center w-12">@emailIndex</td><td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-900 dark:text-gray-100">- <a href="users/@user.UserId" class="text-gray-900 dark:text-gray-100 hover:text-blue-600 dark:hover:text-blue-400 cursor-pointer">- @user.Username- </a>+ <UserNameDisplay User="@user.User" /></td><td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500 dark:text-gray-400 text-right w-24">@user.EmailCount.ToString("N0")</td></tr>diff --git a/apps/server/AliasVault.Admin/Main/Pages/Dashboard/RecentUsage/Components/RecentUsageAliasesTable.razor b/apps/server/AliasVault.Admin/Main/Pages/Dashboard/RecentUsage/Components/RecentUsageAliasesTable.razorindex cf2c6c8e1..97d4e119e 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Dashboard/RecentUsage/Components/RecentUsageAliasesTable.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Dashboard/RecentUsage/Components/RecentUsageAliasesTable.razor@@ -20,15 +20,7 @@{<SortableTableRow><SortableTableColumn IsPrimary="true">- <a href="users/@user.UserId" class="text-gray-900 dark:text-gray-100 hover:text-blue-600 dark:hover:text-blue-400 cursor-pointer">- @user.Username- </a>- @if (user.IsDisabled)- {- <span class="ml-2 inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-200">- Blocked- </span>- }+ <UserNameDisplay User="@user.User" /></SortableTableColumn><SortableTableColumn>@user.AliasCount72h.ToString("N0")</SortableTableColumn><SortableTableColumn>@StatisticsService.GetAccountAge(user.RegistrationDate)</SortableTableColumn>diff --git a/apps/server/AliasVault.Admin/Main/Pages/Dashboard/RecentUsage/Components/RecentUsageEmailsTable.razor b/apps/server/AliasVault.Admin/Main/Pages/Dashboard/RecentUsage/Components/RecentUsageEmailsTable.razorindex b642f80db..279c8d51c 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Dashboard/RecentUsage/Components/RecentUsageEmailsTable.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Dashboard/RecentUsage/Components/RecentUsageEmailsTable.razor@@ -21,15 +21,7 @@{<SortableTableRow><SortableTableColumn IsPrimary="true">- <a href="users/@user.UserId" class="text-gray-900 dark:text-gray-100 hover:text-blue-600 dark:hover:text-blue-400 cursor-pointer">- @user.Username- </a>- @if (user.IsDisabled)- {- <span class="ml-2 inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-200">- Blocked- </span>- }+ <UserNameDisplay User="@user.User" /></SortableTableColumn><SortableTableColumn>@user.EmailCount72h.ToString("N0")</SortableTableColumn><SortableTableColumn>@StatisticsService.GetAccountAge(user.RegistrationDate)</SortableTableColumn>diff --git a/apps/server/AliasVault.Admin/Main/Pages/Emails.razor b/apps/server/AliasVault.Admin/Main/Pages/Emails.razorindex 62d88a171..f32bc65e8 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Emails.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Emails.razor@@ -48,14 +48,7 @@ else<SortableTableColumn>@(viewModel.Email.FromLocal.Length > 10 ? viewModel.Email.FromLocal.Substring(0, 10) : viewModel.Email.FromLocal)@@@(viewModel.Email.FromDomain.Length > 10 ? viewModel.Email.FromDomain.Substring(0, 10) : viewModel.Email.FromDomain)</SortableTableColumn><SortableTableColumn>@viewModel.Email.ToLocal@@@viewModel.Email.ToDomain</SortableTableColumn><SortableTableColumn>- @if (viewModel.UserName.Length > 0)- {- <span class="line-clamp-1"><a href="users/@viewModel.UserId">@viewModel.UserName</a></span>- }- else- {- <span class="line-clamp-1">n/a</span>- }+ <UserNameDisplay User="@viewModel.User" /></SortableTableColumn><SortableTableColumn>@viewModel.Email.Attachments.Count</SortableTableColumn></SortableTableRow>@@ -176,7 +169,7 @@ elsevar encryptionKeyIds = emailList.Select(x => x.UserEncryptionKeyId).Distinct().ToList();var encryptionKeyUsernames = await dbContext.UserEncryptionKeys.Where(x => encryptionKeyIds.Contains(x.Id))- .Join(dbContext.AliasVaultUsers, x => x.UserId, y => y.Id, (x, y) => new { EncryptionKeyId = x.Id, UserId = y.Id, y.UserName })+ .Join(dbContext.AliasVaultUsers, x => x.UserId, y => y.Id, (x, y) => new { EncryptionKeyId = x.Id, UserId = y.Id, y.UserName, y.Blocked }).ToListAsync(cancellationToken);// Create new list of viewmodels@@ -185,7 +178,16 @@ elseforeach (var email in emailList){var encryptionKey = encryptionKeyUsernames.FirstOrDefault(x => x.EncryptionKeyId == email.UserEncryptionKeyId);- EmailViewModelList.Add(new EmailViewModel { Email = email, UserId = encryptionKey?.UserId ?? string.Empty, UserName = encryptionKey?.UserName ?? string.Empty });+ EmailViewModelList.Add(new EmailViewModel+ {+ Email = email,+ User = new UserDisplay+ {+ UserId = encryptionKey?.UserId,+ UserName = encryptionKey?.UserName,+ Blocked = encryptionKey?.Blocked ?? false,+ },+ });}IsLoading = false;@@ -266,8 +268,7 @@ elseprivate sealed class EmailViewModel{public Email Email { get; set; } = new();- public string UserId { get; set; } = string.Empty;- public string UserName { get; set; } = string.Empty;+ public UserDisplay User { get; set; } = new();}protected override void Dispose(bool disposing)diff --git a/apps/server/AliasVault.Admin/Main/Pages/Logging/Auth.razor b/apps/server/AliasVault.Admin/Main/Pages/Logging/Auth.razorindex c34fee207..e65ee4c7d 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Logging/Auth.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Logging/Auth.razor@@ -65,16 +65,11 @@ else<SortableTableColumn IsPrimary="true">@log.Id</SortableTableColumn><SortableTableColumn>@log.Timestamp.ToString("yyyy-MM-dd HH:mm")</SortableTableColumn><SortableTableColumn>- @if (UserLookup.TryGetValue(log.Username, out var userId))- {- <a href="users/@userId">- @log.Username- </a>- }- else- {- <span class="italic">@log.Username</span>+ @{+ var userInfo = UserLookup.GetValueOrDefault(log.Username)+ ?? new UserDisplay { UserName = log.Username };}+ <UserNameDisplay User="@userInfo" /></SortableTableColumn><SortableTableColumn>@log.Client</SortableTableColumn><SortableTableColumn>@log.EventType</SortableTableColumn>@@ -107,7 +102,7 @@ else];private List<AuthLog> LogList { get; set; } = [];- private Dictionary<string, string> UserLookup { get; set; } = [];+ private Dictionary<string, UserDisplay> UserLookup { get; set; } = [];private bool IsInitialized { get; set; } = false;private bool IsLoading { get; set; } = true;private int CurrentPage { get; set; } = 1;@@ -314,10 +309,14 @@ elsevar usernames = LogList.Select(x => x.Username).Distinct().Where(x => !string.IsNullOrEmpty(x)).ToList();var users = await dbContext.AliasVaultUsers.Where(u => u.UserName != null && usernames.Contains(u.UserName))- .Select(u => new { u.UserName, u.Id })+ .Select(u => new { u.UserName, u.Id, u.Blocked }).ToListAsync(cancellationToken);- UserLookup = users.Where(u => u.UserName != null).ToDictionary(u => u.UserName!, u => u.Id);+ UserLookup = users+ .Where(u => u.UserName != null)+ .ToDictionary(+ u => u.UserName!,+ u => new UserDisplay { UserId = u.Id, UserName = u.UserName, Blocked = u.Blocked });IsLoading = false;IsInitialized = true;diff --git a/apps/server/AliasVault.Admin/Main/Pages/Users/Users.razor b/apps/server/AliasVault.Admin/Main/Pages/Users/Users.razorindex 8422411db..e030ba33a 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Users/Users.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Users/Users.razor@@ -60,21 +60,7 @@ else<SortableTableRow OnClick="@(() => NavigateToUser(user.Id))"><SortableTableColumn IsPrimary="true">@user.CreatedAt.ToString("yyyy-MM-dd HH:mm")</SortableTableColumn><SortableTableColumn>- <div class="flex items-center gap-2">- <span>@user.UserName</span>- @if (user.IsInactive)- {- <StatusPill Enabled="false" TextFalse="Inactive" />- }- @if (user.Blocked)- {- <StatusPill Enabled="false" TextFalse="Blocked" />- }- @if (user.TwoFactorEnabled)- {- <StatusPill Enabled="true" TextTrue="2FA" />- }- </div>+ <UserNameDisplay User="@user.User" AsLink="false" /></SortableTableColumn><SortableTableColumn>@RelativeTimeFormatter.Format(user.LastActivityDate)</SortableTableColumn><SortableTableColumn>@user.CredentialCount</SortableTableColumn>@@ -237,12 +223,16 @@ elsereturn new UserViewModel{Id = user.Id,- UserName = user.UserName?.ToLower() ?? "N/A",- TwoFactorEnabled = user.TwoFactorEnabled,- Blocked = user.Blocked,+ User = new UserDisplay+ {+ UserId = user.Id,+ UserName = user.UserName?.ToLower() ?? "N/A",+ Blocked = user.Blocked,+ IsInactive = isInactive,+ TwoFactorEnabled = user.TwoFactorEnabled,+ },CreatedAt = user.CreatedAt,LastActivityDate = user.LastActivityDate,- IsInactive = isInactive,VaultCount = user.Vaults.Count(),CredentialCount = user.Vaults.OrderByDescending(x => x.RevisionNumber).First().CredentialCount,EmailClaimCount = user.EmailClaimCount,diff --git a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/RelatedUsersTable.razor b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/RelatedUsersTable.razorindex f38ba8994..5107c750a 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/RelatedUsersTable.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/RelatedUsersTable.razor@@ -11,14 +11,13 @@ else if (RelatedUsers.Any()){<SortableTableRow><SortableTableColumn IsPrimary="true">- <a href="users/@relatedUser.UserId">@relatedUser.Username</a>+ <UserNameDisplay User="@relatedUser.User" /></SortableTableColumn><SortableTableColumn>@relatedUser.SharedIpAddresses.ToString("N0")</SortableTableColumn><SortableTableColumn>@relatedUser.MostRecentSharedIp</SortableTableColumn><SortableTableColumn>@relatedUser.CredentialsCount.ToString("N0")</SortableTableColumn><SortableTableColumn>@relatedUser.EmailClaimsCount.ToString("N0")</SortableTableColumn><SortableTableColumn>@relatedUser.RegistrationDate.ToString("yyyy-MM-dd HH:mm")</SortableTableColumn>- <SortableTableColumn><StatusPill Enabled="!relatedUser.IsBlocked" TextTrue="Active" TextFalse="Blocked" /></SortableTableColumn></SortableTableRow>}</SortableTable>@@ -70,7 +69,6 @@ elsenew TableColumn { Title = "Credentials", PropertyName = "CredentialsCount" },new TableColumn { Title = "Email Claims", PropertyName = "EmailClaimsCount" },new TableColumn { Title = "Registered", PropertyName = "RegistrationDate" },- new TableColumn { Title = "Status", PropertyName = "IsBlocked" },];private IEnumerable<RelatedUserInfo> SortedRelatedUsersList => SortList(RelatedUsers, SortColumn, SortDirection);@@ -176,14 +174,17 @@ elsefrom vault in vaultGroup.DefaultIfEmpty()select new RelatedUserInfo{- UserId = user.Id,- Username = user.UserName ?? "Unknown",+ User = new UserDisplay+ {+ UserId = user.Id,+ UserName = user.UserName ?? "Unknown",+ Blocked = user.Blocked,+ },SharedIpAddresses = data.SharedIps,MostRecentSharedIp = data.MostRecentSharedIp ?? "-",CredentialsCount = vault?.CredentialsCount ?? 0,EmailClaimsCount = vault?.EmailClaimsCount ?? 0,RegistrationDate = user.CreatedAt,- IsBlocked = user.Blocked}).OrderByDescending(x => x.SharedIpAddresses).Take(20)@@ -204,13 +205,12 @@ else{return sortColumn switch{- "Username" => SortableTable.SortListByProperty(relatedUsers, r => r.Username, sortDirection),+ "Username" => SortableTable.SortListByProperty(relatedUsers, r => r.User.UserName ?? string.Empty, sortDirection),"SharedIpAddresses" => SortableTable.SortListByProperty(relatedUsers, r => r.SharedIpAddresses, sortDirection),"MostRecentSharedIp" => SortableTable.SortListByProperty(relatedUsers, r => r.MostRecentSharedIp, sortDirection),"CredentialsCount" => SortableTable.SortListByProperty(relatedUsers, r => r.CredentialsCount, sortDirection),"EmailClaimsCount" => SortableTable.SortListByProperty(relatedUsers, r => r.EmailClaimsCount, sortDirection),"RegistrationDate" => SortableTable.SortListByProperty(relatedUsers, r => r.RegistrationDate, sortDirection),- "IsBlocked" => SortableTable.SortListByProperty(relatedUsers, r => r.IsBlocked, sortDirection),_ => relatedUsers};}@@ -225,13 +225,11 @@ elseprivate class RelatedUserInfo{- public string UserId { get; set; } = string.Empty;- public string Username { get; set; } = string.Empty;+ public UserDisplay User { get; set; } = new();public int SharedIpAddresses { get; set; }public string MostRecentSharedIp { get; set; } = string.Empty;public int CredentialsCount { get; set; }public int EmailClaimsCount { get; set; }public DateTime RegistrationDate { get; set; }- public bool IsBlocked { get; set; }}}diff --git a/apps/server/AliasVault.Admin/Main/_Imports.razor b/apps/server/AliasVault.Admin/Main/_Imports.razorindex 7c60e6eb2..64055324e 100644--- a/apps/server/AliasVault.Admin/Main/_Imports.razor+++ b/apps/server/AliasVault.Admin/Main/_Imports.razor@@ -18,6 +18,7 @@@using AliasVault.Admin.Main.Components.Icons@using AliasVault.Admin.Main.Components.Layout@using AliasVault.Admin.Main.Components.Loading+@using AliasVault.Admin.Main.Components.Users@using AliasVault.Admin.Main.Components.WorkerStatus@using AliasVault.RazorComponents@using AliasVault.RazorComponents.Alertsdiff --git a/apps/server/AliasVault.Admin/Services/StatisticsService.cs b/apps/server/AliasVault.Admin/Services/StatisticsService.csindex 745ed1986..5b3f7176c 100644--- a/apps/server/AliasVault.Admin/Services/StatisticsService.cs+++ b/apps/server/AliasVault.Admin/Services/StatisticsService.cs@@ -148,6 +148,7 @@ public class StatisticsService{UserId = g.Key,Username = g.First().User.UserName,+ Blocked = g.First().User.Blocked,TotalStorageBytes = g.OrderByDescending(v => v.RevisionNumber).First().FileSize,}).OrderByDescending(u => u.TotalStorageBytes)@@ -157,8 +158,12 @@ public class StatisticsServicevar users = topUsers.Select(u => new TopUserByStorage{- UserId = u.UserId,- Username = u.Username ?? UnknownUsername,+ User = new UserDisplay+ {+ UserId = u.UserId,+ UserName = u.Username ?? UnknownUsername,+ Blocked = u.Blocked,+ },StorageBytes = u.TotalStorageBytes,StorageDisplaySize = FormatKilobytes(u.TotalStorageBytes),}).ToList();@@ -190,6 +195,7 @@ public class StatisticsService{UserId = g.Key,Username = g.First().User!.UserName,+ Blocked = g.First().User!.Blocked,AliasCount = g.Count(),}).OrderByDescending(u => u.AliasCount)@@ -199,8 +205,12 @@ public class StatisticsServicevar users = topUsers.Select(u => new TopUserByAliases{- UserId = u.UserId!,- Username = u.Username ?? UnknownUsername,+ User = new UserDisplay+ {+ UserId = u.UserId,+ UserName = u.Username ?? UnknownUsername,+ Blocked = u.Blocked,+ },AliasCount = u.AliasCount,}).ToList();@@ -229,6 +239,7 @@ public class StatisticsService{UserId = g.Key,Username = g.First().EncryptionKey.User!.UserName,+ Blocked = g.First().EncryptionKey.User!.Blocked,EmailCount = g.Count(),}).OrderByDescending(u => u.EmailCount)@@ -238,8 +249,12 @@ public class StatisticsServicevar users = topUsers.Select(u => new TopUserByEmails{- UserId = u.UserId!,- Username = u.Username ?? UnknownUsername,+ User = new UserDisplay+ {+ UserId = u.UserId,+ UserName = u.Username ?? UnknownUsername,+ Blocked = u.Blocked,+ },EmailCount = u.EmailCount,}).ToList();@@ -268,6 +283,7 @@ public class StatisticsService{UserId = g.Key,Username = g.First().User.UserName,+ Blocked = g.First().User.Blocked,CredentialCount = g.OrderByDescending(v => v.RevisionNumber).First().CredentialsCount,}).OrderByDescending(u => u.CredentialCount)@@ -277,8 +293,12 @@ public class StatisticsServicevar users = topUsers.Select(u => new TopUserByCredentials{- UserId = u.UserId,- Username = u.Username ?? UnknownUsername,+ User = new UserDisplay+ {+ UserId = u.UserId,+ UserName = u.Username ?? UnknownUsername,+ Blocked = u.Blocked,+ },CredentialCount = u.CredentialCount,}).ToList();@@ -503,10 +523,13 @@ public class StatisticsServicereturn topUsers.Select(u => new RecentUsageAliases{- UserId = u.UserId!,- Username = u.Username ?? UnknownUsername,+ User = new UserDisplay+ {+ UserId = u.UserId,+ UserName = u.Username ?? UnknownUsername,+ Blocked = u.IsDisabled,+ },AliasCount72h = u.AliasCount72h,- IsDisabled = u.IsDisabled,RegistrationDate = u.RegistrationDate,}).ToList();}@@ -537,10 +560,13 @@ public class StatisticsServicereturn topUsers.Select(u => new RecentUsageEmails{- UserId = u.UserId!,- Username = u.Username ?? UnknownUsername,+ User = new UserDisplay+ {+ UserId = u.UserId,+ UserName = u.Username ?? UnknownUsername,+ Blocked = u.IsDisabled,+ },EmailCount72h = u.EmailCount72h,- IsDisabled = u.IsDisabled,RegistrationDate = u.RegistrationDate,}).ToList();}