Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Simplify namepaces and remove leftover dotnet client usages (#2439)
Leendert de Borstace5c4663f01
diff --git a/.github/actions/build-core-libraries/action.yml b/.github/actions/build-core-libraries/action.ymlindex 733a7cf86..ac1816144 100644--- a/.github/actions/build-core-libraries/action.yml+++ b/.github/actions/build-core-libraries/action.yml@@ -68,7 +68,11 @@ runs:GATED_PATHS=("core/rust/src/vault_model/generated.rs""core/rust/src/password_generator/defaults.rs"- "apps/server/Databases/AliasClientDb/Models"+ "apps/server/Databases/AliasClientDb/Models/VaultTableRegistry.cs"+ "apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Vault/VaultDataBucketCategory.cs"+ "apps/server/Shared/AliasVault.Shared/Models/Enums/UnlockMethodType.cs"+ "apps/server/Shared/AliasVault.Shared/Models/Enums/ManifestKeyType.cs"+ "apps/server/Shared/AliasVault.Shared/Models/Enums/VaultKeyAlgorithm.cs""apps/mobile-app/ios/VaultModels""apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/models")diff --git a/.github/actions/start-smtp-service/action.yml b/.github/actions/start-smtp-service/action.ymlindex 9946eb99f..dd7d0b729 100644--- a/.github/actions/start-smtp-service/action.yml+++ b/.github/actions/start-smtp-service/action.yml@@ -28,7 +28,7 @@ runs:- name: Build SMTP serviceshell: bashworking-directory: apps/server- run: dotnet build Services/AliasVault.SmtpService+ run: dotnet build AliasVault.SmtpService# The service listens on the fixed ports 25 and 587; let the non-root runner user bind them.- name: Allow binding the SMTP ports@@ -37,7 +37,7 @@ runs:- name: Start SMTP serviceshell: bash- working-directory: apps/server/Services/AliasVault.SmtpService+ working-directory: apps/server/AliasVault.SmtpServicerun: |dotnet run --no-build --no-launch-profile > /tmp/smtp-service.log 2>&1 &echo "Waiting for the SMTP service to start..."diff --git a/.github/workflows/e2e-tests-web.yml b/.github/workflows/e2e-tests-web.ymlindex a7ef2a01f..84b3231a6 100644--- a/.github/workflows/e2e-tests-web.yml+++ b/.github/workflows/e2e-tests-web.yml@@ -12,7 +12,7 @@ on:- '.github/actions/build-core-libraries/**'- '.github/actions/start-api-server/**'- '.github/actions/start-smtp-service/**'- - 'apps/server/Services/AliasVault.SmtpService/**'+ - 'apps/server/AliasVault.SmtpService/**'pull_request:branches: [ "main" ]paths:@@ -23,7 +23,7 @@ on:- '.github/actions/build-core-libraries/**'- '.github/actions/start-api-server/**'- '.github/actions/start-smtp-service/**'- - 'apps/server/Services/AliasVault.SmtpService/**'+ - 'apps/server/AliasVault.SmtpService/**'workflow_dispatch:concurrency:diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.ymlindex ef2a71f0a..38ec04465 100644--- a/.github/workflows/release-docker.yml+++ b/.github/workflows/release-docker.yml@@ -210,11 +210,11 @@ jobs:title: AliasVault Reverse Proxydescription: Nginx reverse proxy for AliasVault. Part of multi-container setup and can be deployed via install.sh (see docs.aliasvault.com)- image: smtp- dockerfile: apps/server/Services/AliasVault.SmtpService/Dockerfile+ dockerfile: apps/server/AliasVault.SmtpService/Dockerfiletitle: AliasVault SMTP Servicedescription: SMTP service for AliasVault. Part of multi-container setup and can be deployed via install.sh (see docs.aliasvault.com)- image: task-runner- dockerfile: apps/server/Services/AliasVault.TaskRunner/Dockerfile+ dockerfile: apps/server/AliasVault.TaskRunner/Dockerfiletitle: AliasVault TaskRunnerdescription: Background task runner for AliasVault. Part of multi-container setup and can be deployed via install.sh (see docs.aliasvault.com)- image: installclidiff --git a/apps/mobile-app/ios/AliasVaultUITests/TestUserRegistration.swift b/apps/mobile-app/ios/AliasVaultUITests/TestUserRegistration.swiftindex f6c4377c5..14207da4b 100644--- a/apps/mobile-app/ios/AliasVaultUITests/TestUserRegistration.swift+++ b/apps/mobile-app/ios/AliasVaultUITests/TestUserRegistration.swift@@ -28,7 +28,7 @@ struct ApiError: Codable {}/// Default encryption settings for Argon2Id.-/// These match the server defaults in AliasVault.Cryptography.Client/Defaults.cs+/// These match the server defaults in apps/server/Utilities/AliasVault.Cryptography/Defaults.csenum EncryptionDefaults {static let type = "Argon2Id"static let iterations: UInt32 = 2diff --git a/apps/server/AliasVault.Admin/AliasVault.Admin.csproj b/apps/server/AliasVault.Admin/AliasVault.Admin.csprojindex ff6e294e1..fb9d30a09 100644--- a/apps/server/AliasVault.Admin/AliasVault.Admin.csproj+++ b/apps/server/AliasVault.Admin/AliasVault.Admin.csproj@@ -45,11 +45,10 @@<ItemGroup><ProjectReference Include="..\Databases\AliasServerDb\AliasServerDb.csproj" />- <ProjectReference Include="..\Shared\AliasVault.RazorComponents\AliasVault.RazorComponents.csproj" />- <ProjectReference Include="..\Shared\AliasVault.Shared.Core\AliasVault.Shared.Core.csproj" />+ <ProjectReference Include="..\Shared\AliasVault.Shared\AliasVault.Shared.csproj" /><ProjectReference Include="..\Shared\AliasVault.Shared.Server\AliasVault.Shared.Server.csproj" /><ProjectReference Include="..\Utilities\AliasVault.Auth\AliasVault.Auth.csproj" /><ProjectReference Include="..\Utilities\AliasVault.Logging\AliasVault.Logging.csproj" />- <ProjectReference Include="..\Utilities\Cryptography\AliasVault.Cryptography.Server\AliasVault.Cryptography.Server.csproj" />+ <ProjectReference Include="..\Utilities\AliasVault.Cryptography\AliasVault.Cryptography.csproj" /></ItemGroup></Project>diff --git a/apps/server/AliasVault.Admin/Auth/Pages/Login.razor b/apps/server/AliasVault.Admin/Auth/Pages/Login.razorindex a662afbad..508cfa8da 100644--- a/apps/server/AliasVault.Admin/Auth/Pages/Login.razor+++ b/apps/server/AliasVault.Admin/Auth/Pages/Login.razor@@ -1,5 +1,5 @@@page "/user/login"-@using AliasVault.RazorComponents.Alerts+@using AliasVault.Admin.Main.Components.Alerts@using AliasVault.Shared.Models.Enums<LayoutPageTitle>Log in</LayoutPageTitle>diff --git a/apps/server/Shared/AliasVault.RazorComponents/Alerts/AlertMessageError.razor b/apps/server/AliasVault.Admin/Main/Components/Alerts/AlertMessageError.razorsimilarity index 100%rename from apps/server/Shared/AliasVault.RazorComponents/Alerts/AlertMessageError.razorrename to apps/server/AliasVault.Admin/Main/Components/Alerts/AlertMessageError.razordiff --git a/apps/server/Shared/AliasVault.RazorComponents/Alerts/AlertMessageInfo.razor b/apps/server/AliasVault.Admin/Main/Components/Alerts/AlertMessageInfo.razorsimilarity index 100%rename from apps/server/Shared/AliasVault.RazorComponents/Alerts/AlertMessageInfo.razorrename to apps/server/AliasVault.Admin/Main/Components/Alerts/AlertMessageInfo.razordiff --git a/apps/server/Shared/AliasVault.RazorComponents/Alerts/AlertMessageSuccess.razor b/apps/server/AliasVault.Admin/Main/Components/Alerts/AlertMessageSuccess.razorsimilarity index 100%rename from apps/server/Shared/AliasVault.RazorComponents/Alerts/AlertMessageSuccess.razorrename to apps/server/AliasVault.Admin/Main/Components/Alerts/AlertMessageSuccess.razordiff --git a/apps/server/Shared/AliasVault.RazorComponents/Alerts/AlertMessageWarning.razor b/apps/server/AliasVault.Admin/Main/Components/Alerts/AlertMessageWarning.razorsimilarity index 100%rename from apps/server/Shared/AliasVault.RazorComponents/Alerts/AlertMessageWarning.razorrename to apps/server/AliasVault.Admin/Main/Components/Alerts/AlertMessageWarning.razordiff --git a/apps/server/Shared/AliasVault.RazorComponents/Alerts/MessageInfo.razor b/apps/server/AliasVault.Admin/Main/Components/Alerts/MessageInfo.razorsimilarity index 100%rename from apps/server/Shared/AliasVault.RazorComponents/Alerts/MessageInfo.razorrename to apps/server/AliasVault.Admin/Main/Components/Alerts/MessageInfo.razordiff --git a/apps/server/Shared/AliasVault.RazorComponents/Buttons/Button.razor b/apps/server/AliasVault.Admin/Main/Components/Buttons/Button.razorsimilarity index 98%rename from apps/server/Shared/AliasVault.RazorComponents/Buttons/Button.razorrename to apps/server/AliasVault.Admin/Main/Components/Buttons/Button.razorindex d49a123f4..b807c7519 100644--- a/apps/server/Shared/AliasVault.RazorComponents/Buttons/Button.razor+++ b/apps/server/AliasVault.Admin/Main/Components/Buttons/Button.razor@@ -1,3 +1,4 @@+@inherits ComponentBase<button type="@Type"@onclick="HandleClick"disabled="@IsDisabled"diff --git a/apps/server/Shared/AliasVault.RazorComponents/Buttons/ButtonStyles.cs b/apps/server/AliasVault.Admin/Main/Components/Buttons/ButtonStyles.cssimilarity index 97%rename from apps/server/Shared/AliasVault.RazorComponents/Buttons/ButtonStyles.csrename to apps/server/AliasVault.Admin/Main/Components/Buttons/ButtonStyles.csindex 59b4fbc7e..cc1b997ed 100644--- a/apps/server/Shared/AliasVault.RazorComponents/Buttons/ButtonStyles.cs+++ b/apps/server/AliasVault.Admin/Main/Components/Buttons/ButtonStyles.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.RazorComponents.Buttons;+namespace AliasVault.Admin.Main.Components.Buttons;/// <summary>/// A static class that provides CSS classes for buttons.diff --git a/apps/server/Shared/AliasVault.RazorComponents/Buttons/ConfirmButton.razor b/apps/server/AliasVault.Admin/Main/Components/Buttons/ConfirmButton.razorsimilarity index 96%rename from apps/server/Shared/AliasVault.RazorComponents/Buttons/ConfirmButton.razorrename to apps/server/AliasVault.Admin/Main/Components/Buttons/ConfirmButton.razorindex 273d11c06..3ae966490 100644--- a/apps/server/Shared/AliasVault.RazorComponents/Buttons/ConfirmButton.razor+++ b/apps/server/AliasVault.Admin/Main/Components/Buttons/ConfirmButton.razor@@ -1,3 +1,4 @@+@inherits ComponentBase<Button OnClick="HandleClick"Color="success">@ChildContentdiff --git a/apps/server/Shared/AliasVault.RazorComponents/Buttons/DeleteButton.razor b/apps/server/AliasVault.Admin/Main/Components/Buttons/DeleteButton.razorsimilarity index 97%rename from apps/server/Shared/AliasVault.RazorComponents/Buttons/DeleteButton.razorrename to apps/server/AliasVault.Admin/Main/Components/Buttons/DeleteButton.razorindex b6d115637..2f6fcbc5d 100644--- a/apps/server/Shared/AliasVault.RazorComponents/Buttons/DeleteButton.razor+++ b/apps/server/AliasVault.Admin/Main/Components/Buttons/DeleteButton.razor@@ -1,3 +1,4 @@+@inherits ComponentBase<Button OnClick="HandleClick"Display="flex"Color="danger">diff --git a/apps/server/Shared/AliasVault.RazorComponents/Buttons/LinkButton.razor b/apps/server/AliasVault.Admin/Main/Components/Buttons/LinkButton.razorsimilarity index 73%rename from apps/server/Shared/AliasVault.RazorComponents/Buttons/LinkButton.razorrename to apps/server/AliasVault.Admin/Main/Components/Buttons/LinkButton.razorindex a2be367b7..aba7ee4a6 100644--- a/apps/server/Shared/AliasVault.RazorComponents/Buttons/LinkButton.razor+++ b/apps/server/AliasVault.Admin/Main/Components/Buttons/LinkButton.razor@@ -1,11 +1,6 @@+@inherits ComponentBase<a href="@Href" class="@GetButtonClasses()">- @if (SmallText.Length > 0) {- <span class="md:hidden">@SmallText</span>- <span class="hidden md:inline">@Text</span>- }- else {- @Text- }+ @Text</a>@code {@@ -21,12 +16,6 @@[Parameter]public string Text { get; set; } = string.Empty;- /// <summary>- /// Gets or sets the text that should appear when the screen is small (optional). If not set, the main text will be used.- /// </summary>- [Parameter]- public string SmallText { get; set; } = string.Empty;-/// <summary>/// Gets or sets the color theme of the button./// </summary>diff --git a/apps/server/Shared/AliasVault.RazorComponents/Buttons/RefreshButton.razor b/apps/server/AliasVault.Admin/Main/Components/Buttons/RefreshButton.razorsimilarity index 98%rename from apps/server/Shared/AliasVault.RazorComponents/Buttons/RefreshButton.razorrename to apps/server/AliasVault.Admin/Main/Components/Buttons/RefreshButton.razorindex af7bb738b..9e40bad64 100644--- a/apps/server/Shared/AliasVault.RazorComponents/Buttons/RefreshButton.razor+++ b/apps/server/AliasVault.Admin/Main/Components/Buttons/RefreshButton.razor@@ -1,3 +1,4 @@+@inherits ComponentBase@using System.Timers<Button OnClick="HandleClick"diff --git a/apps/server/Shared/AliasVault.RazorComponents/Buttons/SubmitButton.razor b/apps/server/AliasVault.Admin/Main/Components/Buttons/SubmitButton.razorsimilarity index 92%rename from apps/server/Shared/AliasVault.RazorComponents/Buttons/SubmitButton.razorrename to apps/server/AliasVault.Admin/Main/Components/Buttons/SubmitButton.razorindex e4d0f04b4..81a6716ca 100644--- a/apps/server/Shared/AliasVault.RazorComponents/Buttons/SubmitButton.razor+++ b/apps/server/AliasVault.Admin/Main/Components/Buttons/SubmitButton.razor@@ -1,3 +1,4 @@+@inherits ComponentBase<Button Type="submit"Color="primary"AdditionalClasses="w-full text-center">diff --git a/apps/server/Shared/AliasVault.RazorComponents/ConfirmModal.razor b/apps/server/AliasVault.Admin/Main/Components/ConfirmModal.razorsimilarity index 98%rename from apps/server/Shared/AliasVault.RazorComponents/ConfirmModal.razorrename to apps/server/AliasVault.Admin/Main/Components/ConfirmModal.razorindex c97d39b65..57562be04 100644--- a/apps/server/Shared/AliasVault.RazorComponents/ConfirmModal.razor+++ b/apps/server/AliasVault.Admin/Main/Components/ConfirmModal.razor@@ -1,5 +1,5 @@+@inherits ComponentBase@inject ConfirmModalService ModalService-@using AliasVault.RazorComponents.Services@implements IDisposable@if (ModalService.IsVisible)diff --git a/apps/server/Shared/AliasVault.RazorComponents/Headings/Breadcrumb.razor b/apps/server/AliasVault.Admin/Main/Components/Headings/Breadcrumb.razorsimilarity index 98%rename from apps/server/Shared/AliasVault.RazorComponents/Headings/Breadcrumb.razorrename to apps/server/AliasVault.Admin/Main/Components/Headings/Breadcrumb.razorindex 86466d0d3..62b65b415 100644--- a/apps/server/Shared/AliasVault.RazorComponents/Headings/Breadcrumb.razor+++ b/apps/server/AliasVault.Admin/Main/Components/Headings/Breadcrumb.razor@@ -1,4 +1,5 @@-<nav class="flex mb-4">+@inherits ComponentBase+<nav class="flex mb-4"><ol class="inline-flex items-center space-x-1 text-sm font-medium md:space-x-2">@for (var i = 0; i < BreadcrumbItems.Count; i++){diff --git a/apps/server/Shared/AliasVault.RazorComponents/Headings/H1.razor b/apps/server/AliasVault.Admin/Main/Components/Headings/H1.razorsimilarity index 91%rename from apps/server/Shared/AliasVault.RazorComponents/Headings/H1.razorrename to apps/server/AliasVault.Admin/Main/Components/Headings/H1.razorindex f193275b1..f51a8ccef 100644--- a/apps/server/Shared/AliasVault.RazorComponents/Headings/H1.razor+++ b/apps/server/AliasVault.Admin/Main/Components/Headings/H1.razor@@ -1,3 +1,4 @@+@inherits ComponentBase<h1 class="text-xl font-semibold text-gray-900 sm:text-2xl dark:text-white">@ChildContent</h1>@code {diff --git a/apps/server/Shared/AliasVault.RazorComponents/Headings/PageHeader.razor b/apps/server/AliasVault.Admin/Main/Components/Headings/PageHeader.razorsimilarity index 98%rename from apps/server/Shared/AliasVault.RazorComponents/Headings/PageHeader.razorrename to apps/server/AliasVault.Admin/Main/Components/Headings/PageHeader.razorindex 7f559bfe5..951d69f0b 100644--- a/apps/server/Shared/AliasVault.RazorComponents/Headings/PageHeader.razor+++ b/apps/server/AliasVault.Admin/Main/Components/Headings/PageHeader.razor@@ -1,3 +1,4 @@+@inherits ComponentBase<div class="grid grid-cols-1 px-4 pt-6 xl:grid-cols-3 xl:gap-4 dark:bg-gray-900"><div class="mb-4 col-span-full xl:mb-2"><Breadcrumb BreadcrumbItems="BreadcrumbItems" />diff --git a/apps/server/Shared/AliasVault.RazorComponents/Paginators/ResponsivePaginator.razor b/apps/server/AliasVault.Admin/Main/Components/Paginators/ResponsivePaginator.razorsimilarity index 99%rename from apps/server/Shared/AliasVault.RazorComponents/Paginators/ResponsivePaginator.razorrename to apps/server/AliasVault.Admin/Main/Components/Paginators/ResponsivePaginator.razorindex 716e738ab..60f301c38 100644--- a/apps/server/Shared/AliasVault.RazorComponents/Paginators/ResponsivePaginator.razor+++ b/apps/server/AliasVault.Admin/Main/Components/Paginators/ResponsivePaginator.razor@@ -1,3 +1,4 @@+@inherits ComponentBase@if (TotalRecords > PageSize){<!-- Desktop pagination -->diff --git a/apps/server/AliasVault.Admin/Main/Components/StatusPill.razor b/apps/server/AliasVault.Admin/Main/Components/StatusPill.razornew file mode 100644index 000000000..4db553b89--- /dev/null+++ b/apps/server/AliasVault.Admin/Main/Components/StatusPill.razor@@ -0,0 +1,29 @@+@inherits ComponentBase++<span class="@PillClass px-2 py-1 text-xs font-medium rounded-full">+ @StatusText+</span>++@code {+ /// <summary>+ /// Set to true to show the pill as enabled.+ /// </summary>+ [Parameter]+ public bool Enabled { get; set; }++ /// <summary>+ /// The text to show when the pill is enabled.+ /// </summary>+ [Parameter]+ public string TextTrue { get; set; } = "Enabled";++ /// <summary>+ /// The text to show when the pill is disabled.+ /// </summary>+ [Parameter]+ public string TextFalse { get; set; } = "Disabled";++ private string PillClass => Enabled ? "bg-green-100 text-green-800" : "bg-red-100 text-red-800";++ private string StatusText => Enabled ? TextTrue : TextFalse;+}diff --git a/apps/server/Shared/AliasVault.RazorComponents/Tables/SortDirection.cs b/apps/server/AliasVault.Admin/Main/Components/Tables/SortDirection.cssimilarity index 92%rename from apps/server/Shared/AliasVault.RazorComponents/Tables/SortDirection.csrename to apps/server/AliasVault.Admin/Main/Components/Tables/SortDirection.csindex b6b3d7408..a6c5c4879 100644--- a/apps/server/Shared/AliasVault.RazorComponents/Tables/SortDirection.cs+++ b/apps/server/AliasVault.Admin/Main/Components/Tables/SortDirection.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.RazorComponents.Tables;+namespace AliasVault.Admin.Main.Components.Tables;/// <summary>/// An enum that represents the direction of a sort.diff --git a/apps/server/Shared/AliasVault.RazorComponents/Tables/SortableTable.razor b/apps/server/AliasVault.Admin/Main/Components/Tables/SortableTable.razorsimilarity index 99%rename from apps/server/Shared/AliasVault.RazorComponents/Tables/SortableTable.razorrename to apps/server/AliasVault.Admin/Main/Components/Tables/SortableTable.razorindex 3e6c81519..a1a7e59b1 100644--- a/apps/server/Shared/AliasVault.RazorComponents/Tables/SortableTable.razor+++ b/apps/server/AliasVault.Admin/Main/Components/Tables/SortableTable.razor@@ -1,3 +1,4 @@+@inherits ComponentBase<div class="rounded-lg border border-gray-200 dark:border-gray-700 shadow-sm overflow-x-auto"><table class="w-full text-sm text-left text-gray-500 dark:text-gray-400 min-w-max"><thead class="text-xs text-gray-700 bg-gray-50 dark:bg-gray-700 dark:text-gray-400">diff --git a/apps/server/Shared/AliasVault.RazorComponents/Tables/SortableTableColumn.razor b/apps/server/AliasVault.Admin/Main/Components/Tables/SortableTableColumn.razorsimilarity index 58%rename from apps/server/Shared/AliasVault.RazorComponents/Tables/SortableTableColumn.razorrename to apps/server/AliasVault.Admin/Main/Components/Tables/SortableTableColumn.razorindex efb402660..f6ab93081 100644--- a/apps/server/Shared/AliasVault.RazorComponents/Tables/SortableTableColumn.razor+++ b/apps/server/AliasVault.Admin/Main/Components/Tables/SortableTableColumn.razor@@ -1,12 +1,13 @@-@if (IsPrimary)+@inherits ComponentBase+@if (IsPrimary){- <td class="@(Padding ? "px-4 py-3" : "") font-medium text-gray-900 dark:text-gray-200" title="@Title">+ <td class="px-4 py-3 font-medium text-gray-900 dark:text-gray-200" title="@Title">@ChildContent</td>}else{- <td class="@(Padding ? "px-4 py-3" : "") text-gray-500 dark:text-gray-400" title="@Title">+ <td class="px-4 py-3 text-gray-500 dark:text-gray-400" title="@Title">@ChildContent</td>}@@ -29,11 +30,4 @@ else/// </summary>[Parameter]public string? Title { get; set; }-- /// <summary>- /// Gets or sets a value indicating whether to add padding to the column. Defaults to true.- /// </summary>- [Parameter]- public bool Padding { get; set; } = true;-}diff --git a/apps/server/AliasVault.Admin/Main/Components/Tables/SortableTableRow.razor b/apps/server/AliasVault.Admin/Main/Components/Tables/SortableTableRow.razornew file mode 100644index 000000000..225a34aff--- /dev/null+++ b/apps/server/AliasVault.Admin/Main/Components/Tables/SortableTableRow.razor@@ -0,0 +1,35 @@+@inherits ComponentBase+<tr @onclick="HandleClick" class="bg-white border-b dark:bg-gray-800 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-700 @(OnClick.HasDelegate ? "cursor-pointer" : "") @(Class)">+ @ChildContent+</tr>++@code {+ /// <summary>+ /// Gets or sets the child content of the table.+ /// </summary>+ [Parameter]+ public RenderFragment ChildContent { get; set; } = null!;++ /// <summary>+ /// Gets or sets (additional) CSS classes to add to row.+ /// </summary>+ [Parameter]+ public string Class { get; set; } = string.Empty;++ /// <summary>+ /// Gets or sets the callback to invoke when the row is clicked.+ /// </summary>+ [Parameter]+ public EventCallback OnClick { get; set; }++ /// <summary>+ /// Handles the click event.+ /// </summary>+ private async Task HandleClick()+ {+ if (OnClick.HasDelegate)+ {+ await OnClick.InvokeAsync();+ }+ }+}diff --git a/apps/server/Shared/AliasVault.RazorComponents/Tables/TableColumn.cs b/apps/server/AliasVault.Admin/Main/Components/Tables/TableColumn.cssimilarity index 94%rename from apps/server/Shared/AliasVault.RazorComponents/Tables/TableColumn.csrename to apps/server/AliasVault.Admin/Main/Components/Tables/TableColumn.csindex c373f29dc..c2edabe8f 100644--- a/apps/server/Shared/AliasVault.RazorComponents/Tables/TableColumn.cs+++ b/apps/server/AliasVault.Admin/Main/Components/Tables/TableColumn.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.RazorComponents.Tables;+namespace AliasVault.Admin.Main.Components.Tables;/// <summary>/// A class that represents a column in a table.diff --git a/apps/server/AliasVault.Admin/Main/Layout/Footer.razor b/apps/server/AliasVault.Admin/Main/Layout/Footer.razorindex beff6f3fd..649b51029 100644--- a/apps/server/AliasVault.Admin/Main/Layout/Footer.razor+++ b/apps/server/AliasVault.Admin/Main/Layout/Footer.razor@@ -1,4 +1,4 @@-@using AliasVault.Shared.Core+@using AliasVault.Shared<footer class="md:flex md:items-center md:justify-between px-4 2xl:px-0 py-6 md:py-10"><p class="text-sm text-center text-gray-500 mb-4 lg:mb-0">© 2024 <span>@AppInfo.ApplicationName v@(AppInfo.GetFullVersion())</span>. All rights reserved.diff --git a/apps/server/Shared/AliasVault.RazorComponents/Models/BreadcrumbItem.cs b/apps/server/AliasVault.Admin/Main/Models/BreadcrumbItem.cssimilarity index 95%rename from apps/server/Shared/AliasVault.RazorComponents/Models/BreadcrumbItem.csrename to apps/server/AliasVault.Admin/Main/Models/BreadcrumbItem.csindex a09a8207a..bd794090c 100644--- a/apps/server/Shared/AliasVault.RazorComponents/Models/BreadcrumbItem.cs+++ b/apps/server/AliasVault.Admin/Main/Models/BreadcrumbItem.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.RazorComponents.Models;+namespace AliasVault.Admin.Main.Models;/// <summary>/// Represents a breadcrumb item for the breadcrumb component.diff --git a/apps/server/AliasVault.Admin/Main/Pages/Dashboard/AllTimeStats.razor b/apps/server/AliasVault.Admin/Main/Pages/Dashboard/AllTimeStats.razorindex fc8d2356c..f4f0f8ffa 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Dashboard/AllTimeStats.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Dashboard/AllTimeStats.razor@@ -2,8 +2,7 @@@using AliasVault.Admin.Main.Models@using AliasVault.Admin.Services@using AliasVault.Admin.Main.Pages.Dashboard.Components-@using AliasVault.RazorComponents.Tables-@using AliasVault.RazorComponents+@using AliasVault.Admin.Main.Components.Tables@inherits MainBase@inject StatisticsService StatisticsServicediff --git a/apps/server/AliasVault.Admin/Main/Pages/Dashboard/Components/RecentActiveUsersCard.razor b/apps/server/AliasVault.Admin/Main/Pages/Dashboard/Components/RecentActiveUsersCard.razorindex 2fe0f989d..6a52f71e8 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Dashboard/Components/RecentActiveUsersCard.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Dashboard/Components/RecentActiveUsersCard.razor@@ -1,5 +1,5 @@-@using AliasVault.RazorComponents.Tables-@using AliasVault.RazorComponents.Utilities+@using AliasVault.Admin.Main.Components.Tables+@using AliasVault.Admin.Main.Utilities@inject NavigationManager NavigationManager<div class="p-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 sm:p-6 dark:bg-gray-800">diff --git a/apps/server/AliasVault.Admin/Main/Pages/Dashboard/Components/ServiceStatusCard.razor b/apps/server/AliasVault.Admin/Main/Pages/Dashboard/Components/ServiceStatusCard.razorindex 71b818200..b6ceaeab6 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Dashboard/Components/ServiceStatusCard.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Dashboard/Components/ServiceStatusCard.razor@@ -1,4 +1,4 @@-@using AliasVault.RazorComponents.Utilities+@using AliasVault.Admin.Main.Utilities@using AliasVault.Shared.Models.Enums@using AliasVault.WorkerStatus@using AliasVault.WorkerStatus.Databasediff --git a/apps/server/AliasVault.Admin/Main/Pages/Emails.razor b/apps/server/AliasVault.Admin/Main/Pages/Emails.razorindex 114d928bb..17d167791 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Emails.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Emails.razor@@ -1,5 +1,5 @@@page "/emails"-@using AliasVault.RazorComponents.Tables+@using AliasVault.Admin.Main.Components.Tables@inherits MainBase<LayoutPageTitle>Emails</LayoutPageTitle>diff --git a/apps/server/AliasVault.Admin/Main/Pages/Logging/Auth.razor b/apps/server/AliasVault.Admin/Main/Pages/Logging/Auth.razorindex b8b41d5dd..217cd935c 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Logging/Auth.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Logging/Auth.razor@@ -1,5 +1,5 @@@page "/logging/auth"-@using AliasVault.RazorComponents.Tables+@using AliasVault.Admin.Main.Components.Tables@using AliasVault.Shared.Models.Enums@using Microsoft.AspNetCore.WebUtilities@inherits MainBasediff --git a/apps/server/AliasVault.Admin/Main/Pages/Logging/General.razor b/apps/server/AliasVault.Admin/Main/Pages/Logging/General.razorindex e2f617868..1d8288c09 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Logging/General.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Logging/General.razor@@ -1,5 +1,5 @@@page "/logging/general"-@using AliasVault.RazorComponents.Tables+@using AliasVault.Admin.Main.Components.Tables@inherits MainBase<LayoutPageTitle>System logs</LayoutPageTitle>diff --git a/apps/server/AliasVault.Admin/Main/Pages/MainBase.cs b/apps/server/AliasVault.Admin/Main/Pages/MainBase.csindex afdc5e32a..671aec047 100644--- a/apps/server/AliasVault.Admin/Main/Pages/MainBase.cs+++ b/apps/server/AliasVault.Admin/Main/Pages/MainBase.cs@@ -8,10 +8,9 @@namespace AliasVault.Admin.Main.Pages;using AliasServerDb;+using AliasVault.Admin.Main.Models;using AliasVault.Admin.Services;using AliasVault.Auth;-using AliasVault.RazorComponents.Models;-using AliasVault.RazorComponents.Services;using ApexCharts;using Microsoft.AspNetCore.Authorization;using Microsoft.AspNetCore.Components;diff --git a/apps/server/AliasVault.Admin/Main/Pages/Maintenance/Components/TaskRunnerHistory.razor b/apps/server/AliasVault.Admin/Main/Pages/Maintenance/Components/TaskRunnerHistory.razorindex 7ba3f78bd..65fa4fdc9 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Maintenance/Components/TaskRunnerHistory.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Maintenance/Components/TaskRunnerHistory.razor@@ -1,4 +1,4 @@-@using AliasVault.RazorComponents.Tables+@using AliasVault.Admin.Main.Components.Tables@using AliasVault.Shared.Models.Enums@inherits MainBasediff --git a/apps/server/AliasVault.Admin/Main/Pages/Users/Users.razor b/apps/server/AliasVault.Admin/Main/Pages/Users/Users.razorindex 89c2c4818..7579ffb57 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Users/Users.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Users/Users.razor@@ -1,6 +1,6 @@@page "/users"-@using AliasVault.RazorComponents.Tables-@using AliasVault.RazorComponents.Utilities+@using AliasVault.Admin.Main.Components.Tables+@using AliasVault.Admin.Main.Utilities@using AliasVault.Shared.Server.Services@inject ServerSettingsService SettingsService@inject NavigationManager NavigationManagerdiff --git a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/AuthLogTable.razor b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/AuthLogTable.razorindex da896282e..edcfeeebc 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/AuthLogTable.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/AuthLogTable.razor@@ -1,4 +1,4 @@-@using AliasVault.RazorComponents.Tables+@using AliasVault.Admin.Main.Components.Tables@using AliasVault.Shared.Models.Enums<div class="mb-4 mt-3">diff --git a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/BlobUsageTable.razor b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/BlobUsageTable.razorindex ac9c95466..4ca18264b 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/BlobUsageTable.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/BlobUsageTable.razor@@ -1,4 +1,4 @@-@using AliasVault.RazorComponents.Tables+@using AliasVault.Admin.Main.Components.Tables@if (Categories.Count == 0){diff --git a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/DataBucketTable.razor b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/DataBucketTable.razorindex 099c7b0a3..8d39f1c3e 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/DataBucketTable.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/DataBucketTable.razor@@ -1,4 +1,4 @@-@using AliasVault.RazorComponents.Tables+@using AliasVault.Admin.Main.Components.Tables@using AliasVault.Shared.Models.WebApi.V2.Vault@if (Revisions.Count == 0)diff --git a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/EmailClaimTable.razor b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/EmailClaimTable.razorindex ebf6de806..65edd96d2 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/EmailClaimTable.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/EmailClaimTable.razor@@ -1,4 +1,4 @@-@using AliasVault.RazorComponents.Tables+@using AliasVault.Admin.Main.Components.Tables<div class="d-flex justify-content-between mb-3"><div class="flex items-center space-x-2 mt-2">diff --git a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/ManifestTable.razor b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/ManifestTable.razorindex a8725f93c..51691bff6 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/ManifestTable.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/ManifestTable.razor@@ -1,4 +1,4 @@-@using AliasVault.RazorComponents.Tables+@using AliasVault.Admin.Main.Components.Tables<SortableTable Columns="@_manifestTableColumns" SortColumn="@SortColumn" SortDirection="@SortDirection" OnSortChanged="HandleSortChanged">@foreach (var entry in SortedRevisions)diff --git a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/PasswordHistoryTable.razor b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/PasswordHistoryTable.razorindex 15981ef4e..c6c2c17a2 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/PasswordHistoryTable.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/PasswordHistoryTable.razor@@ -1,6 +1,6 @@@using AliasServerDb.Retention@using AliasVault.Shared.Models.Enums-@using AliasVault.RazorComponents.Tables+@using AliasVault.Admin.Main.Components.Tables@if (PasswordHistoryList.Count == 0){diff --git a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/RefreshTokenTable.razor b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/RefreshTokenTable.razorindex f09a5c652..daca464bc 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/RefreshTokenTable.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/RefreshTokenTable.razor@@ -1,4 +1,4 @@-@using AliasVault.RazorComponents.Tables+@using AliasVault.Admin.Main.Components.Tables<div class="mb-4"><Button Color="danger" OnClick="RevokeAllTokens">Revoke all sessions</Button>diff --git a/apps/server/Shared/AliasVault.RazorComponents/Utilities/RelativeTimeFormatter.cs b/apps/server/AliasVault.Admin/Main/Utilities/RelativeTimeFormatter.cssimilarity index 98%rename from apps/server/Shared/AliasVault.RazorComponents/Utilities/RelativeTimeFormatter.csrename to apps/server/AliasVault.Admin/Main/Utilities/RelativeTimeFormatter.csindex 3a785b9cc..903dbb3c3 100644--- a/apps/server/Shared/AliasVault.RazorComponents/Utilities/RelativeTimeFormatter.cs+++ b/apps/server/AliasVault.Admin/Main/Utilities/RelativeTimeFormatter.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.RazorComponents.Utilities;+namespace AliasVault.Admin.Main.Utilities;/// <summary>/// Utility for formatting DateTime values as relative time strings (e.g., "5 minutes ago", "2 days ago").diff --git a/apps/server/AliasVault.Admin/Main/_Imports.razor b/apps/server/AliasVault.Admin/Main/_Imports.razorindex eb4fe0539..594a6f14e 100644--- a/apps/server/AliasVault.Admin/Main/_Imports.razor+++ b/apps/server/AliasVault.Admin/Main/_Imports.razor@@ -18,13 +18,10 @@@using AliasVault.Admin.Main.Components.Icons@using AliasVault.Admin.Main.Components.Layout@using AliasVault.Admin.Main.Components.Loading+@using AliasVault.Admin.Main.Components.Buttons+@using AliasVault.Admin.Main.Components.Headings+@using AliasVault.Admin.Main.Components.Paginators@using AliasVault.Admin.Main.Components.Users-@using AliasVault.RazorComponents-@using AliasVault.RazorComponents.Alerts-@using AliasVault.RazorComponents.Buttons-@using AliasVault.RazorComponents.Headings-@using AliasVault.RazorComponents.Models-@using AliasVault.RazorComponents.Paginators@using AliasVault.Admin.Main.Models@using AliasVault.Admin.Main.Pages@using AliasVault.Admin.Servicesdiff --git a/apps/server/AliasVault.Admin/Program.cs b/apps/server/AliasVault.Admin/Program.csindex beb88dc09..bf8f27a2b 100644--- a/apps/server/AliasVault.Admin/Program.cs+++ b/apps/server/AliasVault.Admin/Program.cs@@ -5,7 +5,6 @@// </copyright>//------------------------------------------------------------------------using System.Net;using System.Reflection;using AliasServerDb;using AliasServerDb.Configuration;@@ -15,9 +14,8 @@ using AliasVault.Admin.Main;using AliasVault.Admin.Middleware;using AliasVault.Admin.Services;using AliasVault.Auth;-using AliasVault.Cryptography.Server;+using AliasVault.Cryptography;using AliasVault.Logging;-using AliasVault.RazorComponents.Services;using AliasVault.Shared.Models.Configuration;using AliasVault.Shared.Server.Services;using AliasVault.Shared.Server.Utilities;diff --git a/apps/server/Shared/AliasVault.RazorComponents/Services/ConfirmModalService.cs b/apps/server/AliasVault.Admin/Services/ConfirmModalService.cssimilarity index 98%rename from apps/server/Shared/AliasVault.RazorComponents/Services/ConfirmModalService.csrename to apps/server/AliasVault.Admin/Services/ConfirmModalService.csindex b2b4a7a30..129f98567 100644--- a/apps/server/Shared/AliasVault.RazorComponents/Services/ConfirmModalService.cs+++ b/apps/server/AliasVault.Admin/Services/ConfirmModalService.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.RazorComponents.Services;+namespace AliasVault.Admin.Services;using System;using System.Threading.Tasks;diff --git a/apps/server/AliasVault.Admin/tailwind.config.js b/apps/server/AliasVault.Admin/tailwind.config.jsindex 0f275c0da..b75825d8f 100644--- a/apps/server/AliasVault.Admin/tailwind.config.js+++ b/apps/server/AliasVault.Admin/tailwind.config.js@@ -3,8 +3,7 @@ module.exports = {content: ['./**/*.html','./**/*.razor',- '../Shared/AliasVault.RazorComponents/**/*.razor',- '../Shared/AliasVault.RazorComponents/**/*.cs',+ './Main/Components/**/*.cs',],safelist: ['w-64',diff --git a/apps/server/AliasVault.Admin/wwwroot/css/tailwind.css b/apps/server/AliasVault.Admin/wwwroot/css/tailwind.cssindex 9a027dc4f..43e6e67a7 100644--- a/apps/server/AliasVault.Admin/wwwroot/css/tailwind.css+++ b/apps/server/AliasVault.Admin/wwwroot/css/tailwind.css@@ -628,10 +628,6 @@ video {position: relative;}-.sticky {- position: sticky;-}-.inset-0 {inset: 0px;}@@ -641,10 +637,6 @@ video {bottom: 0px;}-.bottom-0 {- bottom: 0px;-}-.left-0 {left: 0px;}@@ -880,10 +872,6 @@ video {height: 100%;}-.min-h-\[350px\] {- min-height: 350px;-}-.w-1\/2 {width: 50%;}@@ -1021,10 +1009,6 @@ video {cursor: pointer;}-.resize {- resize: both;-}-.list-inside {list-style-position: inside;}@@ -1252,10 +1236,6 @@ video {border-left-width: 4px;}-.border-t {- border-top-width: 1px;-}-.border-gray-200 {--tw-border-opacity: 1;border-color: rgb(229 231 235 / var(--tw-border-opacity));@@ -2587,10 +2567,6 @@ video {display: block;}- .md\:inline {- display: inline;- }-.md\:flex {display: flex;}diff --git a/apps/server/AliasVault.Api/AliasVault.Api.csproj b/apps/server/AliasVault.Api/AliasVault.Api.csprojindex 20976b6cb..51aac2b42 100644--- a/apps/server/AliasVault.Api/AliasVault.Api.csproj+++ b/apps/server/AliasVault.Api/AliasVault.Api.csproj@@ -36,13 +36,11 @@<ItemGroup><ProjectReference Include="..\Databases\AliasServerDb\AliasServerDb.csproj" />- <ProjectReference Include="..\Shared\AliasVault.Shared.Core\AliasVault.Shared.Core.csproj" /><ProjectReference Include="..\Shared\AliasVault.Shared.Server\AliasVault.Shared.Server.csproj" /><ProjectReference Include="..\Shared\AliasVault.Shared\AliasVault.Shared.csproj" /><ProjectReference Include="..\Utilities\AliasVault.Auth\AliasVault.Auth.csproj" /><ProjectReference Include="..\Utilities\AliasVault.Logging\AliasVault.Logging.csproj" />- <ProjectReference Include="..\Utilities\Cryptography\AliasVault.Cryptography.Client\AliasVault.Cryptography.Client.csproj" />- <ProjectReference Include="..\Utilities\Cryptography\AliasVault.Cryptography.Server\AliasVault.Cryptography.Server.csproj" />+ <ProjectReference Include="..\Utilities\AliasVault.Cryptography\AliasVault.Cryptography.csproj" /><ProjectReference Include="..\Utilities\AliasVault.FaviconExtractor\AliasVault.FaviconExtractor.csproj" /></ItemGroup>diff --git a/apps/server/AliasVault.Api/Config.cs b/apps/server/AliasVault.Api/Config.csindex cbad69020..ebede6b57 100644--- a/apps/server/AliasVault.Api/Config.cs+++ b/apps/server/AliasVault.Api/Config.cs@@ -10,7 +10,7 @@ namespace AliasVault.Api;using AliasVault.Shared.Models.Configuration;/// <summary>-/// Configuration class for the Client project with values loaded from appsettings.json.+/// Configuration class for the API project with values loaded from appsettings.json./// </summary>public class Config : SharedConfig{diff --git a/apps/server/AliasVault.Api/Controllers/V1/AuthController.cs b/apps/server/AliasVault.Api/Controllers/V1/AuthController.csindex 0c4f95eaf..391c0a40f 100644--- a/apps/server/AliasVault.Api/Controllers/V1/AuthController.cs+++ b/apps/server/AliasVault.Api/Controllers/V1/AuthController.cs@@ -16,9 +16,8 @@ using AliasVault.Api.Headers;using AliasVault.Api.Helpers;using AliasVault.Auth;using AliasVault.Auth.IpAddress;-using AliasVault.Cryptography.Client;-using AliasVault.Cryptography.Server;-using AliasVault.Shared.Core;+using AliasVault.Cryptography;+using AliasVault.Shared;using AliasVault.Shared.Models.Enums;using AliasVault.Shared.Models.WebApi;using AliasVault.Shared.Models.WebApi.V1.Auth;diff --git a/apps/server/AliasVault.Api/Controllers/V1/VaultController.cs b/apps/server/AliasVault.Api/Controllers/V1/VaultController.csindex d9c1e53e6..a3ad7d639 100644--- a/apps/server/AliasVault.Api/Controllers/V1/VaultController.cs+++ b/apps/server/AliasVault.Api/Controllers/V1/VaultController.cs@@ -15,13 +15,12 @@ using AliasVault.Api.Services;using AliasVault.Api.Vault;using AliasVault.Api.Vault.RetentionRules;using AliasVault.Auth;-using AliasVault.Cryptography.Client;+using AliasVault.Cryptography;using AliasVault.Shared.Models.Enums;using AliasVault.Shared.Models.WebApi;using AliasVault.Shared.Models.WebApi.V1.PasswordChange;using AliasVault.Shared.Models.WebApi.V1.Vault;using AliasVault.Shared.Providers.Time;-using AliasVault.Shared.Server.Models;using AliasVault.Shared.Server.Services;using Asp.Versioning;using Microsoft.AspNetCore.Identity;diff --git a/apps/server/AliasVault.Api/Controllers/V2/AuthController.cs b/apps/server/AliasVault.Api/Controllers/V2/AuthController.csindex dcf812dda..c63985016 100644--- a/apps/server/AliasVault.Api/Controllers/V2/AuthController.cs+++ b/apps/server/AliasVault.Api/Controllers/V2/AuthController.cs@@ -18,9 +18,8 @@ using AliasVault.Api.Headers;using AliasVault.Api.Helpers;using AliasVault.Auth;using AliasVault.Auth.IpAddress;-using AliasVault.Cryptography.Client;-using AliasVault.Cryptography.Server;-using AliasVault.Shared.Core;+using AliasVault.Cryptography;+using AliasVault.Shared;using AliasVault.Shared.Models.Enums;using AliasVault.Shared.Models.WebApi;using AliasVault.Shared.Models.WebApi.V2.Auth;@@ -885,9 +884,9 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserM};// The payload is encrypted with a one-off symmetric key, which in turn is encrypted with the client's RSA public key.- var symmetricKey = Cryptography.Server.Encryption.GenerateRandomSymmetricKey();- var encryptedPayload = Cryptography.Server.Encryption.SymmetricEncrypt(JsonSerializer.Serialize(payload, MobileLoginRequestHelper.PayloadJsonOptions), symmetricKey);- var encryptedSymmetricKey = Cryptography.Server.Encryption.EncryptSymmetricKeyWithRsa(symmetricKey, clientPublicKey);+ var symmetricKey = Cryptography.Encryption.GenerateRandomSymmetricKey();+ var encryptedPayload = Cryptography.Encryption.SymmetricEncrypt(JsonSerializer.Serialize(payload, MobileLoginRequestHelper.PayloadJsonOptions), symmetricKey);+ var encryptedSymmetricKey = Cryptography.Encryption.EncryptSymmetricKeyWithRsa(symmetricKey, clientPublicKey);await authLoggingService.LogAuthEventSuccessAsync(user.UserName!, AuthEventType.MobileLogin);diff --git a/apps/server/AliasVault.Api/Controllers/V2/GroupsController.cs b/apps/server/AliasVault.Api/Controllers/V2/GroupsController.csindex 497cac563..a08e4ac28 100644--- a/apps/server/AliasVault.Api/Controllers/V2/GroupsController.cs+++ b/apps/server/AliasVault.Api/Controllers/V2/GroupsController.cs@@ -12,7 +12,7 @@ using AliasVault.Api.Controllers.Abstracts;using AliasVault.Api.Filters;using AliasVault.Api.Helpers;using AliasVault.Auth;-using AliasVault.Cryptography.Client;+using AliasVault.Cryptography;using AliasVault.Shared.Models.Enums;using AliasVault.Shared.Models.WebApi;using AliasVault.Shared.Models.WebApi.V2.Auth;diff --git a/apps/server/AliasVault.Api/Controllers/V2/StatusController.cs b/apps/server/AliasVault.Api/Controllers/V2/StatusController.csindex 64952039a..93dd47a0a 100644--- a/apps/server/AliasVault.Api/Controllers/V2/StatusController.cs+++ b/apps/server/AliasVault.Api/Controllers/V2/StatusController.cs@@ -12,7 +12,7 @@ using AliasVault.Api.Controllers.Abstracts;using AliasVault.Api.Headers;using AliasVault.Api.Helpers;using AliasVault.Api.Services;-using AliasVault.Shared.Core;+using AliasVault.Shared;using AliasVault.Shared.Models.Enums;using AliasVault.Shared.Models.WebApi;using AliasVault.Shared.Models.WebApi.V2.Vault;diff --git a/apps/server/AliasVault.Api/Helpers/AuthHelper.cs b/apps/server/AliasVault.Api/Helpers/AuthHelper.csindex a768e3d03..9a2bbc1b2 100644--- a/apps/server/AliasVault.Api/Helpers/AuthHelper.cs+++ b/apps/server/AliasVault.Api/Helpers/AuthHelper.cs@@ -10,11 +10,10 @@ namespace AliasVault.Api.Helpers;using AliasServerDb;using AliasVault.Api.Headers;using AliasVault.Api.Models;-using AliasVault.Cryptography.Client;+using AliasVault.Cryptography;using AliasVault.Shared.Models.Enums;using Microsoft.EntityFrameworkCore;using Microsoft.Extensions.Caching.Memory;-using SecureRemotePassword;/// <summary>/// AuthHelper class which contains helper methods for authentication.diff --git a/apps/server/AliasVault.Api/Helpers/EmailAccessHelper.cs b/apps/server/AliasVault.Api/Helpers/EmailAccessHelper.csindex fec6d8672..70f6af807 100644--- a/apps/server/AliasVault.Api/Helpers/EmailAccessHelper.cs+++ b/apps/server/AliasVault.Api/Helpers/EmailAccessHelper.cs@@ -8,7 +8,6 @@namespace AliasVault.Api.Helpers;using AliasServerDb;-using AliasVault.Shared.Models.Enums;using Microsoft.EntityFrameworkCore;/// <summary>diff --git a/apps/server/AliasVault.Api/Program.cs b/apps/server/AliasVault.Api/Program.csindex a28830b48..081da8aa1 100644--- a/apps/server/AliasVault.Api/Program.cs+++ b/apps/server/AliasVault.Api/Program.cs@@ -9,7 +9,6 @@ using System.Globalization;using System.Reflection;using System.Text;using System.Text.Json;-using System.Text.Json.Serialization;using AliasServerDb;using AliasServerDb.Configuration;using AliasVault.Api;@@ -17,7 +16,7 @@ using AliasVault.Api.Jwt;using AliasVault.Api.Services;using AliasVault.Auth;using AliasVault.Auth.IpAddress;-using AliasVault.Cryptography.Server;+using AliasVault.Cryptography;using AliasVault.Logging;using AliasVault.Shared.Models.Configuration;using AliasVault.Shared.Providers.Time;diff --git a/apps/server/Services/AliasVault.SmtpService/AliasVault.SmtpService.csproj b/apps/server/AliasVault.SmtpService/AliasVault.SmtpService.csprojsimilarity index 76%rename from apps/server/Services/AliasVault.SmtpService/AliasVault.SmtpService.csprojrename to apps/server/AliasVault.SmtpService/AliasVault.SmtpService.csprojindex 872cc6f0b..fd11157ae 100644--- a/apps/server/Services/AliasVault.SmtpService/AliasVault.SmtpService.csproj+++ b/apps/server/AliasVault.SmtpService/AliasVault.SmtpService.csproj@@ -21,7 +21,7 @@</PropertyGroup><ItemGroup>- <AdditionalFiles Include="..\..\stylecop.json" Link="stylecop.json" />+ <AdditionalFiles Include="..\stylecop.json" Link="stylecop.json" /></ItemGroup><ItemGroup>@@ -37,9 +37,9 @@</ItemGroup><ItemGroup>- <ProjectReference Include="..\..\Databases\AliasServerDb\AliasServerDb.csproj" />- <ProjectReference Include="..\..\Shared\AliasVault.Shared.Server\AliasVault.Shared.Server.csproj" />- <ProjectReference Include="..\..\Utilities\AliasVault.Logging\AliasVault.Logging.csproj" />- <ProjectReference Include="..\..\Utilities\Cryptography\AliasVault.Cryptography.Server\AliasVault.Cryptography.Server.csproj" />+ <ProjectReference Include="..\Databases\AliasServerDb\AliasServerDb.csproj" />+ <ProjectReference Include="..\Shared\AliasVault.Shared.Server\AliasVault.Shared.Server.csproj" />+ <ProjectReference Include="..\Utilities\AliasVault.Logging\AliasVault.Logging.csproj" />+ <ProjectReference Include="..\Utilities\AliasVault.Cryptography\AliasVault.Cryptography.csproj" /></ItemGroup></Project>diff --git a/apps/server/Services/AliasVault.SmtpService/Certificates/.gitignore b/apps/server/AliasVault.SmtpService/Certificates/.gitignoresimilarity index 100%rename from apps/server/Services/AliasVault.SmtpService/Certificates/.gitignorerename to apps/server/AliasVault.SmtpService/Certificates/.gitignorediff --git a/apps/server/Services/AliasVault.SmtpService/Certificates/README.md b/apps/server/AliasVault.SmtpService/Certificates/README.mdsimilarity index 100%rename from apps/server/Services/AliasVault.SmtpService/Certificates/README.mdrename to apps/server/AliasVault.SmtpService/Certificates/README.mddiff --git a/apps/server/Services/AliasVault.SmtpService/Config.cs b/apps/server/AliasVault.SmtpService/Config.cssimilarity index 100%rename from apps/server/Services/AliasVault.SmtpService/Config.csrename to apps/server/AliasVault.SmtpService/Config.csdiff --git a/apps/server/Services/AliasVault.SmtpService/Dockerfile b/apps/server/AliasVault.SmtpService/Dockerfilesimilarity index 95%rename from apps/server/Services/AliasVault.SmtpService/Dockerfilerename to apps/server/AliasVault.SmtpService/Dockerfileindex 7da8378f2..df14dce1c 100644--- a/apps/server/Services/AliasVault.SmtpService/Dockerfile+++ b/apps/server/AliasVault.SmtpService/Dockerfile@@ -10,7 +10,7 @@ WORKDIR /srcCOPY apps/server .# Build and publish the application-WORKDIR "/src/Services/AliasVault.SmtpService"+WORKDIR "/src/AliasVault.SmtpService"RUN dotnet publish "./AliasVault.SmtpService.csproj" -c "$BUILD_CONFIGURATION" \-a "$TARGETARCH" \-o /app/publish \diff --git a/apps/server/Services/AliasVault.SmtpService/Handlers/DatabaseMessageStore.cs b/apps/server/AliasVault.SmtpService/Handlers/DatabaseMessageStore.cssimilarity index 99%rename from apps/server/Services/AliasVault.SmtpService/Handlers/DatabaseMessageStore.csrename to apps/server/AliasVault.SmtpService/Handlers/DatabaseMessageStore.csindex 82026a46c..407c1a060 100644--- a/apps/server/Services/AliasVault.SmtpService/Handlers/DatabaseMessageStore.cs+++ b/apps/server/AliasVault.SmtpService/Handlers/DatabaseMessageStore.cs@@ -13,7 +13,7 @@ using System.IO.Compression;using System.Net.Mail;using System.Text.RegularExpressions;using AliasServerDb;-using AliasVault.Cryptography.Server;+using AliasVault.Cryptography;using Microsoft.EntityFrameworkCore;using MimeKit;using MimeKit.IO;diff --git a/apps/server/Services/AliasVault.SmtpService/Handlers/RecipientDomainMailboxFilter.cs b/apps/server/AliasVault.SmtpService/Handlers/RecipientDomainMailboxFilter.cssimilarity index 100%rename from apps/server/Services/AliasVault.SmtpService/Handlers/RecipientDomainMailboxFilter.csrename to apps/server/AliasVault.SmtpService/Handlers/RecipientDomainMailboxFilter.csdiff --git a/apps/server/Services/AliasVault.SmtpService/Program.cs b/apps/server/AliasVault.SmtpService/Program.cssimilarity index 98%rename from apps/server/Services/AliasVault.SmtpService/Program.csrename to apps/server/AliasVault.SmtpService/Program.csindex dfba09eb5..ab250bc89 100644--- a/apps/server/Services/AliasVault.SmtpService/Program.cs+++ b/apps/server/AliasVault.SmtpService/Program.cs@@ -10,14 +10,12 @@ using System.Reflection;using System.Security.Cryptography.X509Certificates;using AliasServerDb;using AliasServerDb.Configuration;-using AliasVault.Cryptography.Server;using AliasVault.Logging;using AliasVault.Shared.Server.Utilities;using AliasVault.SmtpService;using AliasVault.SmtpService.Handlers;using AliasVault.SmtpService.Workers;using AliasVault.WorkerStatus.ServiceExtensions;-using Microsoft.EntityFrameworkCore;using Microsoft.Extensions.Configuration;using SmtpServer;using SmtpServer.Storage;@@ -31,7 +29,7 @@ CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.InvariantCulture;builder.Configuration.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true);builder.Configuration.AddJsonFile($"appsettings.{builder.Environment.EnvironmentName}.json", optional: true, reloadOnChange: true);-builder.Services.ConfigureLogging(builder.Configuration, Assembly.GetExecutingAssembly().GetName().Name!, "../../../logs");+builder.Services.ConfigureLogging(builder.Configuration, Assembly.GetExecutingAssembly().GetName().Name!, "../../logs");// Create global config object, get values from environment variables.Config config = new Config();diff --git a/apps/server/Services/AliasVault.SmtpService/Properties/launchSettings.json b/apps/server/AliasVault.SmtpService/Properties/launchSettings.jsonsimilarity index 100%rename from apps/server/Services/AliasVault.SmtpService/Properties/launchSettings.jsonrename to apps/server/AliasVault.SmtpService/Properties/launchSettings.jsondiff --git a/apps/server/Services/AliasVault.SmtpService/Scripts/README.md b/apps/server/AliasVault.SmtpService/Scripts/README.mdsimilarity index 100%rename from apps/server/Services/AliasVault.SmtpService/Scripts/README.mdrename to apps/server/AliasVault.SmtpService/Scripts/README.mddiff --git a/apps/server/Services/AliasVault.SmtpService/Scripts/sendEmailCLI.sh b/apps/server/AliasVault.SmtpService/Scripts/sendEmailCLI.shsimilarity index 99%rename from apps/server/Services/AliasVault.SmtpService/Scripts/sendEmailCLI.shrename to apps/server/AliasVault.SmtpService/Scripts/sendEmailCLI.shindex 24a255b2f..f6fe4879b 100755--- a/apps/server/Services/AliasVault.SmtpService/Scripts/sendEmailCLI.sh+++ b/apps/server/AliasVault.SmtpService/Scripts/sendEmailCLI.sh@@ -61,7 +61,7 @@ generate_random_chinese() {}SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"-REPO_ROOT="$(cd "$SCRIPT_DIR/../../../../.." && pwd)"+REPO_ROOT="$(cd "$SCRIPT_DIR/../../../.." && pwd)"# ~10KB, stays under the 64KB threshold: exercises the inline attachment storage path.SMALL_ATTACHMENT_FILE="$REPO_ROOT/apps/browser-extension/public/icon/128.png"diff --git a/apps/server/Services/AliasVault.SmtpService/Workers/SmtpServerWorker.cs b/apps/server/AliasVault.SmtpService/Workers/SmtpServerWorker.cssimilarity index 100%rename from apps/server/Services/AliasVault.SmtpService/Workers/SmtpServerWorker.csrename to apps/server/AliasVault.SmtpService/Workers/SmtpServerWorker.csdiff --git a/apps/server/Services/AliasVault.SmtpService/appsettings.Development.json b/apps/server/AliasVault.SmtpService/appsettings.Development.jsonsimilarity index 100%rename from apps/server/Services/AliasVault.SmtpService/appsettings.Development.jsonrename to apps/server/AliasVault.SmtpService/appsettings.Development.jsondiff --git a/apps/server/Services/AliasVault.SmtpService/appsettings.json b/apps/server/AliasVault.SmtpService/appsettings.jsonsimilarity index 100%rename from apps/server/Services/AliasVault.SmtpService/appsettings.jsonrename to apps/server/AliasVault.SmtpService/appsettings.jsondiff --git a/apps/server/Services/AliasVault.TaskRunner/AliasVault.TaskRunner.csproj b/apps/server/AliasVault.TaskRunner/AliasVault.TaskRunner.csprojsimilarity index 74%rename from apps/server/Services/AliasVault.TaskRunner/AliasVault.TaskRunner.csprojrename to apps/server/AliasVault.TaskRunner/AliasVault.TaskRunner.csprojindex 69132bd73..0b8376598 100644--- a/apps/server/Services/AliasVault.TaskRunner/AliasVault.TaskRunner.csproj+++ b/apps/server/AliasVault.TaskRunner/AliasVault.TaskRunner.csproj@@ -21,7 +21,7 @@</PropertyGroup><ItemGroup>- <AdditionalFiles Include="..\..\stylecop.json" Link="stylecop.json" />+ <AdditionalFiles Include="..\stylecop.json" Link="stylecop.json" /></ItemGroup><ItemGroup>@@ -34,9 +34,8 @@</ItemGroup><ItemGroup>- <ProjectReference Include="..\..\Databases\AliasServerDb\AliasServerDb.csproj" />- <ProjectReference Include="..\..\Shared\AliasVault.Shared.Server\AliasVault.Shared.Server.csproj" />- <ProjectReference Include="..\..\Utilities\AliasVault.Logging\AliasVault.Logging.csproj" />- <ProjectReference Include="..\..\Utilities\Cryptography\AliasVault.Cryptography.Server\AliasVault.Cryptography.Server.csproj" />+ <ProjectReference Include="..\Databases\AliasServerDb\AliasServerDb.csproj" />+ <ProjectReference Include="..\Shared\AliasVault.Shared.Server\AliasVault.Shared.Server.csproj" />+ <ProjectReference Include="..\Utilities\AliasVault.Logging\AliasVault.Logging.csproj" /></ItemGroup></Project>diff --git a/apps/server/Services/AliasVault.TaskRunner/Dockerfile b/apps/server/AliasVault.TaskRunner/Dockerfilesimilarity index 95%rename from apps/server/Services/AliasVault.TaskRunner/Dockerfilerename to apps/server/AliasVault.TaskRunner/Dockerfileindex 9f9359e91..bc43a5876 100644--- a/apps/server/Services/AliasVault.TaskRunner/Dockerfile+++ b/apps/server/AliasVault.TaskRunner/Dockerfile@@ -7,7 +7,7 @@ WORKDIR /srcCOPY apps/server .# Build and publish the application-WORKDIR "/src/Services/AliasVault.TaskRunner"+WORKDIR "/src/AliasVault.TaskRunner"RUN dotnet publish "./AliasVault.TaskRunner.csproj" \-c "$BUILD_CONFIGURATION" \-a "$TARGETARCH" \diff --git a/apps/server/Services/AliasVault.TaskRunner/Program.cs b/apps/server/AliasVault.TaskRunner/Program.cssimilarity index 95%rename from apps/server/Services/AliasVault.TaskRunner/Program.csrename to apps/server/AliasVault.TaskRunner/Program.csindex 4313ec940..bbed2abda 100644--- a/apps/server/Services/AliasVault.TaskRunner/Program.cs+++ b/apps/server/AliasVault.TaskRunner/Program.cs@@ -13,12 +13,11 @@ using AliasVault.Shared.Server.Services;using AliasVault.TaskRunner.Tasks;using AliasVault.TaskRunner.Workers;using AliasVault.WorkerStatus.ServiceExtensions;-using Microsoft.EntityFrameworkCore;var builder = Host.CreateApplicationBuilder(args);builder.Configuration.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true);builder.Configuration.AddJsonFile($"appsettings.{builder.Environment.EnvironmentName}.json", optional: true, reloadOnChange: true);-builder.Services.ConfigureLogging(builder.Configuration, Assembly.GetExecutingAssembly().GetName().Name!, "../../../logs");+builder.Services.ConfigureLogging(builder.Configuration, Assembly.GetExecutingAssembly().GetName().Name!, "../../logs");builder.Services.AddAliasVaultDatabaseConfiguration(builder.Configuration);diff --git a/apps/server/Services/AliasVault.TaskRunner/Properties/launchSettings.json b/apps/server/AliasVault.TaskRunner/Properties/launchSettings.jsonsimilarity index 100%rename from apps/server/Services/AliasVault.TaskRunner/Properties/launchSettings.jsonrename to apps/server/AliasVault.TaskRunner/Properties/launchSettings.jsondiff --git a/apps/server/Services/AliasVault.TaskRunner/Tasks/DisabledEmailCleanupTask.cs b/apps/server/AliasVault.TaskRunner/Tasks/DisabledEmailCleanupTask.cssimilarity index 100%rename from apps/server/Services/AliasVault.TaskRunner/Tasks/DisabledEmailCleanupTask.csrename to apps/server/AliasVault.TaskRunner/Tasks/DisabledEmailCleanupTask.csdiff --git a/apps/server/Services/AliasVault.TaskRunner/Tasks/EmailCleanupTask.cs b/apps/server/AliasVault.TaskRunner/Tasks/EmailCleanupTask.cssimilarity index 100%rename from apps/server/Services/AliasVault.TaskRunner/Tasks/EmailCleanupTask.csrename to apps/server/AliasVault.TaskRunner/Tasks/EmailCleanupTask.csdiff --git a/apps/server/Services/AliasVault.TaskRunner/Tasks/EmailQuotaCleanupTask.cs b/apps/server/AliasVault.TaskRunner/Tasks/EmailQuotaCleanupTask.cssimilarity index 100%rename from apps/server/Services/AliasVault.TaskRunner/Tasks/EmailQuotaCleanupTask.csrename to apps/server/AliasVault.TaskRunner/Tasks/EmailQuotaCleanupTask.csdiff --git a/apps/server/Services/AliasVault.TaskRunner/Tasks/Interfaces/IMaintenanceTask.cs b/apps/server/AliasVault.TaskRunner/Tasks/Interfaces/IMaintenanceTask.cssimilarity index 100%rename from apps/server/Services/AliasVault.TaskRunner/Tasks/Interfaces/IMaintenanceTask.csrename to apps/server/AliasVault.TaskRunner/Tasks/Interfaces/IMaintenanceTask.csdiff --git a/apps/server/Services/AliasVault.TaskRunner/Tasks/LogCleanupTask.cs b/apps/server/AliasVault.TaskRunner/Tasks/LogCleanupTask.cssimilarity index 100%rename from apps/server/Services/AliasVault.TaskRunner/Tasks/LogCleanupTask.csrename to apps/server/AliasVault.TaskRunner/Tasks/LogCleanupTask.csdiff --git a/apps/server/Services/AliasVault.TaskRunner/Tasks/MaintenanceTaskRegistration.cs b/apps/server/AliasVault.TaskRunner/Tasks/MaintenanceTaskRegistration.cssimilarity index 100%rename from apps/server/Services/AliasVault.TaskRunner/Tasks/MaintenanceTaskRegistration.csrename to apps/server/AliasVault.TaskRunner/Tasks/MaintenanceTaskRegistration.csdiff --git a/apps/server/Services/AliasVault.TaskRunner/Tasks/OrphanedEmailCleanupTask.cs b/apps/server/AliasVault.TaskRunner/Tasks/OrphanedEmailCleanupTask.cssimilarity index 100%rename from apps/server/Services/AliasVault.TaskRunner/Tasks/OrphanedEmailCleanupTask.csrename to apps/server/AliasVault.TaskRunner/Tasks/OrphanedEmailCleanupTask.csdiff --git a/apps/server/Services/AliasVault.TaskRunner/Tasks/RefreshTokenCleanupTask.cs b/apps/server/AliasVault.TaskRunner/Tasks/RefreshTokenCleanupTask.cssimilarity index 100%rename from apps/server/Services/AliasVault.TaskRunner/Tasks/RefreshTokenCleanupTask.csrename to apps/server/AliasVault.TaskRunner/Tasks/RefreshTokenCleanupTask.csdiff --git a/apps/server/Services/AliasVault.TaskRunner/Tasks/UnlockKeyHistoryCleanupTask.cs b/apps/server/AliasVault.TaskRunner/Tasks/UnlockKeyHistoryCleanupTask.cssimilarity index 100%rename from apps/server/Services/AliasVault.TaskRunner/Tasks/UnlockKeyHistoryCleanupTask.csrename to apps/server/AliasVault.TaskRunner/Tasks/UnlockKeyHistoryCleanupTask.csdiff --git a/apps/server/Services/AliasVault.TaskRunner/Tasks/VaultBlobCleanupTask.cs b/apps/server/AliasVault.TaskRunner/Tasks/VaultBlobCleanupTask.cssimilarity index 100%rename from apps/server/Services/AliasVault.TaskRunner/Tasks/VaultBlobCleanupTask.csrename to apps/server/AliasVault.TaskRunner/Tasks/VaultBlobCleanupTask.csdiff --git a/apps/server/Services/AliasVault.TaskRunner/Workers/TaskRunnerWorker.cs b/apps/server/AliasVault.TaskRunner/Workers/TaskRunnerWorker.cssimilarity index 100%rename from apps/server/Services/AliasVault.TaskRunner/Workers/TaskRunnerWorker.csrename to apps/server/AliasVault.TaskRunner/Workers/TaskRunnerWorker.csdiff --git a/apps/server/Services/AliasVault.TaskRunner/appsettings.Development.json b/apps/server/AliasVault.TaskRunner/appsettings.Development.jsonsimilarity index 100%rename from apps/server/Services/AliasVault.TaskRunner/appsettings.Development.jsonrename to apps/server/AliasVault.TaskRunner/appsettings.Development.jsondiff --git a/apps/server/Services/AliasVault.TaskRunner/appsettings.json b/apps/server/AliasVault.TaskRunner/appsettings.jsonsimilarity index 100%rename from apps/server/Services/AliasVault.TaskRunner/appsettings.jsonrename to apps/server/AliasVault.TaskRunner/appsettings.jsondiff --git a/apps/server/Databases/AliasClientDb/Models/AppIcons.cs b/apps/server/Databases/AliasClientDb/Models/AppIcons.csdeleted file mode 100644index 6b99841f6..000000000--- a/apps/server/Databases/AliasClientDb/Models/AppIcons.cs+++ /dev/null@@ -1,67 +0,0 @@-// <auto-generated />-// This file is auto-generated from core/models/src/icons/AppIcons.ts-// Do not edit this file directly. Run 'npm run generate:models' to regenerate.--#nullable enable--namespace AliasClientDb.Models;--/// <summary>-/// The catalog of built-in icons a user can pick for an item, keyed by the Source a builtin logo row stores.-/// Single source of truth for all built-in icons across platforms.-/// </summary>-public static class AppIcons-{- /// <summary>Shopping icon SVG.</summary>- public const string Shopping = "<svg viewBox=\"0 0 32 32\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <path d=\"M4 5H7L9.5 19H24L27 9H10\" stroke=\"#f49541\" stroke-width=\"2.5\" stroke-linecap=\"round\" stroke-linejoin=\"round\"/>\n <circle cx=\"11\" cy=\"25\" r=\"2.5\" fill=\"#d68338\"/>\n <circle cx=\"22\" cy=\"25\" r=\"2.5\" fill=\"#d68338\"/>\n</svg>";-- /// <summary>Bank icon SVG.</summary>- public const string Bank = "<svg viewBox=\"0 0 32 32\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <path d=\"M16 4L29 11H3L16 4Z\" fill=\"#f49541\"/>\n <rect x=\"6\" y=\"13\" width=\"3\" height=\"11\" fill=\"#f49541\"/>\n <rect x=\"14.5\" y=\"13\" width=\"3\" height=\"11\" fill=\"#f49541\"/>\n <rect x=\"23\" y=\"13\" width=\"3\" height=\"11\" fill=\"#f49541\"/>\n <rect x=\"3\" y=\"25\" width=\"26\" height=\"3\" rx=\"1\" fill=\"#d68338\"/>\n</svg>";-- /// <summary>Mail icon SVG.</summary>- public const string Mail = "<svg viewBox=\"0 0 32 32\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <rect x=\"3\" y=\"7\" width=\"26\" height=\"18\" rx=\"3\" fill=\"#f49541\"/>\n <path d=\"M4 10L16 18L28 10\" stroke=\"#ffe096\" stroke-width=\"2.5\" stroke-linecap=\"round\" stroke-linejoin=\"round\"/>\n</svg>";-- /// <summary>Social icon SVG.</summary>- public const string Social = "<svg viewBox=\"0 0 32 32\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <circle cx=\"12\" cy=\"11\" r=\"5\" fill=\"#f49541\"/>\n <path d=\"M3 27C3 21.5 7 18 12 18C17 18 21 21.5 21 27H3Z\" fill=\"#f49541\"/>\n <circle cx=\"23\" cy=\"12\" r=\"4\" fill=\"#d68338\"/>\n <path d=\"M20 27C20 22 23 19.5 26 19.5C28.5 19.5 30 22 30 27H20Z\" fill=\"#d68338\"/>\n</svg>";-- /// <summary>Work icon SVG.</summary>- public const string Work = "<svg viewBox=\"0 0 32 32\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <path d=\"M12 8V6C12 5 12.9 4 14 4H18C19.1 4 20 5 20 6V8\" stroke=\"#d68338\" stroke-width=\"2.5\" stroke-linecap=\"round\"/>\n <rect x=\"3\" y=\"8\" width=\"26\" height=\"18\" rx=\"3\" fill=\"#f49541\"/>\n <rect x=\"3\" y=\"15\" width=\"26\" height=\"2.5\" fill=\"#d68338\"/>\n <rect x=\"13.5\" y=\"14\" width=\"5\" height=\"5\" rx=\"1\" fill=\"#ffe096\"/>\n</svg>";-- /// <summary>Game icon SVG.</summary>- public const string Game = "<svg viewBox=\"0 0 32 32\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <rect x=\"2\" y=\"9\" width=\"28\" height=\"15\" rx=\"7.5\" fill=\"#f49541\"/>\n <rect x=\"7\" y=\"14\" width=\"6\" height=\"2\" rx=\"1\" fill=\"#ffe096\"/>\n <rect x=\"9\" y=\"12\" width=\"2\" height=\"6\" rx=\"1\" fill=\"#ffe096\"/>\n <circle cx=\"21\" cy=\"14.5\" r=\"1.8\" fill=\"#d68338\"/>\n <circle cx=\"24.5\" cy=\"18\" r=\"1.8\" fill=\"#d68338\"/>\n</svg>";-- /// <summary>Media icon SVG.</summary>- public const string Media = "<svg viewBox=\"0 0 32 32\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <rect x=\"3\" y=\"5\" width=\"26\" height=\"22\" rx=\"4\" fill=\"#f49541\"/>\n <path d=\"M13 11.5L21 16L13 20.5V11.5Z\" fill=\"#ffe096\"/>\n</svg>";-- /// <summary>Travel icon SVG.</summary>- public const string Travel = "<svg viewBox=\"0 0 32 32\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <path d=\"M15 3C16.1 3 17 3.9 17 5V12.5L29 19V22L17 18.5V24L20 26.5V29L15 27.5L10 29V26.5L13 24V18.5L1 22V19L13 12.5V5C13 3.9 13.9 3 15 3Z\" fill=\"#f49541\"/>\n</svg>";-- /// <summary>Health icon SVG.</summary>- public const string Health = "<svg viewBox=\"0 0 32 32\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <path d=\"M16 27C16 27 3 19.5 3 11.5C3 7.4 6.1 4.5 9.8 4.5C12.2 4.5 14.5 5.9 16 8C17.5 5.9 19.8 4.5 22.2 4.5C25.9 4.5 29 7.4 29 11.5C29 19.5 16 27 16 27Z\" fill=\"#f49541\"/>\n <path d=\"M14.5 11H17.5V14H20.5V17H17.5V20H14.5V17H11.5V14H14.5V11Z\" fill=\"#ffe096\"/>\n</svg>";-- /// <summary>Dev icon SVG.</summary>- public const string Dev = "<svg viewBox=\"0 0 32 32\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <rect x=\"2\" y=\"5\" width=\"28\" height=\"22\" rx=\"4\" fill=\"#f49541\"/>\n <path d=\"M12 12L8 16.5L12 21\" stroke=\"#ffe096\" stroke-width=\"2.5\" stroke-linecap=\"round\" stroke-linejoin=\"round\"/>\n <path d=\"M20 12L24 16.5L20 21\" stroke=\"#ffe096\" stroke-width=\"2.5\" stroke-linecap=\"round\" stroke-linejoin=\"round\"/>\n</svg>";-- /// <summary>- /// Gets the SVG for an icon key, or null when the key is unknown to this client.- /// </summary>- /// <param name="key">The icon key.</param>- /// <returns>The SVG markup, or null.</returns>- public static string? GetSvg(string key)- {- return key switch- {- "Shopping" => Shopping,- "Bank" => Bank,- "Mail" => Mail,- "Social" => Social,- "Work" => Work,- "Game" => Game,- "Media" => Media,- "Travel" => Travel,- "Health" => Health,- "Dev" => Dev,- _ => null,- };- }-}diff --git a/apps/server/Databases/AliasClientDb/Models/FieldKey.cs b/apps/server/Databases/AliasClientDb/Models/FieldKey.csdeleted file mode 100644index 594a3bb60..000000000--- a/apps/server/Databases/AliasClientDb/Models/FieldKey.cs+++ /dev/null@@ -1,87 +0,0 @@-// <auto-generated />-// This file is auto-generated from core/models/src/vault/FieldKey.ts-// Do not edit this file directly. Run 'npm run generate:models' to regenerate.--namespace AliasClientDb.Models;--/// <summary>-/// System field keys for the field-based data model.-/// These keys map to FieldDefinition.FieldKey values.-/// </summary>-public static class FieldKey-{- /// <summary>- /// Type: Text- /// </summary>- public const string LoginUsername = "login.username";-- /// <summary>- /// Type: Password- /// </summary>- public const string LoginPassword = "login.password";-- /// <summary>- /// Type: Email- /// </summary>- public const string LoginEmail = "login.email";-- /// <summary>- /// Type: URL- /// </summary>- public const string LoginUrl = "login.url";-- /// <summary>- /// Type: Text- /// </summary>- public const string CardNumber = "card.number";-- /// <summary>- /// Type: Text- /// </summary>- public const string CardCardholderName = "card.cardholder_name";-- /// <summary>- /// Type: Text- /// </summary>- public const string CardExpiryMonth = "card.expiry_month";-- /// <summary>- /// Type: Text- /// </summary>- public const string CardExpiryYear = "card.expiry_year";-- /// <summary>- /// Type: Password- /// </summary>- public const string CardCvv = "card.cvv";-- /// <summary>- /// Type: Password- /// </summary>- public const string CardPin = "card.pin";-- /// <summary>- /// Type: Text- /// </summary>- public const string AliasFirstName = "alias.first_name";-- /// <summary>- /// Type: Text- /// </summary>- public const string AliasLastName = "alias.last_name";-- /// <summary>- /// Type: Text- /// </summary>- public const string AliasGender = "alias.gender";-- /// <summary>- /// Type: Date- /// </summary>- public const string AliasBirthdate = "alias.birthdate";-- /// <summary>- /// Type: TextArea- /// </summary>- public const string NotesContent = "notes.content";-}diff --git a/apps/server/Databases/AliasClientDb/Models/FieldType.cs b/apps/server/Databases/AliasClientDb/Models/FieldType.csdeleted file mode 100644index fc8eb45b7..000000000--- a/apps/server/Databases/AliasClientDb/Models/FieldType.cs+++ /dev/null@@ -1,73 +0,0 @@-// <auto-generated />-// This file is auto-generated from core/models/src/vault/Item.ts-// Do not edit this file directly. Run 'npm run generate:models' to regenerate.--#nullable enable--namespace AliasClientDb.Models;--/// <summary>-/// Field types for rendering and validation.-/// </summary>-public static class FieldType-{- /// <summary>- /// Text field type.- /// </summary>- public const string Text = "Text";-- /// <summary>- /// Password field type.- /// </summary>- public const string Password = "Password";-- /// <summary>- /// Hidden field type.- /// </summary>- public const string Hidden = "Hidden";-- /// <summary>- /// Email field type.- /// </summary>- public const string Email = "Email";-- /// <summary>- /// URL field type.- /// </summary>- public const string URL = "URL";-- /// <summary>- /// Date field type.- /// </summary>- public const string Date = "Date";-- /// <summary>- /// Number field type.- /// </summary>- public const string Number = "Number";-- /// <summary>- /// Phone field type.- /// </summary>- public const string Phone = "Phone";-- /// <summary>- /// TextArea field type.- /// </summary>- public const string TextArea = "TextArea";-- /// <summary>- /// All available field types.- /// </summary>- public static readonly string[] All = { Text, Password, Hidden, Email, URL, Date, Number, Phone, TextArea };-- /// <summary>- /// Checks if a string value is a valid field type.- /// </summary>- /// <param name="value">The value to check.</param>- /// <returns>True if the value is a valid field type.</returns>- public static bool IsValid(string? value)- {- return value == Text || value == Password || value == Hidden || value == Email || value == URL || value == Date || value == Number || value == Phone || value == TextArea;- }-}diff --git a/apps/server/Databases/AliasClientDb/Models/FieldTypeKind.cs b/apps/server/Databases/AliasClientDb/Models/FieldTypeKind.csdeleted file mode 100644index cfcef5eb1..000000000--- a/apps/server/Databases/AliasClientDb/Models/FieldTypeKind.cs+++ /dev/null@@ -1,105 +0,0 @@-// <auto-generated />-// This file is auto-generated from core/models/src/vault/Item.ts-// Do not edit this file directly. Run 'npm run generate:models' to regenerate.--#nullable enable--namespace AliasClientDb.Models;--/// <summary>-/// Strongly-typed field types. Mirrors the string constants in <see cref="FieldType"/> so that-/// callers (e.g. importers) are forced to pick a known field type at compile time. Convert to and-/// from the canonical <see cref="FieldType"/> strings with <see cref="FieldTypeKindExtensions"/>.-/// </summary>-public enum FieldTypeKind-{- /// <summary>- /// Text field type.- /// </summary>- Text,-- /// <summary>- /// Password field type.- /// </summary>- Password,-- /// <summary>- /// Hidden field type.- /// </summary>- Hidden,-- /// <summary>- /// Email field type.- /// </summary>- Email,-- /// <summary>- /// URL field type.- /// </summary>- URL,-- /// <summary>- /// Date field type.- /// </summary>- Date,-- /// <summary>- /// Number field type.- /// </summary>- Number,-- /// <summary>- /// Phone field type.- /// </summary>- Phone,-- /// <summary>- /// TextArea field type.- /// </summary>- TextArea,-}--/// <summary>-/// Conversion helpers between <see cref="FieldTypeKind"/> and the canonical <see cref="FieldType"/> strings.-/// </summary>-public static class FieldTypeKindExtensions-{- /// <summary>- /// Converts a <see cref="FieldTypeKind"/> to its canonical <see cref="FieldType"/> string.- /// </summary>- /// <param name="kind">The field type kind.</param>- /// <returns>The canonical field type string.</returns>- public static string ToFieldTypeString(this FieldTypeKind kind) => kind switch- {- FieldTypeKind.Text => FieldType.Text,- FieldTypeKind.Password => FieldType.Password,- FieldTypeKind.Hidden => FieldType.Hidden,- FieldTypeKind.Email => FieldType.Email,- FieldTypeKind.URL => FieldType.URL,- FieldTypeKind.Date => FieldType.Date,- FieldTypeKind.Number => FieldType.Number,- FieldTypeKind.Phone => FieldType.Phone,- FieldTypeKind.TextArea => FieldType.TextArea,- _ => FieldType.Text,- };-- /// <summary>- /// Converts a canonical <see cref="FieldType"/> string to a <see cref="FieldTypeKind"/>.- /// Unknown or null values fall back to <see cref="FieldTypeKind.Text"/>.- /// </summary>- /// <param name="value">The canonical field type string.</param>- /// <returns>The matching field type kind.</returns>- public static FieldTypeKind ToFieldTypeKind(string? value) => value switch- {- FieldType.Text => FieldTypeKind.Text,- FieldType.Password => FieldTypeKind.Password,- FieldType.Hidden => FieldTypeKind.Hidden,- FieldType.Email => FieldTypeKind.Email,- FieldType.URL => FieldTypeKind.URL,- FieldType.Date => FieldTypeKind.Date,- FieldType.Number => FieldTypeKind.Number,- FieldType.Phone => FieldTypeKind.Phone,- FieldType.TextArea => FieldTypeKind.TextArea,- _ => FieldTypeKind.Text,- };-}diff --git a/apps/server/Databases/AliasClientDb/Models/ItemType.cs b/apps/server/Databases/AliasClientDb/Models/ItemType.csdeleted file mode 100644index 9f7ab8225..000000000--- a/apps/server/Databases/AliasClientDb/Models/ItemType.cs+++ /dev/null@@ -1,48 +0,0 @@-// <auto-generated />-// This file is auto-generated from core/models/src/vault/Item.ts-// Do not edit this file directly. Run 'npm run generate:models' to regenerate.--#nullable enable--namespace AliasClientDb.Models;--/// <summary>-/// Item types supported by the vault.-/// </summary>-public static class ItemType-{- /// <summary>- /// Login item type.- /// </summary>- public const string Login = "Login";-- /// <summary>- /// Alias item type.- /// </summary>- public const string Alias = "Alias";-- /// <summary>- /// CreditCard item type.- /// </summary>- public const string CreditCard = "CreditCard";-- /// <summary>- /// Note item type.- /// </summary>- public const string Note = "Note";-- /// <summary>- /// All available item types.- /// </summary>- public static readonly string[] All = { Login, Alias, CreditCard, Note };-- /// <summary>- /// Checks if a string value is a valid item type.- /// </summary>- /// <param name="value">The value to check.</param>- /// <returns>True if the value is a valid item type.</returns>- public static bool IsValid(string? value)- {- return value == Login || value == Alias || value == CreditCard || value == Note;- }-}diff --git a/apps/server/Databases/AliasClientDb/Models/ItemTypeIcons.cs b/apps/server/Databases/AliasClientDb/Models/ItemTypeIcons.csdeleted file mode 100644index f6219ea61..000000000--- a/apps/server/Databases/AliasClientDb/Models/ItemTypeIcons.cs+++ /dev/null@@ -1,33 +0,0 @@-// <auto-generated />-// This file is auto-generated from core/models/src/icons/ItemTypeIcons.ts-// Do not edit this file directly. Run 'npm run generate:models' to regenerate.--namespace AliasClientDb.Models;--/// <summary>-/// Centralized SVG icon definitions for item types.-/// Single source of truth for all item type icons across platforms.-/// </summary>-public static class ItemTypeIcons-{- /// <summary>Placeholder icon SVG.</summary>- public const string Placeholder = "<svg viewBox=\"0 0 32 32\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <circle cx=\"10\" cy=\"10\" r=\"6.5\" fill=\"none\" stroke=\"#f49541\" stroke-width=\"2.5\"/>\n <circle cx=\"10\" cy=\"10\" r=\"2.5\" fill=\"none\" stroke=\"#f49541\" stroke-width=\"2\"/>\n <path d=\"M15 15L27 27\" stroke=\"#f49541\" stroke-width=\"2.5\" stroke-linecap=\"round\"/>\n <path d=\"M19 19L23 15\" stroke=\"#f49541\" stroke-width=\"2.5\" stroke-linecap=\"round\"/>\n <path d=\"M24 24L28 20\" stroke=\"#f49541\" stroke-width=\"2.5\" stroke-linecap=\"round\"/>\n</svg>";-- /// <summary>Note icon SVG.</summary>- public const string Note = "<svg viewBox=\"0 0 32 32\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <path d=\"M8 4C6.9 4 6 4.9 6 6V26C6 27.1 6.9 28 8 28H24C25.1 28 26 27.1 26 26V11L19 4H8Z\" fill=\"#f49541\"/>\n <path d=\"M19 4V11H26L19 4Z\" fill=\"#d68338\"/>\n <rect x=\"10\" y=\"14\" width=\"12\" height=\"1.5\" rx=\"0.75\" fill=\"#ffe096\"/>\n <rect x=\"10\" y=\"18\" width=\"10\" height=\"1.5\" rx=\"0.75\" fill=\"#ffe096\"/>\n <rect x=\"10\" y=\"22\" width=\"8\" height=\"1.5\" rx=\"0.75\" fill=\"#ffe096\"/>\n</svg>";-- /// <summary>CreditCard icon SVG.</summary>- public const string CreditCard = "<svg viewBox=\"0 0 32 32\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <rect x=\"2\" y=\"6\" width=\"28\" height=\"20\" rx=\"3\" fill=\"#f49541\"/>\n <rect x=\"2\" y=\"11\" width=\"28\" height=\"4\" fill=\"#d68338\"/>\n <rect x=\"5\" y=\"18\" width=\"8\" height=\"2\" rx=\"1\" fill=\"#ffe096\"/>\n <rect x=\"5\" y=\"22\" width=\"5\" height=\"1.5\" rx=\"0.75\" fill=\"#fbcb74\"/>\n</svg>";-- /// <summary>Visa icon SVG.</summary>- public const string Visa = "<svg viewBox=\"0 0 32 32\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <rect x=\"2\" y=\"6\" width=\"28\" height=\"20\" rx=\"3\" fill=\"#f49541\"/>\n <path d=\"M13.5 13L11.5 19H10L8.5 14.5C8.5 14.5 8.35 14 8 14C7.65 14 7 13.8 7 13.8L7.05 13.5H9.5C9.85 13.5 10.15 13.75 10.2 14.1L10.8 17L12.5 13.5H13.5V13ZM15 19H14L15 13H16L15 19ZM20 13.5C20 13.5 19.4 13.3 18.7 13.3C17.35 13.3 16.4 14 16.4 15C16.4 15.8 17.1 16.2 17.65 16.5C18.2 16.8 18.4 17 18.4 17.2C18.4 17.5 18.05 17.7 17.6 17.7C17 17.7 16.5 17.5 16.5 17.5L16.3 18.7C16.3 18.7 16.9 19 17.7 19C19.2 19 20.1 18.2 20.1 17.1C20.1 15.7 18.4 15.6 18.4 15C18.4 14.7 18.7 14.5 19.15 14.5C19.6 14.5 20.1 14.7 20.1 14.7L20.3 13.5H20V13.5ZM24 19L23.1 13.5H22C21.7 13.5 21.45 13.7 21.35 13.95L19 19H20.5L20.8 18H22.7L22.9 19H24ZM21.2 17L22 14.5L22.45 17H21.2Z\" fill=\"#ffe096\"/>\n</svg>";-- /// <summary>Mastercard icon SVG.</summary>- public const string Mastercard = "<svg viewBox=\"0 0 32 32\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <rect x=\"2\" y=\"6\" width=\"28\" height=\"20\" rx=\"3\" fill=\"#f49541\"/>\n <circle cx=\"13\" cy=\"16\" r=\"5\" fill=\"#d68338\"/>\n <circle cx=\"19\" cy=\"16\" r=\"5\" fill=\"#ffe096\"/>\n <path d=\"M16 12.5C17.1 13.4 17.8 14.6 17.8 16C17.8 17.4 17.1 18.6 16 19.5C14.9 18.6 14.2 17.4 14.2 16C14.2 14.6 14.9 13.4 16 12.5Z\" fill=\"#fbcb74\"/>\n</svg>";-- /// <summary>Amex icon SVG.</summary>- public const string Amex = "<svg viewBox=\"0 0 32 32\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <rect x=\"2\" y=\"6\" width=\"28\" height=\"20\" rx=\"3\" fill=\"#f49541\"/>\n <text x=\"16\" y=\"18\" text-anchor=\"middle\" fill=\"#ffe096\" font-size=\"8\" font-weight=\"bold\" font-family=\"Arial, sans-serif\">AMEX</text>\n</svg>";-- /// <summary>Discover icon SVG.</summary>- public const string Discover = "<svg viewBox=\"0 0 32 32\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <rect x=\"2\" y=\"6\" width=\"28\" height=\"20\" rx=\"3\" fill=\"#f49541\"/>\n <circle cx=\"20\" cy=\"16\" r=\"4\" fill=\"#ffe096\"/>\n <path d=\"M7 14H8.5C9.3 14 10 14.7 10 15.5C10 16.3 9.3 17 8.5 17H7V14Z\" fill=\"#ffe096\"/>\n <rect x=\"11\" y=\"14\" width=\"1.5\" height=\"3\" fill=\"#ffe096\"/>\n <path d=\"M14 15C14 14.4 14.4 14 15 14C15.3 14 15.5 14.1 15.7 14.3L16.5 13.5C16.1 13.2 15.6 13 15 13C13.9 13 13 13.9 13 15C13 16.1 13.9 17 15 17C15.6 17 16.1 16.8 16.5 16.5L15.7 15.7C15.5 15.9 15.3 16 15 16C14.4 16 14 15.6 14 15Z\" fill=\"#ffe096\"/>\n</svg>";-}diff --git a/apps/server/Databases/AliasClientDb/Models/PasswordGeneratorDefaults.cs b/apps/server/Databases/AliasClientDb/Models/PasswordGeneratorDefaults.csdeleted file mode 100644index cd5f765c6..000000000--- a/apps/server/Databases/AliasClientDb/Models/PasswordGeneratorDefaults.cs+++ /dev/null@@ -1,44 +0,0 @@-// <auto-generated />-// This file is auto-generated from core/models/src/defaults/PasswordGeneratorDefaults.ts-// Do not edit this file directly. Run 'core/models/build.sh' (or-// 'node core/models/scripts/generate-password-defaults.cjs') to regenerate.--#nullable enable--namespace AliasClientDb.Models;--/// <summary>-/// Password generator defaults shared across all AliasVault clients.-/// </summary>-public static class PasswordGeneratorDefaults-{- /// <summary>- /// Default length of a generated basic password.- /// </summary>- public const int DefaultPasswordLength = 18;-- /// <summary>- /// Minimum password length offered by the UI length slider.- /// </summary>- public const int MinPasswordLength = 8;-- /// <summary>- /// Maximum password length (also the hard cap enforced by the generator).- /// </summary>- public const int MaxPasswordLength = 256;-- /// <summary>- /// Default number of words in a generated Diceware passphrase.- /// </summary>- public const int DefaultWordCount = 5;-- /// <summary>- /// Minimum number of words offered by the UI word-count slider.- /// </summary>- public const int MinWordCount = 3;-- /// <summary>- /// Maximum number of words (also the hard cap enforced by the generator).- /// </summary>- public const int MaxWordCount = 10;-}diff --git a/apps/server/Databases/AliasClientDb/Models/SystemFieldRegistry.cs b/apps/server/Databases/AliasClientDb/Models/SystemFieldRegistry.csdeleted file mode 100644index 7aa60a714..000000000--- a/apps/server/Databases/AliasClientDb/Models/SystemFieldRegistry.cs+++ /dev/null@@ -1,289 +0,0 @@-// <auto-generated />-// This file is auto-generated from core/models/src/vault/SystemFieldRegistry.ts-// Do not edit this file directly. Run 'npm run generate:models' to regenerate.--#nullable enable--namespace AliasClientDb.Models;--/// <summary>-/// Field categories for grouping in UI.-/// </summary>-public enum FieldCategory-{- /// <summary>Primary fields.</summary>- Primary,- /// <summary>Login fields.</summary>- Login,- /// <summary>Alias fields.</summary>- Alias,- /// <summary>Card fields.</summary>- Card,- /// <summary>Custom fields.</summary>- Custom,- /// <summary>Notes fields.</summary>- Notes,- /// <summary>Metadata fields.</summary>- Metadata-}--/// <summary>-/// Per-item-type configuration for a system field.-/// </summary>-/// <param name="ShowByDefault">Whether this field is shown by default in create mode (vs. hidden behind an "add" button)</param>-public record ItemTypeFieldConfig(bool ShowByDefault);--/// <summary>-/// System field definition with metadata.-/// </summary>-/// <param name="FieldKey">Unique system field key (e.g., 'login.username')</param>-/// <param name="FieldType">Field type for rendering/validation</param>-/// <param name="IsHidden">Whether field is hidden/masked by default</param>-/// <param name="IsMultiValue">Whether field supports multiple values</param>-/// <param name="ApplicableToTypes">ApplicableToTypes</param>-/// <param name="EnableHistory">Whether to track field value history</param>-/// <param name="Category">Category for grouping in UI. 'Primary' fields are shown in the name block.</param>-/// <param name="DefaultDisplayOrder">Default display order within category (lower = first)</param>-public record SystemFieldDefinition(- string FieldKey,- string FieldType,- bool IsHidden,- bool IsMultiValue,- IReadOnlyDictionary<string, ItemTypeFieldConfig> ApplicableToTypes,- bool EnableHistory,- FieldCategory Category,- int DefaultDisplayOrder);--/// <summary>-/// Registry of all system-defined fields.-/// These fields are immutable and their metadata is defined in code.-/// </summary>-public static class SystemFieldRegistry-{- /// <summary>- /// All system field definitions indexed by field key.- /// </summary>- public static readonly IReadOnlyDictionary<string, SystemFieldDefinition> Fields =- new Dictionary<string, SystemFieldDefinition>- {- [FieldKey.LoginEmail] = new SystemFieldDefinition(- FieldKey: "login.email",- FieldType: "Email",- IsHidden: false,- IsMultiValue: false,- ApplicableToTypes: new Dictionary<string, ItemTypeFieldConfig> { ["Login"] = new ItemTypeFieldConfig(false), ["Alias"] = new ItemTypeFieldConfig(true) },- EnableHistory: true,- Category: FieldCategory.Login,- DefaultDisplayOrder: 10),- [FieldKey.LoginUsername] = new SystemFieldDefinition(- FieldKey: "login.username",- FieldType: "Text",- IsHidden: false,- IsMultiValue: false,- ApplicableToTypes: new Dictionary<string, ItemTypeFieldConfig> { ["Login"] = new ItemTypeFieldConfig(true), ["Alias"] = new ItemTypeFieldConfig(true) },- EnableHistory: true,- Category: FieldCategory.Login,- DefaultDisplayOrder: 15),- [FieldKey.LoginPassword] = new SystemFieldDefinition(- FieldKey: "login.password",- FieldType: "Password",- IsHidden: true,- IsMultiValue: false,- ApplicableToTypes: new Dictionary<string, ItemTypeFieldConfig> { ["Login"] = new ItemTypeFieldConfig(true), ["Alias"] = new ItemTypeFieldConfig(true) },- EnableHistory: true,- Category: FieldCategory.Login,- DefaultDisplayOrder: 20),- [FieldKey.LoginUrl] = new SystemFieldDefinition(- FieldKey: "login.url",- FieldType: "URL",- IsHidden: false,- IsMultiValue: true,- ApplicableToTypes: new Dictionary<string, ItemTypeFieldConfig> { ["Login"] = new ItemTypeFieldConfig(true), ["Alias"] = new ItemTypeFieldConfig(true) },- EnableHistory: false,- Category: FieldCategory.Primary,- DefaultDisplayOrder: 5),- [FieldKey.AliasFirstName] = new SystemFieldDefinition(- FieldKey: "alias.first_name",- FieldType: "Text",- IsHidden: false,- IsMultiValue: false,- ApplicableToTypes: new Dictionary<string, ItemTypeFieldConfig> { ["Alias"] = new ItemTypeFieldConfig(true) },- EnableHistory: false,- Category: FieldCategory.Alias,- DefaultDisplayOrder: 20),- [FieldKey.AliasLastName] = new SystemFieldDefinition(- FieldKey: "alias.last_name",- FieldType: "Text",- IsHidden: false,- IsMultiValue: false,- ApplicableToTypes: new Dictionary<string, ItemTypeFieldConfig> { ["Alias"] = new ItemTypeFieldConfig(true) },- EnableHistory: false,- Category: FieldCategory.Alias,- DefaultDisplayOrder: 30),- [FieldKey.AliasGender] = new SystemFieldDefinition(- FieldKey: "alias.gender",- FieldType: "Text",- IsHidden: false,- IsMultiValue: false,- ApplicableToTypes: new Dictionary<string, ItemTypeFieldConfig> { ["Alias"] = new ItemTypeFieldConfig(true) },- EnableHistory: false,- Category: FieldCategory.Alias,- DefaultDisplayOrder: 50),- [FieldKey.AliasBirthdate] = new SystemFieldDefinition(- FieldKey: "alias.birthdate",- FieldType: "Date",- IsHidden: false,- IsMultiValue: false,- ApplicableToTypes: new Dictionary<string, ItemTypeFieldConfig> { ["Alias"] = new ItemTypeFieldConfig(true) },- EnableHistory: false,- Category: FieldCategory.Alias,- DefaultDisplayOrder: 60),- [FieldKey.CardCardholderName] = new SystemFieldDefinition(- FieldKey: "card.cardholder_name",- FieldType: "Text",- IsHidden: false,- IsMultiValue: false,- ApplicableToTypes: new Dictionary<string, ItemTypeFieldConfig> { ["CreditCard"] = new ItemTypeFieldConfig(true) },- EnableHistory: false,- Category: FieldCategory.Card,- DefaultDisplayOrder: 10),- [FieldKey.CardNumber] = new SystemFieldDefinition(- FieldKey: "card.number",- FieldType: "Hidden",- IsHidden: true,- IsMultiValue: false,- ApplicableToTypes: new Dictionary<string, ItemTypeFieldConfig> { ["CreditCard"] = new ItemTypeFieldConfig(true) },- EnableHistory: false,- Category: FieldCategory.Card,- DefaultDisplayOrder: 20),- [FieldKey.CardExpiryMonth] = new SystemFieldDefinition(- FieldKey: "card.expiry_month",- FieldType: "Text",- IsHidden: false,- IsMultiValue: false,- ApplicableToTypes: new Dictionary<string, ItemTypeFieldConfig> { ["CreditCard"] = new ItemTypeFieldConfig(true) },- EnableHistory: false,- Category: FieldCategory.Card,- DefaultDisplayOrder: 30),- [FieldKey.CardExpiryYear] = new SystemFieldDefinition(- FieldKey: "card.expiry_year",- FieldType: "Text",- IsHidden: false,- IsMultiValue: false,- ApplicableToTypes: new Dictionary<string, ItemTypeFieldConfig> { ["CreditCard"] = new ItemTypeFieldConfig(true) },- EnableHistory: false,- Category: FieldCategory.Card,- DefaultDisplayOrder: 40),- [FieldKey.CardCvv] = new SystemFieldDefinition(- FieldKey: "card.cvv",- FieldType: "Hidden",- IsHidden: true,- IsMultiValue: false,- ApplicableToTypes: new Dictionary<string, ItemTypeFieldConfig> { ["CreditCard"] = new ItemTypeFieldConfig(true) },- EnableHistory: false,- Category: FieldCategory.Card,- DefaultDisplayOrder: 50),- [FieldKey.CardPin] = new SystemFieldDefinition(- FieldKey: "card.pin",- FieldType: "Hidden",- IsHidden: true,- IsMultiValue: false,- ApplicableToTypes: new Dictionary<string, ItemTypeFieldConfig> { ["CreditCard"] = new ItemTypeFieldConfig(true) },- EnableHistory: false,- Category: FieldCategory.Card,- DefaultDisplayOrder: 60),- [FieldKey.NotesContent] = new SystemFieldDefinition(- FieldKey: "notes.content",- FieldType: "TextArea",- IsHidden: false,- IsMultiValue: false,- ApplicableToTypes: new Dictionary<string, ItemTypeFieldConfig> { ["Login"] = new ItemTypeFieldConfig(false), ["Alias"] = new ItemTypeFieldConfig(false), ["CreditCard"] = new ItemTypeFieldConfig(false), ["Note"] = new ItemTypeFieldConfig(true) },- EnableHistory: false,- Category: FieldCategory.Notes,- DefaultDisplayOrder: 100)- };-- /// <summary>- /// Get system field definition by key.- /// </summary>- /// <param name="fieldKey">The field key to look up.</param>- /// <returns>The field definition, or null if not found.</returns>- public static SystemFieldDefinition? GetSystemField(string fieldKey)- {- return Fields.TryGetValue(fieldKey, out var field) ? field : null;- }-- /// <summary>- /// Check if a field key represents a system field.- /// </summary>- /// <param name="fieldKey">The field key to check.</param>- /// <returns>True if the field key is a system field.</returns>- public static bool IsSystemField(string fieldKey)- {- return Fields.ContainsKey(fieldKey);- }-- /// <summary>- /// Check if a field applies to a specific item type.- /// </summary>- /// <param name="field">The field definition.</param>- /// <param name="itemType">The item type to check.</param>- /// <returns>True if the field applies to the item type.</returns>- public static bool FieldAppliesToType(SystemFieldDefinition field, string itemType)- {- return field.ApplicableToTypes.ContainsKey(itemType);- }-- /// <summary>- /// Get all system fields applicable to a specific item type.- /// Results are sorted by DefaultDisplayOrder.- /// </summary>- /// <param name="itemType">The item type.</param>- /// <returns>Fields applicable to the item type.</returns>- public static IEnumerable<SystemFieldDefinition> GetFieldsForItemType(string itemType)- {- return Fields.Values- .Where(f => f.ApplicableToTypes.ContainsKey(itemType))- .OrderBy(f => f.DefaultDisplayOrder);- }-- /// <summary>- /// Get system fields that should be shown by default for a specific item type.- /// Results are sorted by DefaultDisplayOrder.- /// </summary>- /// <param name="itemType">The item type.</param>- /// <returns>Fields shown by default for the item type.</returns>- public static IEnumerable<SystemFieldDefinition> GetDefaultFieldsForItemType(string itemType)- {- return Fields.Values- .Where(f => f.ApplicableToTypes.TryGetValue(itemType, out var config) && config.ShowByDefault)- .OrderBy(f => f.DefaultDisplayOrder);- }-- /// <summary>- /// Get system fields that are not shown by default for a specific item type.- /// These are the fields that can be added via an "add field" button.- /// Results are sorted by DefaultDisplayOrder.- /// </summary>- /// <param name="itemType">The item type.</param>- /// <returns>Optional fields for the item type.</returns>- public static IEnumerable<SystemFieldDefinition> GetOptionalFieldsForItemType(string itemType)- {- return Fields.Values- .Where(f => f.ApplicableToTypes.TryGetValue(itemType, out var config) && !config.ShowByDefault)- .OrderBy(f => f.DefaultDisplayOrder);- }-- /// <summary>- /// Check if a field key matches a known system field prefix.- /// </summary>- /// <param name="fieldKey">The field key to check.</param>- /// <returns>True if the field key has a system field prefix.</returns>- public static bool IsSystemFieldPrefix(string fieldKey)- {- return fieldKey.StartsWith("login.") ||- fieldKey.StartsWith("alias.") ||- fieldKey.StartsWith("card.") ||- fieldKey.StartsWith("notes.");- }-}diff --git a/apps/server/Databases/AliasServerDb/AliasVaultUserRefreshToken.cs b/apps/server/Databases/AliasServerDb/AliasVaultUserRefreshToken.csindex 269240af5..30e968a28 100644--- a/apps/server/Databases/AliasServerDb/AliasVaultUserRefreshToken.cs+++ b/apps/server/Databases/AliasServerDb/AliasVaultUserRefreshToken.cs@@ -8,7 +8,6 @@ namespace AliasServerDb;using System.ComponentModel.DataAnnotations;using System.ComponentModel.DataAnnotations.Schema;-using Microsoft.AspNetCore.Identity;/// <summary>/// Refresh tokens for users.diff --git a/apps/server/Databases/AliasServerDb/AuthLog.cs b/apps/server/Databases/AliasServerDb/AuthLog.csindex f4f677fb0..bc6c18959 100644--- a/apps/server/Databases/AliasServerDb/AuthLog.cs+++ b/apps/server/Databases/AliasServerDb/AuthLog.cs@@ -8,7 +8,6 @@namespace AliasServerDb;using System.ComponentModel.DataAnnotations;-using System.ComponentModel.DataAnnotations.Schema;using AliasVault.Shared.Models.Enums;using Microsoft.EntityFrameworkCore;diff --git a/apps/server/Databases/AliasServerDb/TaskRunnerJob.cs b/apps/server/Databases/AliasServerDb/TaskRunnerJob.csindex 7c07af9e7..c72e4501f 100644--- a/apps/server/Databases/AliasServerDb/TaskRunnerJob.cs+++ b/apps/server/Databases/AliasServerDb/TaskRunnerJob.cs@@ -9,7 +9,6 @@ namespace AliasServerDb;using System;using System.ComponentModel.DataAnnotations;-using System.ComponentModel.DataAnnotations.Schema;using AliasVault.Shared.Models.Enums;/// <summary>diff --git a/apps/server/Shared/AliasVault.RazorComponents/Alerts/MessageWarning.razor b/apps/server/Shared/AliasVault.RazorComponents/Alerts/MessageWarning.razordeleted file mode 100644index 10a8aced4..000000000--- a/apps/server/Shared/AliasVault.RazorComponents/Alerts/MessageWarning.razor+++ /dev/null@@ -1,16 +0,0 @@-@inherits ComponentBase--@if (!string.IsNullOrEmpty(Message))-{- <div class="p-4 mb-4 bg-red-50 dark:bg-red-900/20 text-red-800 dark:text-red-200 rounded-lg">- @Message- </div>-}--@code {- /// <summary>- /// Gets or sets the message to display.- /// </summary>- [Parameter]- public string? Message { get; set; }-}diff --git a/apps/server/Shared/AliasVault.RazorComponents/AliasVault.RazorComponents.csproj b/apps/server/Shared/AliasVault.RazorComponents/AliasVault.RazorComponents.csprojdeleted file mode 100644index 82d4e28ad..000000000--- a/apps/server/Shared/AliasVault.RazorComponents/AliasVault.RazorComponents.csproj+++ /dev/null@@ -1,39 +0,0 @@-<Project Sdk="Microsoft.NET.Sdk.Razor">-- <PropertyGroup>- <TargetFramework>net10.0</TargetFramework>- <Nullable>enable</Nullable>- <ImplicitUsings>enable</ImplicitUsings>- <LangVersion>14</LangVersion>- </PropertyGroup>-- <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">- <DocumentationFile>bin\Debug\net10.0\AliasVault.RazorComponents.xml</DocumentationFile>- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>- </PropertyGroup>-- <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">- <DocumentationFile>bin\Release\net10.0\AliasVault.RazorComponents.xml</DocumentationFile>- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>- </PropertyGroup>--- <ItemGroup>- <SupportedPlatform Include="browser" />- </ItemGroup>-- <ItemGroup>- <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.10" />- <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">- <PrivateAssets>all</PrivateAssets>- <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>- </PackageReference>- </ItemGroup>-- <ItemGroup>- <AdditionalFiles Include="..\..\stylecop.json">- <Link>stylecop.json</Link>- </AdditionalFiles>- </ItemGroup>--</Project>diff --git a/apps/server/Shared/AliasVault.RazorComponents/Buttons/CancelButton.razor b/apps/server/Shared/AliasVault.RazorComponents/Buttons/CancelButton.razordeleted file mode 100644index 5e222bdfe..000000000--- a/apps/server/Shared/AliasVault.RazorComponents/Buttons/CancelButton.razor+++ /dev/null@@ -1,26 +0,0 @@-<Button OnClick="HandleClick"- Color="danger">- @ChildContent-</Button>--@code {- /// <summary>- /// The event to call in the parent when the cancel button is clicked.- /// </summary>- [Parameter]- public EventCallback OnClick { get; set; }-- /// <summary>- /// The content to be displayed inside the button.- /// </summary>- [Parameter]- public RenderFragment? ChildContent { get; set; }-- /// <summary>- /// Handles the button click event.- /// </summary>- private async Task HandleClick()- {- await OnClick.InvokeAsync();- }-}diff --git a/apps/server/Shared/AliasVault.RazorComponents/Buttons/DeleteAllSelectedButton.razor b/apps/server/Shared/AliasVault.RazorComponents/Buttons/DeleteAllSelectedButton.razordeleted file mode 100644index d0f494130..000000000--- a/apps/server/Shared/AliasVault.RazorComponents/Buttons/DeleteAllSelectedButton.razor+++ /dev/null@@ -1,30 +0,0 @@-<Button OnClick="HandleClick"- Display="flex"- Color="danger">- <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">- <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"></path>- </svg>- <span class="ml-2">@ButtonText</span>-</Button>--@code {- /// <summary>- /// The event to call in the parent when the delete button is clicked.- /// </summary>- [Parameter]- public EventCallback OnClick { get; set; }-- /// <summary>- /// The text to display on the button.- /// </summary>- [Parameter]- public required string ButtonText { get; set; }-- /// <summary>- /// Handles the button click event.- /// </summary>- private async Task HandleClick()- {- await OnClick.InvokeAsync();- }-}diff --git a/apps/server/Shared/AliasVault.RazorComponents/Layout/PageContent.razor b/apps/server/Shared/AliasVault.RazorComponents/Layout/PageContent.razordeleted file mode 100644index 33c198e57..000000000--- a/apps/server/Shared/AliasVault.RazorComponents/Layout/PageContent.razor+++ /dev/null@@ -1,19 +0,0 @@-<div class="min-h-[350px] @Class">- @ChildContent-</div>--@code {- /// <summary>- /// Gets or sets the content rendered inside the page body wrapper.- /// </summary>- [Parameter]- public RenderFragment? ChildContent { get; set; }-- /// <summary>- /// Gets or sets additional CSS classes appended to the wrapper. Use this to apply- /// the page's own padding/margin (e.g. "px-4 mb-4") while the wrapper guarantees a- /// minimum height so header dropdowns and popovers don't get clipped on short pages.- /// </summary>- [Parameter]- public string Class { get; set; } = string.Empty;-}diff --git a/apps/server/Shared/AliasVault.RazorComponents/Layout/StickyActionBar.razor b/apps/server/Shared/AliasVault.RazorComponents/Layout/StickyActionBar.razordeleted file mode 100644index 2a1b22c84..000000000--- a/apps/server/Shared/AliasVault.RazorComponents/Layout/StickyActionBar.razor+++ /dev/null@@ -1,93 +0,0 @@-@* StickyActionBar component - provides a fixed action bar at the bottom of the viewport *@-@* Only appears when user has scrolled down past a threshold or page is scrollable *@-@inject IJSRuntime JSRuntime-@implements IAsyncDisposable--<div class="sticky-action-bar-wrapper" style="display: none;">- @* Spacer div to prevent content from being hidden behind the fixed bar *@- <div class="h-20"></div>-- @* Fixed action bar *@- <div class="fixed bottom-0 left-0 right-0 z-30 bg-white dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 shadow-lg">- <div class="max-w-screen-2xl mx-auto px-4 py-3">- <div class="flex flex-wrap items-center justify-end gap-2">- @ChildContent- </div>- </div>- </div>-</div>--@code {- /// <summary>- /// Gets or sets the content to be displayed inside the sticky action bar.- /// Typically contains buttons like Save and Cancel.- /// </summary>- [Parameter]- public RenderFragment? ChildContent { get; set; }-- /// <summary>- /// Gets or sets the scroll threshold in pixels before showing the bar.- /// Default is 75 pixels.- /// </summary>- [Parameter]- public int ScrollThreshold { get; set; } = 75;-- /// <inheritdoc />- protected override async Task OnAfterRenderAsync(bool firstRender)- {- if (firstRender)- {- await JSRuntime.InvokeVoidAsync("eval", $@"- (function() {{- if (window._stickyBarCleanup) {{- window._stickyBarCleanup();- }}-- const threshold = {ScrollThreshold};-- function checkScroll() {{- const scrollY = window.scrollY || document.documentElement.scrollTop;- const docHeight = document.documentElement.scrollHeight;- const viewHeight = window.innerHeight;- const canScroll = docHeight > viewHeight + 50;- const shouldShow = canScroll && scrollY > threshold;-- const bar = document.querySelector('.sticky-action-bar-wrapper');- if (bar) {{- bar.style.display = shouldShow ? 'block' : 'none';- }}- }}-- window.addEventListener('scroll', checkScroll);- window.addEventListener('resize', checkScroll);-- window._stickyBarCleanup = function() {{- window.removeEventListener('scroll', checkScroll);- window.removeEventListener('resize', checkScroll);- }};-- // Initial check after a small delay to ensure DOM is ready- setTimeout(checkScroll, 100);- }})();- ");- }- }-- /// <inheritdoc />- public async ValueTask DisposeAsync()- {- try- {- await JSRuntime.InvokeVoidAsync("eval", @"- if (window._stickyBarCleanup) {- window._stickyBarCleanup();- window._stickyBarCleanup = null;- }- ");- }- catch- {- // Ignore errors during disposal- }- }-}diff --git a/apps/server/Shared/AliasVault.RazorComponents/Paginators/Paginator.razor b/apps/server/Shared/AliasVault.RazorComponents/Paginators/Paginator.razordeleted file mode 100644index cde275271..000000000--- a/apps/server/Shared/AliasVault.RazorComponents/Paginators/Paginator.razor+++ /dev/null@@ -1,95 +0,0 @@-@if (TotalRecords > PageSize)-{- <!-- Navigation component for pagination -->- <nav aria-label="Page navigation" class="mt-4 flex justify-end mb-5">- <ul class="flex space-x-2">- <!-- First page button -->- <li class="@(CurrentPage == 1 ? "opacity-50 cursor-not-allowed" : "")">- <a class="px-3 py-2 bg-primary-100 text-primary-700 border border-primary-300 rounded hover:bg-primary-200 transition duration-300 shadow-sm" href="javascript:void(0)" @onclick="() => SetPage(1)">First</a>- </li>- <!-- Previous page button -->- <li class="@(CurrentPage == 1 ? "opacity-50 cursor-not-allowed" : "")">- <a class="px-3 py-2 bg-primary-100 text-primary-700 border border-primary-300 rounded hover:bg-primary-200 transition duration-300 shadow-sm" href="javascript:void(0)" @onclick="() => ChangePage(-1)">Previous</a>- </li>- @for (var i = 1; i <= PageCount; i++)- {- var pageNum = i;- if (i > 2 && i < PageCount - 2 && Math.Abs(CurrentPage - i) > 3)- {- // Don't render intermediate pages when there are many pages- continue;- }- <!-- Individual page number buttons -->- <li>- <a class="px-3 py-2 @(CurrentPage == pageNum ? "bg-primary-600 text-white" : "bg-primary-100 text-primary-700") border border-primary-300 rounded hover:bg-primary-200 transition duration-300 shadow-sm" href="javascript:void(0)" @onclick="() => SetPage(pageNum)">@pageNum</a>- </li>- }- <!-- Next page button -->- <li class="@(CurrentPage == PageCount ? "opacity-50 cursor-not-allowed" : "")">- <a class="px-3 py-2 bg-primary-100 text-primary-700 border border-primary-300 rounded hover:bg-primary-200 transition duration-300 shadow-sm" href="javascript:void(0)" @onclick="() => ChangePage(1)">Next</a>- </li>- <!-- Last page button -->- <li class="@(CurrentPage == PageCount ? "opacity-50 cursor-not-allowed" : "")">- <a class="px-3 py-2 bg-primary-100 text-primary-700 border border-primary-300 rounded hover:bg-primary-200 transition duration-300 shadow-sm" href="javascript:void(0)" @onclick="() => SetPage(PageCount)">Last</a>- </li>- </ul>- </nav>-}--@code {- /// <summary>- /// The current page number.- /// </summary>- [Parameter] public int CurrentPage { get; set; } = 1;-- /// <summary>- /// The number of items to display per page.- /// </summary>- [Parameter] public int PageSize { get; set; } = 10;-- /// <summary>- /// The total number of records in the dataset.- /// </summary>- [Parameter] public int TotalRecords { get; set; }-- /// <summary>- /// Event callback triggered when the page is changed.- /// </summary>- [Parameter] public EventCallback<int> OnPageChanged { get; set; }-- /// <summary>- /// Calculates the total number of pages based on TotalRecords and PageSize.- /// </summary>- private int PageCount => (TotalRecords + PageSize - 1) / PageSize;-- /// <summary>- /// Changes the current page by the specified amount.- /// </summary>- /// <param name="change">The number of pages to change by (positive or negative).</param>- private void ChangePage(int change)- {- SetPage(CurrentPage + change);- }-- /// <summary>- /// Sets the current page to the specified page number.- /// </summary>- /// <param name="pageNumber">The page number to set.</param>- private void SetPage(int pageNumber)- {- if (pageNumber < 1)- {- CurrentPage = 1;- }- else if (pageNumber > PageCount)- {- CurrentPage = PageCount;- }- else- {- CurrentPage = pageNumber;- }-- OnPageChanged.InvokeAsync(CurrentPage);- }-}diff --git a/apps/server/Shared/AliasVault.RazorComponents/Paginators/SimplePaginator.razor b/apps/server/Shared/AliasVault.RazorComponents/Paginators/SimplePaginator.razordeleted file mode 100644index e1af4b410..000000000--- a/apps/server/Shared/AliasVault.RazorComponents/Paginators/SimplePaginator.razor+++ /dev/null@@ -1,89 +0,0 @@-@if (TotalRecords > PageSize)-{- <!-- Simple mobile-friendly pagination component -->- <nav aria-label="Page navigation" class="mt-4 flex justify-center mb-5">- <ul class="flex items-center space-x-2">- <!-- Previous page button -->- <li class="@(CurrentPage == 1 ? "opacity-50 cursor-not-allowed" : "")">- <button- @onclick="() => ChangePage(-1)"- disabled="@(CurrentPage == 1)"- class="px-3 py-2 bg-primary-100 text-primary-700 border border-primary-300 rounded hover:bg-primary-200 transition duration-300 shadow-sm disabled:opacity-50 disabled:cursor-not-allowed">- <svg class="w-4 h-4" fill="currentColor" viewBox="0 0 20 20">- <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd"/>- </svg>- </button>- </li>-- <!-- Current page indicator -->- <li>- <span class="px-3 py-2 bg-primary-600 text-white border border-primary-300 rounded shadow-sm">- @CurrentPage / @PageCount- </span>- </li>-- <!-- Next page button -->- <li class="@(CurrentPage == PageCount ? "opacity-50 cursor-not-allowed" : "")">- <button- @onclick="() => ChangePage(1)"- disabled="@(CurrentPage == PageCount)"- class="px-3 py-2 bg-primary-100 text-primary-700 border border-primary-300 rounded hover:bg-primary-200 transition duration-300 shadow-sm disabled:opacity-50 disabled:cursor-not-allowed">- <svg class="w-4 h-4" fill="currentColor" viewBox="0 0 20 20">- <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd"/>- </svg>- </button>- </li>- </ul>- </nav>-}--@code {- /// <summary>- /// The current page number.- /// </summary>- [Parameter] public int CurrentPage { get; set; } = 1;-- /// <summary>- /// The number of items to display per page.- /// </summary>- [Parameter] public int PageSize { get; set; } = 10;-- /// <summary>- /// The total number of records in the dataset.- /// </summary>- [Parameter] public int TotalRecords { get; set; }-- /// <summary>- /// Event callback triggered when the page is changed.- /// </summary>- [Parameter] public EventCallback<int> OnPageChanged { get; set; }-- /// <summary>- /// Calculates the total number of pages based on TotalRecords and PageSize.- /// </summary>- private int PageCount => (TotalRecords + PageSize - 1) / PageSize;-- /// <summary>- /// Changes the current page by the specified amount.- /// </summary>- /// <param name="change">The number of pages to change by (positive or negative).</param>- private void ChangePage(int change)- {- var newPage = CurrentPage + change;-- if (newPage < 1)- {- newPage = 1;- }- else if (newPage > PageCount)- {- newPage = PageCount;- }-- if (newPage != CurrentPage)- {- CurrentPage = newPage;- OnPageChanged.InvokeAsync(CurrentPage);- }- }-}\ No newline at end of filediff --git a/apps/server/Shared/AliasVault.RazorComponents/README.md b/apps/server/Shared/AliasVault.RazorComponents/README.mddeleted file mode 100644index 2ff29ee65..000000000--- a/apps/server/Shared/AliasVault.RazorComponents/README.md+++ /dev/null@@ -1,31 +0,0 @@-# AliasVault.RazorComponents--This project contains shared Razor components and UI-related functionality used across the AliasVault solution. This project focuses specifically on reusable UI components.--## Purpose--This library provides shared Blazor components used by the admin application:-- Reusable Razor components-- UI-specific services-- Component-related models-- Component-specific utilities--## Project Structure--The project is organized as follows:-- `Components/` - Contains reusable Razor components like Paginator.razor-- `Services/` - UI-specific services used by components-- `Models/` - Component-specific models and DTOs--## Dependencies--This project:-- Is a Razor Class Library targeting browser platform-- Depends on Microsoft.AspNetCore.Components.Web-- Can include UI-specific external dependencies as needed--## Related Projects--- **AliasVault.Shared** - Contains general shared models, DTOs and business logic-- **AliasVault.Shared.Core** - Contains core shared code with no external dependencies-- **AliasVault.RazorComponents** (this project) - Contains shared UI components and Razor-specific codediff --git a/apps/server/Shared/AliasVault.RazorComponents/StatusPill.razor b/apps/server/Shared/AliasVault.RazorComponents/StatusPill.razordeleted file mode 100644index e7f953f48..000000000--- a/apps/server/Shared/AliasVault.RazorComponents/StatusPill.razor+++ /dev/null@@ -1,54 +0,0 @@-@inherits ComponentBase--<span class="@PillClass px-2 py-1 text-xs font-medium rounded-full">- @StatusText-</span>--@code {- /// <summary>- /// Set to true to show the pill as enabled.- /// </summary>- [Parameter]- public bool Enabled { get; set; }-- /// <summary>- /// The text to show when the pill is enabled.- /// </summary>- [Parameter]- public string TextTrue { get; set; } = "Enabled";-- /// <summary>- /// The text to show when the pill is disabled.- /// </summary>- [Parameter]- public string TextFalse { get; set; } = "Disabled";-- /// <summary>- /// Optional color override: "green", "yellow", "red". If not specified, uses Enabled parameter.- /// </summary>- [Parameter]- public string? Color { get; set; }-- private string PillClass- {- get- {- if (!string.IsNullOrEmpty(Color))- {- return Color.ToLower() switch- {- "green" => "bg-green-100 text-green-800",- "yellow" => "bg-yellow-100 text-yellow-800",- "red" => "bg-red-100 text-red-800",- _ => "bg-gray-100 text-gray-800"- };- }-- return Enabled- ? "bg-green-100 text-green-800"- : "bg-red-100 text-red-800";- }- }-- private string StatusText => Enabled ? TextTrue : TextFalse;-}diff --git a/apps/server/Shared/AliasVault.RazorComponents/Tables/SortableTableRow.razor b/apps/server/Shared/AliasVault.RazorComponents/Tables/SortableTableRow.razordeleted file mode 100644index bb9812308..000000000--- a/apps/server/Shared/AliasVault.RazorComponents/Tables/SortableTableRow.razor+++ /dev/null@@ -1,52 +0,0 @@-<tr @onclick="HandleClick" @oncontextmenu="HandleContextMenu" @oncontextmenu:preventDefault="@OnContextMenu.HasDelegate" class="bg-white border-b dark:bg-gray-800 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-700 @(OnClick.HasDelegate ? "cursor-pointer" : "") @(Class)">- @ChildContent-</tr>--@code {- /// <summary>- /// Gets or sets the child content of the table.- /// </summary>- [Parameter]- public RenderFragment ChildContent { get; set; } = null!;-- /// <summary>- /// Gets or sets (additional) CSS classes to add to row.- /// </summary>- [Parameter]- public string Class { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets the callback to invoke when the row is clicked.- /// </summary>- [Parameter]- public EventCallback OnClick { get; set; }-- /// <summary>- /// Gets or sets the callback to invoke when the row is right-clicked.- /// When set, the browser's default context menu is suppressed for this row.- /// </summary>- [Parameter]- public EventCallback<MouseEventArgs> OnContextMenu { get; set; }-- /// <summary>- /// Handles the click event.- /// </summary>- private async Task HandleClick()- {- if (OnClick.HasDelegate)- {- await OnClick.InvokeAsync();- }- }-- /// <summary>- /// Handles the context menu (right-click) event.- /// </summary>- private async Task HandleContextMenu(MouseEventArgs e)- {- if (OnContextMenu.HasDelegate)- {- await OnContextMenu.InvokeAsync(e);- }- }-}diff --git a/apps/server/Shared/AliasVault.RazorComponents/_Imports.razor b/apps/server/Shared/AliasVault.RazorComponents/_Imports.razordeleted file mode 100644index 56241f7c3..000000000--- a/apps/server/Shared/AliasVault.RazorComponents/_Imports.razor+++ /dev/null@@ -1,4 +0,0 @@-@using AliasVault.RazorComponents.Models-@using AliasVault.RazorComponents.Tables-@using Microsoft.AspNetCore.Components.Web-@using Microsoft.JSInteropdiff --git a/apps/server/Shared/AliasVault.Shared.Core/AliasVault.Shared.Core.csproj b/apps/server/Shared/AliasVault.Shared.Core/AliasVault.Shared.Core.csprojdeleted file mode 100644index c5b025f95..000000000--- a/apps/server/Shared/AliasVault.Shared.Core/AliasVault.Shared.Core.csproj+++ /dev/null@@ -1,33 +0,0 @@-<Project Sdk="Microsoft.NET.Sdk">-- <PropertyGroup>- <TargetFramework>net10.0</TargetFramework>- <ImplicitUsings>enable</ImplicitUsings>- <Nullable>enable</Nullable>- <LangVersion>14</LangVersion>- </PropertyGroup>-- <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">- <DocumentationFile>bin\Debug\net10.0\AliasVault.Shared.Core.xml</DocumentationFile>- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>- </PropertyGroup>-- <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">- <DocumentationFile>bin\Release\net10.0\AliasVault.Shared.Core.xml</DocumentationFile>- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>- </PropertyGroup>-- <ItemGroup>- <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">- <PrivateAssets>all</PrivateAssets>- <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>- </PackageReference>- </ItemGroup>-- <ItemGroup>- <AdditionalFiles Include="..\..\stylecop.json">- <Link>stylecop.json</Link>- </AdditionalFiles>- </ItemGroup>--</Project>diff --git a/apps/server/Shared/AliasVault.Shared.Core/BrowserExtensions/BrowserExtensionInfo.cs b/apps/server/Shared/AliasVault.Shared.Core/BrowserExtensions/BrowserExtensionInfo.csdeleted file mode 100644index cbe03cd34..000000000--- a/apps/server/Shared/AliasVault.Shared.Core/BrowserExtensions/BrowserExtensionInfo.cs+++ /dev/null@@ -1,34 +0,0 @@-//------------------------------------------------------------------------// <copyright file="BrowserExtensionInfo.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.Shared.Core.BrowserExtensions;--/// <summary>-/// Provides information about a browser extension that is available for AliasVault.-/// </summary>-public class BrowserExtensionInfo-{- /// <summary>- /// Gets or sets the name of the browser extension.- /// </summary>- public string Name { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets the path to the icon of the browser extension.- /// </summary>- public string IconPath { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets the URL to download the browser extension.- /// </summary>- public string? DownloadUrl { get; set; }-- /// <summary>- /// Gets or sets a value indicating whether the browser extension is available.- /// </summary>- public bool IsAvailable { get; set; }-}diff --git a/apps/server/Shared/AliasVault.Shared.Core/BrowserExtensions/BrowserType.cs b/apps/server/Shared/AliasVault.Shared.Core/BrowserExtensions/BrowserType.csdeleted file mode 100644index 479f629cf..000000000--- a/apps/server/Shared/AliasVault.Shared.Core/BrowserExtensions/BrowserType.cs+++ /dev/null@@ -1,44 +0,0 @@-//------------------------------------------------------------------------// <copyright file="BrowserType.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.Shared.Core.BrowserExtensions;--/// <summary>-/// The type of browser.-/// </summary>-public enum BrowserType-{- /// <summary>- /// Unknown browser type.- /// </summary>- Unknown,-- /// <summary>- /// Firefox browser type.- /// </summary>- Firefox,-- /// <summary>- /// Chrome browser type.- /// </summary>- Chrome,-- /// <summary>- /// Safari browser type.- /// </summary>- Safari,-- /// <summary>- /// Edge browser type.- /// </summary>- Edge,-- /// <summary>- /// Brave browser type.- /// </summary>- Brave,-}diff --git a/apps/server/Shared/AliasVault.Shared.Core/BrowserExtensions/Constants.cs b/apps/server/Shared/AliasVault.Shared.Core/BrowserExtensions/Constants.csdeleted file mode 100644index 4d4183f4a..000000000--- a/apps/server/Shared/AliasVault.Shared.Core/BrowserExtensions/Constants.cs+++ /dev/null@@ -1,57 +0,0 @@-//------------------------------------------------------------------------// <copyright file="Constants.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>-//------------------------------------------------------------------------#pragma warning disable S1075 // URIs should not be hardcoded--namespace AliasVault.Shared.Core.BrowserExtensions;--/// <summary>-/// Provides constants for browser extension information.-/// </summary>-public static class Constants-{- /// <summary>- /// Gets the browser extensions available for AliasVault. This is used to render download links in the client.- /// </summary>- public static IReadOnlyDictionary<BrowserType, BrowserExtensionInfo> Extensions { get; } = new Dictionary<BrowserType, BrowserExtensionInfo>- {- [BrowserType.Chrome] = new BrowserExtensionInfo- {- Name = "Google Chrome",- IconPath = "/img/browser-icons/chrome.svg",- DownloadUrl = "https://chromewebstore.google.com/detail/aliasvault/bmoggiinmnodjphdjnmpcnlleamkfedj",- IsAvailable = true,- },- [BrowserType.Firefox] = new BrowserExtensionInfo- {- Name = "Firefox",- IconPath = "/img/browser-icons/firefox.svg",- DownloadUrl = "https://addons.mozilla.org/en-US/firefox/addon/aliasvault/",- IsAvailable = true,- },- [BrowserType.Safari] = new BrowserExtensionInfo- {- Name = "Safari",- IconPath = "/img/browser-icons/safari.svg",- DownloadUrl = "https://apps.apple.com/app/6743163173",- IsAvailable = true,- },- [BrowserType.Edge] = new BrowserExtensionInfo- {- Name = "Microsoft Edge",- IconPath = "/img/browser-icons/edge.svg",- DownloadUrl = "https://microsoftedge.microsoft.com/addons/detail/aliasvault/kabaanafahnjkfkplbnllebdmppdemfo",- IsAvailable = true,- },- [BrowserType.Brave] = new BrowserExtensionInfo- {- Name = "Brave",- IconPath = "/img/browser-icons/brave.svg",- DownloadUrl = "https://chromewebstore.google.com/detail/aliasvault/bmoggiinmnodjphdjnmpcnlleamkfedj",- IsAvailable = true,- },- };-}diff --git a/apps/server/Shared/AliasVault.Shared.Core/MobileApps/Constants.cs b/apps/server/Shared/AliasVault.Shared.Core/MobileApps/Constants.csdeleted file mode 100644index c407f43e0..000000000--- a/apps/server/Shared/AliasVault.Shared.Core/MobileApps/Constants.cs+++ /dev/null@@ -1,35 +0,0 @@-//------------------------------------------------------------------------// <copyright file="Constants.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>-//------------------------------------------------------------------------#pragma warning disable S1075 // URIs should not be hardcoded--namespace AliasVault.Shared.Core.MobileApps;--/// <summary>-/// Provides constants for mobile app information.-/// </summary>-public static class Constants-{- /// <summary>- /// Gets the mobile apps available for AliasVault. This is used to render download links in the client.- /// </summary>- public static IReadOnlyList<MobileAppInfo> MobileApps { get; } = [- new MobileAppInfo- {- Name = "iOS",- IconPath = "/img/mobile-icons/ios.svg",- DownloadUrl = "https://apps.apple.com/app/id6745490915",- IsAvailable = true,- },- new MobileAppInfo- {- Name = "Android",- IconPath = "/img/mobile-icons/android.svg",- DownloadUrl = "https://play.google.com/store/apps/details?id=net.aliasvault.app",- IsAvailable = true,- },- ];-}diff --git a/apps/server/Shared/AliasVault.Shared.Core/MobileApps/MobileAppInfo.cs b/apps/server/Shared/AliasVault.Shared.Core/MobileApps/MobileAppInfo.csdeleted file mode 100644index e7d494ad5..000000000--- a/apps/server/Shared/AliasVault.Shared.Core/MobileApps/MobileAppInfo.cs+++ /dev/null@@ -1,34 +0,0 @@-//------------------------------------------------------------------------// <copyright file="MobileAppInfo.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.Shared.Core.MobileApps;--/// <summary>-/// Represents information about a mobile app.-/// </summary>-public class MobileAppInfo-{- /// <summary>- /// Gets or sets the name of the mobile app.- /// </summary>- public string Name { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets the path to the icon of the mobile app.- /// </summary>- public string IconPath { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets the download URL for the mobile app.- /// </summary>- public string DownloadUrl { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets a value indicating whether the mobile app is available.- /// </summary>- public bool IsAvailable { get; set; }-}diff --git a/apps/server/Shared/AliasVault.Shared.Core/README.md b/apps/server/Shared/AliasVault.Shared.Core/README.mddeleted file mode 100644index a6f401612..000000000--- a/apps/server/Shared/AliasVault.Shared.Core/README.md+++ /dev/null@@ -1,16 +0,0 @@-# AliasVault.Shared.Core--This project contains core shared code for the AliasVault project such as versioning information and shared constants.-This project does not contain any external dependencies to ensure minimal impact on consuming projects.--## Purpose--This library provides fundamental, dependency-free components that are shared across all AliasVault projects:-- Application versioning-- Core constants-- Basic enums-- Shared interfaces--## Dependencies--This project does not depend on any external libraries.diff --git a/apps/server/Shared/AliasVault.Shared.Server/README.md b/apps/server/Shared/AliasVault.Shared.Server/README.mdindex 00eacde73..217e6eac5 100644--- a/apps/server/Shared/AliasVault.Shared.Server/README.md+++ b/apps/server/Shared/AliasVault.Shared.Server/README.md@@ -1,5 +1,3 @@# AliasVault.Shared.Server-This project contains shared functionality used only by the server applications and not required by the client applications.--This is to reduce the number of client dependencies and keep the client applications as lightweight as possible.\ No newline at end of file+This project contains shared functionality used by the server applications (API, Admin, SMTP service and TaskRunner), such as server settings, capability rules and secret reading.diff --git a/apps/server/Shared/AliasVault.Shared/AliasVault.Shared.csproj b/apps/server/Shared/AliasVault.Shared/AliasVault.Shared.csprojindex 23b2694c9..9b675afa2 100644--- a/apps/server/Shared/AliasVault.Shared/AliasVault.Shared.csproj+++ b/apps/server/Shared/AliasVault.Shared/AliasVault.Shared.csproj@@ -22,15 +22,10 @@</ItemGroup><ItemGroup>- <PackageReference Include="HtmlSanitizer" Version="9.1.968-beta" /><PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556"><PrivateAssets>all</PrivateAssets><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets></PackageReference></ItemGroup>- <ItemGroup>- <None Remove="Components\Paginator.razor" />- </ItemGroup>-</Project>diff --git a/apps/server/Shared/AliasVault.Shared.Core/AppInfo.cs b/apps/server/Shared/AliasVault.Shared/AppInfo.cssimilarity index 98%rename from apps/server/Shared/AliasVault.Shared.Core/AppInfo.csrename to apps/server/Shared/AliasVault.Shared/AppInfo.csindex e36a76f8b..6072ac3e5 100644--- a/apps/server/Shared/AliasVault.Shared.Core/AppInfo.cs+++ b/apps/server/Shared/AliasVault.Shared/AppInfo.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Core;+namespace AliasVault.Shared;/// <summary>/// Provides application-wide constant information and versioning.@@ -51,7 +51,7 @@ public static class AppInfo/// </summary>public static IReadOnlyDictionary<string, string> MinimumClientVersions { get; } = new Dictionary<string, string>{- // Main WASM client.+ // Web app.{ "web", MinimumClientVersion },// Browser extensions.diff --git a/apps/server/Shared/AliasVault.Shared/Models/Spamok/AttachmentApiModel.cs b/apps/server/Shared/AliasVault.Shared/Models/Spamok/AttachmentApiModel.csdeleted file mode 100644index c232a083e..000000000--- a/apps/server/Shared/AliasVault.Shared/Models/Spamok/AttachmentApiModel.cs+++ /dev/null@@ -1,39 +0,0 @@-//------------------------------------------------------------------------// <copyright file="AttachmentApiModel.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.Shared.Models.Spamok;--/// <summary>-/// Represents an attachment for an email of the external api.spamok.com API.-/// </summary>-public class AttachmentApiModel-{- /// <summary>- /// Gets or sets the ID of the attachment.- /// </summary>- public int Id { get; set; }-- /// <summary>- /// Gets or sets the ID of the email the attachment belongs to.- /// </summary>- public int Email_Id { get; set; }-- /// <summary>- /// Gets or sets the filename of the attachment.- /// </summary>- public string Filename { get; set; } = null!;-- /// <summary>- /// Gets or sets the MIME type of the attachment.- /// </summary>- public string MimeType { get; set; } = null!;-- /// <summary>- /// Gets or sets the size of the attachment in bytes.- /// </summary>- public int Filesize { get; set; }-}diff --git a/apps/server/Shared/AliasVault.Shared/Models/Spamok/Base/EmailApiModelBase.cs b/apps/server/Shared/AliasVault.Shared/Models/Spamok/Base/EmailApiModelBase.csdeleted file mode 100644index 412cd05a5..000000000--- a/apps/server/Shared/AliasVault.Shared/Models/Spamok/Base/EmailApiModelBase.cs+++ /dev/null@@ -1,75 +0,0 @@-//------------------------------------------------------------------------// <copyright file="EmailApiModelBase.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.Shared.Models.Spamok.Base;--/// <summary>-/// Represents a mailbox email API model base of the external api.spamok.com API.-/// </summary>-public abstract class EmailApiModelBase-{- /// <summary>- /// Gets or sets the ID of the email.- /// </summary>- public int Id { get; set; }-- /// <summary>- /// Gets or sets the subject of the email.- /// </summary>- public string Subject { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets the display name of the sender.- /// </summary>- public string FromDisplay { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets the domain of the sender's email address.- /// </summary>- public string FromDomain { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets the local part of the sender's email address.- /// </summary>- public string FromLocal { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets the domain of the recipient's email address.- /// </summary>- public string ToDomain { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets the local part of the recipient's email address.- /// </summary>- public string ToLocal { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets the date of the email.- /// </summary>- public DateTime Date { get; set; }-- /// <summary>- /// Gets or sets the system date of the email.- /// </summary>- public DateTime DateSystem { get; set; }-- /// <summary>- /// Gets or sets the number of seconds ago the email was received.- /// </summary>- public double SecondsAgo { get; set; }-- /// <summary>- /// Gets or sets the encrypted symmetric key which was used to encrypt the email message.- /// This key is encrypted with the public key of the user.- /// </summary>- public string EncryptedSymmetricKey { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets the public key of the user used to encrypt the symmetric key.- /// </summary>- public string EncryptionKey { get; set; } = string.Empty;-}diff --git a/apps/server/Shared/AliasVault.Shared/Models/Spamok/EmailApiModel.cs b/apps/server/Shared/AliasVault.Shared/Models/Spamok/EmailApiModel.csdeleted file mode 100644index 58eaab3df..000000000--- a/apps/server/Shared/AliasVault.Shared/Models/Spamok/EmailApiModel.cs+++ /dev/null@@ -1,36 +0,0 @@-//------------------------------------------------------------------------// <copyright file="EmailApiModel.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.Shared.Models.Spamok;--using AliasVault.Shared.Models.Spamok.Base;--/// <summary>-/// Represents an email API model of the external api.spamok.com API.-/// </summary>-public class EmailApiModel : EmailApiModelBase-{- /// <summary>- /// Gets or sets the HTML content of the email message.- /// </summary>- public string? MessageHtml { get; set; }-- /// <summary>- /// Gets or sets the plain text content of the email message.- /// </summary>- public string? MessagePlain { get; set; }-- /// <summary>- /// Gets or sets the source content of the email message.- /// </summary>- public string? MessageSource { get; set; }-- /// <summary>- /// Gets or sets the list of attachments in the email.- /// </summary>- public List<AttachmentApiModel> Attachments { get; set; } = [];-}diff --git a/apps/server/Shared/AliasVault.Shared/Models/Spamok/MailboxApiModel.cs b/apps/server/Shared/AliasVault.Shared/Models/Spamok/MailboxApiModel.csdeleted file mode 100644index 01e8576b2..000000000--- a/apps/server/Shared/AliasVault.Shared/Models/Spamok/MailboxApiModel.cs+++ /dev/null@@ -1,29 +0,0 @@-//------------------------------------------------------------------------// <copyright file="MailboxApiModel.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.Shared.Models.Spamok;--/// <summary>-/// Represents a mailbox API model of the external api.spamok.com API.-/// </summary>-public class MailboxApiModel-{- /// <summary>- /// Gets or sets the address of the mailbox.- /// </summary>- public string Address { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets a value indicating whether the mailbox is subscribed.- /// </summary>- public bool Subscribed { get; set; }-- /// <summary>- /// Gets or sets the list of mailbox email API models.- /// </summary>- public List<MailboxEmailApiModel> Mails { get; set; } = [];-}diff --git a/apps/server/Shared/AliasVault.Shared/Models/Spamok/MailboxEmailApiModel.cs b/apps/server/Shared/AliasVault.Shared/Models/Spamok/MailboxEmailApiModel.csdeleted file mode 100644index e1f897a1a..000000000--- a/apps/server/Shared/AliasVault.Shared/Models/Spamok/MailboxEmailApiModel.cs+++ /dev/null@@ -1,26 +0,0 @@-//------------------------------------------------------------------------// <copyright file="MailboxEmailApiModel.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.Shared.Models.Spamok;--using AliasVault.Shared.Models.Spamok.Base;--/// <summary>-/// Represents a mailbox email API model of the external api.spamok.com API.-/// </summary>-public class MailboxEmailApiModel : EmailApiModelBase-{- /// <summary>- /// Gets or sets the preview of the email message.- /// </summary>- public string MessagePreview { get; set; } = string.Empty;-- /// <summary>- /// Gets or sets a value indicating whether the email has attachments.- /// </summary>- public bool HasAttachments { get; set; }-}diff --git a/apps/server/Shared/AliasVault.Shared/Models/Validation/MinimumPasswordLengthAttribute.cs b/apps/server/Shared/AliasVault.Shared/Models/Validation/MinimumPasswordLengthAttribute.csdeleted file mode 100644index 5797f6103..000000000--- a/apps/server/Shared/AliasVault.Shared/Models/Validation/MinimumPasswordLengthAttribute.cs+++ /dev/null@@ -1,90 +0,0 @@-//------------------------------------------------------------------------// <copyright file="MinimumPasswordLengthAttribute.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.Shared.Models.Validation;--using System.ComponentModel.DataAnnotations;--/// <summary>-/// Validation attribute to ensure that a password meets the minimum length requirement.-/// </summary>-[AttributeUsage(AttributeTargets.Property)]-public class MinimumPasswordLengthAttribute : ValidationAttribute-{- /// <summary>- /// Initializes a new instance of the <see cref="MinimumPasswordLengthAttribute"/> class.- /// </summary>- /// <param name="minimumLength">The minimum required password length.</param>- public MinimumPasswordLengthAttribute(int minimumLength)- {- MinimumLength = minimumLength;- DevelopmentMinimumLength = null;- }-- /// <summary>- /// Initializes a new instance of the <see cref="MinimumPasswordLengthAttribute"/> class with different lengths for development and production.- /// </summary>- /// <param name="minimumLength">The minimum required password length for production.</param>- /// <param name="developmentMinimumLength">The minimum required password length for development.</param>- public MinimumPasswordLengthAttribute(int minimumLength, int developmentMinimumLength)- {- MinimumLength = minimumLength;- DevelopmentMinimumLength = developmentMinimumLength;- }-- /// <summary>- /// Gets the minimum required password length.- /// </summary>- public int MinimumLength { get; }-- /// <summary>- /// Gets the minimum required password length for development environment (optional).- /// </summary>- public int? DevelopmentMinimumLength { get; }-- /// <inheritdoc />- public override bool IsValid(object? value)- {- if (value is not string password)- {- return false;- }-- return password.Length >= GetEffectiveMinimumLength();- }-- /// <inheritdoc />- protected override ValidationResult? IsValid(object? value, ValidationContext validationContext)- {- if (IsValid(value))- {- return ValidationResult.Success;- }-- var effectiveMinLength = GetEffectiveMinimumLength();-- // Format the error message with the minimum password length- var errorMessage = string.Format(- ErrorMessage ?? "Password must be at least {0} characters long.",- effectiveMinLength);-- return new ValidationResult(errorMessage);- }-- /// <summary>- /// Gets the effective minimum length based on the current environment.- /// </summary>- /// <returns>The minimum length to use for validation.</returns>- private int GetEffectiveMinimumLength()- {-#if DEBUG- return DevelopmentMinimumLength ?? MinimumLength;-#else- return MinimumLength;-#endif- }-}diff --git a/apps/server/Shared/AliasVault.Shared/Models/Validation/MustBeTrueAttribute.cs b/apps/server/Shared/AliasVault.Shared/Models/Validation/MustBeTrueAttribute.csdeleted file mode 100644index 456fc47bb..000000000--- a/apps/server/Shared/AliasVault.Shared/Models/Validation/MustBeTrueAttribute.cs+++ /dev/null@@ -1,31 +0,0 @@-//------------------------------------------------------------------------// <copyright file="MustBeTrueAttribute.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.Shared.Models.Validation;--using System.ComponentModel.DataAnnotations;--/// <summary>-/// Validation attribute to ensure that a boolean property is true.-/// </summary>-[AttributeUsage(AttributeTargets.Property)]-public class MustBeTrueAttribute : ValidationAttribute-{- /// <inheritdoc />- public override bool IsValid(object? value)- {- switch (value)- {- case null:- return false;- case bool b:- return b;- default:- throw new InvalidOperationException("Can only be used on boolean properties.");- }- }-}diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/AuthFinishModel.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/AuthFinishModel.csdeleted file mode 100644index 22b83616e..000000000--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/AuthFinishModel.cs+++ /dev/null@@ -1,42 +0,0 @@-//------------------------------------------------------------------------// <copyright file="AuthFinishModel.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.Shared.Models.WebApi.V1.Auth;--/// <summary>-/// Auth finish model using SRP (Secure Remote Password) protocol.-/// </summary>-public class AuthFinishModel-{- /// <summary>- /// Initializes a new instance of the <see cref="AuthFinishModel"/> class.- /// </summary>- /// <param name="email">Email.</param>- /// <param name="a">A.</param>- /// <param name="m1">M1.</param>- public AuthFinishModel(string email, string a, string m1)- {- Email = email;- A = a;- M1 = m1;- }-- /// <summary>- /// Gets or sets the email.- /// </summary>- public string Email { get; set; }-- /// <summary>- /// Gets or sets A which is a value that is used to verify the user's identity.- /// </summary>- public string A { get; set; }-- /// <summary>- /// Gets or sets M1 which is a value that is used to verify the user's identity.- /// </summary>- public string M1 { get; set; }-}diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/AuthStartModel.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/AuthStartModel.csdeleted file mode 100644index 22d2b067f..000000000--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/AuthStartModel.cs+++ /dev/null@@ -1,28 +0,0 @@-//------------------------------------------------------------------------// <copyright file="AuthStartModel.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.Shared.Models.WebApi.V1.Auth;--/// <summary>-/// Auth start model using SRP (Secure Remote Password) protocol.-/// </summary>-public class AuthStartModel-{- /// <summary>- /// Initializes a new instance of the <see cref="AuthStartModel"/> class.- /// </summary>- /// <param name="email">Email.</param>- public AuthStartModel(string email)- {- this.Email = email;- }-- /// <summary>- /// Gets or sets the email.- /// </summary>- public string Email { get; set; }-}diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/RegisterRequest.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/RegisterRequest.csdeleted file mode 100644index cf0d7882f..000000000--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/RegisterRequest.cs+++ /dev/null@@ -1,65 +0,0 @@-//------------------------------------------------------------------------// <copyright file="RegisterRequest.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.Shared.Models.WebApi.V1.Auth;--/// <summary>-/// Register request model.-/// </summary>-public class RegisterRequest-{- /// <summary>- /// Initializes a new instance of the <see cref="RegisterRequest"/> class.- /// </summary>- /// <param name="username">The username.</param>- /// <param name="salt">The salt value.</param>- /// <param name="verifier">The verifier value.</param>- /// <param name="encryptionType">The encryption type.</param>- /// <param name="encryptionSettings">The encryption settings.</param>- /// <param name="srpIdentity">The SRP identity.</param>- public RegisterRequest(string username, string salt, string verifier, string encryptionType, string encryptionSettings, string? srpIdentity = null)- {- Username = username.ToLowerInvariant().Trim();- Salt = salt;- Verifier = verifier;- EncryptionType = encryptionType;- EncryptionSettings = encryptionSettings;- SrpIdentity = srpIdentity;- }-- /// <summary>- /// Gets the username value.- /// </summary>- public string Username { get; }-- /// <summary>- /// Gets the salt value.- /// </summary>- public string Salt { get; }-- /// <summary>- /// Gets the verifier value.- /// </summary>- public string Verifier { get; }-- /// <summary>- /// Gets the encryption type.- /// </summary>- public string EncryptionType { get; }-- /// <summary>- /// Gets the encryption settings.- /// </summary>- public string EncryptionSettings { get; }-- /// <summary>- /// Gets the SRP identity used for authentication. This is a fixed value (typically a GUID) that- /// is used for all SRP operations. If not provided, defaults to the lowercase username for- /// backward compatibility.- /// </summary>- public string? SrpIdentity { get; }-}diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/PasswordChange/PasswordChangeModel.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/PasswordChange/PasswordChangeModel.csdeleted file mode 100644index 95def98bc..000000000--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/PasswordChange/PasswordChangeModel.cs+++ /dev/null@@ -1,29 +0,0 @@-//------------------------------------------------------------------------// <copyright file="PasswordChangeModel.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.Shared.Models.WebApi.V1.PasswordChange;--/// <summary>-/// Password change model.-/// </summary>-public class PasswordChangeModel-{- /// <summary>- /// Gets or sets the current password.- /// </summary>- public string CurrentPassword { get; set; } = null!;-- /// <summary>- /// Gets or sets the password.- /// </summary>- public string NewPassword { get; set; } = null!;-- /// <summary>- /// Gets or sets the password confirmation.- /// </summary>- public string NewPasswordConfirm { get; set; } = null!;-}diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Email/AttachmentApiModel.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Email/AttachmentApiModel.csdeleted file mode 100644index 9bf776c3a..000000000--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Email/AttachmentApiModel.cs+++ /dev/null@@ -1,39 +0,0 @@-//------------------------------------------------------------------------// <copyright file="AttachmentApiModel.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.Shared.Models.WebApi.V2.Email;--/// <summary>-/// Represents an attachment of an email served by the AliasVault V2 email API.-/// </summary>-public class AttachmentApiModel-{- /// <summary>- /// Gets or sets the ID of the attachment.- /// </summary>- public int Id { get; set; }-- /// <summary>- /// Gets or sets the ID of the email the attachment belongs to.- /// </summary>- public int Email_Id { get; set; }-- /// <summary>- /// Gets or sets the filename of the attachment.- /// </summary>- public string Filename { get; set; } = null!;-- /// <summary>- /// Gets or sets the MIME type of the attachment.- /// </summary>- public string MimeType { get; set; } = null!;-- /// <summary>- /// Gets or sets the size of the attachment in bytes.- /// </summary>- public int Filesize { get; set; }-}diff --git a/apps/server/Shared/AliasVault.Shared/README.md b/apps/server/Shared/AliasVault.Shared/README.mdindex 1cff70279..206b8321b 100644--- a/apps/server/Shared/AliasVault.Shared/README.md+++ b/apps/server/Shared/AliasVault.Shared/README.md@@ -1,10 +1,10 @@# AliasVault.Shared-This project contains shared models, DTOs, and functionality used across the AliasVault solution. Unlike AliasVault.Shared.Core, this project can include external dependencies and more complex shared logic.+This project contains shared models, DTOs, application version info (`AppInfo`) and functionality used across the AliasVault solution.## Purpose-This library provides shared components used by both client and server applications:+This library provides shared components used by the server projects:- Data transfer objects (DTOs)- Domain models- Shared services@@ -13,4 +13,4 @@ This library provides shared components used by both client and server applicati## Dependencies-This project can include external dependencies as needed such as utility libraries etc.+This project has no external dependencies.diff --git a/apps/server/Shared/AliasVault.Shared/Utilities/ConversionUtility.cs b/apps/server/Shared/AliasVault.Shared/Utilities/ConversionUtility.csdeleted file mode 100644index 1222de808..000000000--- a/apps/server/Shared/AliasVault.Shared/Utilities/ConversionUtility.cs+++ /dev/null@@ -1,201 +0,0 @@-//------------------------------------------------------------------------// <copyright file="ConversionUtility.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.Shared.Utilities;--using AngleSharp.Dom;-using Ganss.Xss;--/// <summary>-/// Class which contains various helper methods for data conversion.-/// </summary>-public static class ConversionUtility-{- /// <summary>- /// Factory that creates and configures an <see cref="HtmlSanitizer"/> instance for safe email viewing.- /// </summary>- private static readonly Func<HtmlSanitizer> CreateEmailSanitizer = () =>- {- var sanitizer = new HtmlSanitizer();-- // Allow common email formatting elements- sanitizer.AllowedTags.Add("div");- sanitizer.AllowedTags.Add("span");- sanitizer.AllowedTags.Add("p");- sanitizer.AllowedTags.Add("br");- sanitizer.AllowedTags.Add("hr");- sanitizer.AllowedTags.Add("h1");- sanitizer.AllowedTags.Add("h2");- sanitizer.AllowedTags.Add("h3");- sanitizer.AllowedTags.Add("h4");- sanitizer.AllowedTags.Add("h5");- sanitizer.AllowedTags.Add("h6");- sanitizer.AllowedTags.Add("ul");- sanitizer.AllowedTags.Add("ol");- sanitizer.AllowedTags.Add("li");- sanitizer.AllowedTags.Add("table");- sanitizer.AllowedTags.Add("thead");- sanitizer.AllowedTags.Add("tbody");- sanitizer.AllowedTags.Add("tfoot");- sanitizer.AllowedTags.Add("tr");- sanitizer.AllowedTags.Add("th");- sanitizer.AllowedTags.Add("td");- sanitizer.AllowedTags.Add("a");- sanitizer.AllowedTags.Add("img");- sanitizer.AllowedTags.Add("b");- sanitizer.AllowedTags.Add("i");- sanitizer.AllowedTags.Add("u");- sanitizer.AllowedTags.Add("s");- sanitizer.AllowedTags.Add("strike");- sanitizer.AllowedTags.Add("strong");- sanitizer.AllowedTags.Add("em");- sanitizer.AllowedTags.Add("small");- sanitizer.AllowedTags.Add("sub");- sanitizer.AllowedTags.Add("sup");- sanitizer.AllowedTags.Add("blockquote");- sanitizer.AllowedTags.Add("pre");- sanitizer.AllowedTags.Add("code");- sanitizer.AllowedTags.Add("font");- sanitizer.AllowedTags.Add("center");-- // Allow common styling attributes- sanitizer.AllowedAttributes.Add("style");- sanitizer.AllowedAttributes.Add("class");- sanitizer.AllowedAttributes.Add("id");- sanitizer.AllowedAttributes.Add("width");- sanitizer.AllowedAttributes.Add("height");- sanitizer.AllowedAttributes.Add("align");- sanitizer.AllowedAttributes.Add("valign");- sanitizer.AllowedAttributes.Add("bgcolor");- sanitizer.AllowedAttributes.Add("color");- sanitizer.AllowedAttributes.Add("border");- sanitizer.AllowedAttributes.Add("cellpadding");- sanitizer.AllowedAttributes.Add("cellspacing");- sanitizer.AllowedAttributes.Add("colspan");- sanitizer.AllowedAttributes.Add("rowspan");- sanitizer.AllowedAttributes.Add("face");- sanitizer.AllowedAttributes.Add("size");-- // Allow href for links but sanitize URLs- sanitizer.AllowedAttributes.Add("href");- sanitizer.AllowedAttributes.Add("target");- sanitizer.AllowedAttributes.Add("rel");-- // Allow src for images but sanitize URLs- sanitizer.AllowedAttributes.Add("src");- sanitizer.AllowedAttributes.Add("alt");- sanitizer.AllowedAttributes.Add("title");-- // Explicitly remove dangerous elements (fallback)- sanitizer.AllowedTags.Remove("script");- sanitizer.AllowedTags.Remove("object");- sanitizer.AllowedTags.Remove("embed");- sanitizer.AllowedTags.Remove("iframe");- sanitizer.AllowedTags.Remove("frame");- sanitizer.AllowedTags.Remove("frameset");- sanitizer.AllowedTags.Remove("form");- sanitizer.AllowedTags.Remove("input");- sanitizer.AllowedTags.Remove("button");- sanitizer.AllowedTags.Remove("textarea");- sanitizer.AllowedTags.Remove("select");- sanitizer.AllowedTags.Remove("option");- sanitizer.AllowedTags.Remove("link");- sanitizer.AllowedTags.Remove("meta");- sanitizer.AllowedTags.Remove("base");- sanitizer.AllowedTags.Remove("applet");-- return sanitizer;- };-- /// <summary>- /// Lazy-initialized HTML sanitizer instance configured for safe email viewing.- /// Removes all script tags, event handlers, and other XSS vectors while preserving- /// safe HTML for email display.- /// </summary>- private static readonly Lazy<HtmlSanitizer> EmailSanitizer = new(CreateEmailSanitizer);-- /// <summary>- /// Lazy-initialized HTML sanitizer that, in addition to sanitizing, rewrites anchor tags to- /// open in a new tab. This is done as part of the single sanitize pass (via <see cref="HtmlSanitizer.PostProcessNode"/>)- /// so that displaying an email only requires parsing the (potentially large) HTML once instead of twice.- /// </summary>- private static readonly Lazy<HtmlSanitizer> EmailViewSanitizer = new(() =>- {- var sanitizer = CreateEmailSanitizer();- sanitizer.PostProcessNode += (_, e) =>- {- if (e.Node is IElement element && element.NodeName.Equals("A", StringComparison.OrdinalIgnoreCase) && element.HasAttribute("href"))- {- element.SetAttribute("target", "_blank");-- var relValues = new HashSet<string>((element.GetAttribute("rel") ?? string.Empty).Split(' ', StringSplitOptions.RemoveEmptyEntries), StringComparer.OrdinalIgnoreCase);- relValues.Add("noopener");- relValues.Add("noreferrer");- element.SetAttribute("rel", string.Join(" ", relValues));- }- };- return sanitizer;- });-- /// <summary>- /// Sanitizes HTML content for safe display in email viewers.- /// Removes all script tags, event handlers, and other XSS attack vectors.- /// </summary>- /// <param name="html">The HTML content to sanitize.</param>- /// <returns>Sanitized HTML safe for display.</returns>- /// <remarks>- /// This method should be called before displaying any untrusted HTML content- /// (e.g., received emails) to prevent Cross-Site Scripting (XSS) attacks.- /// </remarks>- public static string SanitizeHtmlForEmailViewing(string html)- {- if (string.IsNullOrWhiteSpace(html))- {- return html;- }-- try- {- return EmailSanitizer.Value.Sanitize(html);- }- catch (Exception ex)- {- // Log the exception- Console.WriteLine($"Error in SanitizeHtmlForEmailViewing: {ex.Message}");-- // Return empty string on error to prevent potential XSS- // This is safer than returning the original HTML- return string.Empty;- }- }-- /// <summary>- /// Sanitizes HTML content and converts anchor tags to open in a new tab.- /// This is a convenience method that combines sanitization with anchor tag conversion.- /// </summary>- /// <param name="html">The HTML content to process.</param>- /// <returns>Sanitized HTML with anchor tags configured to open in new tabs.</returns>- public static string SanitizeAndPrepareEmailHtml(string html)- {- if (string.IsNullOrWhiteSpace(html))- {- return html;- }-- try- {- // Sanitize and rewrite anchor tags to open in a new tab in a single parse pass.- return EmailViewSanitizer.Value.Sanitize(html);- }- catch (Exception ex)- {- // Log the exception and return empty string to prevent potential XSS.- Console.WriteLine($"Error in SanitizeAndPrepareEmailHtml: {ex.Message}");- return string.Empty;- }- }-}diff --git a/apps/server/Tests/AliasVault.E2ETests/Infrastructure/Abstracts/WebApplicationFactoryFixture.cs b/apps/server/Tests/AliasVault.E2ETests/Infrastructure/Abstracts/WebApplicationFactoryFixture.csindex aee59e28a..51b903534 100644--- a/apps/server/Tests/AliasVault.E2ETests/Infrastructure/Abstracts/WebApplicationFactoryFixture.cs+++ b/apps/server/Tests/AliasVault.E2ETests/Infrastructure/Abstracts/WebApplicationFactoryFixture.cs@@ -8,7 +8,6 @@namespace AliasVault.E2ETests.Infrastructure.Abstracts;using AliasServerDb;-using AliasVault.Shared.Providers.Time;using AliasVault.Shared.Server.Services;using Microsoft.AspNetCore.Hosting;using Microsoft.AspNetCore.Mvc.Testing;diff --git a/apps/server/Tests/AliasVault.IntegrationTests/AliasVault.IntegrationTests.csproj b/apps/server/Tests/AliasVault.IntegrationTests/AliasVault.IntegrationTests.csprojindex d7eced7ca..4d9071616 100644--- a/apps/server/Tests/AliasVault.IntegrationTests/AliasVault.IntegrationTests.csproj+++ b/apps/server/Tests/AliasVault.IntegrationTests/AliasVault.IntegrationTests.csproj@@ -49,9 +49,9 @@</ItemGroup><ItemGroup>- <ProjectReference Include="..\..\Services\AliasVault.SmtpService\AliasVault.SmtpService.csproj" />- <ProjectReference Include="..\..\Services\AliasVault.TaskRunner\AliasVault.TaskRunner.csproj" />- <ProjectReference Include="..\..\Utilities\Cryptography\AliasVault.Cryptography.Server\AliasVault.Cryptography.Server.csproj" />+ <ProjectReference Include="..\..\AliasVault.SmtpService\AliasVault.SmtpService.csproj" />+ <ProjectReference Include="..\..\AliasVault.TaskRunner\AliasVault.TaskRunner.csproj" />+ <ProjectReference Include="..\..\Utilities\AliasVault.Cryptography\AliasVault.Cryptography.csproj" /></ItemGroup></Project>diff --git a/apps/server/Tests/AliasVault.IntegrationTests/SmtpServer/SmtpServerTests.cs b/apps/server/Tests/AliasVault.IntegrationTests/SmtpServer/SmtpServerTests.csindex 629cf6f39..ac94f174f 100644--- a/apps/server/Tests/AliasVault.IntegrationTests/SmtpServer/SmtpServerTests.cs+++ b/apps/server/Tests/AliasVault.IntegrationTests/SmtpServer/SmtpServerTests.cs@@ -10,8 +10,7 @@ namespace AliasVault.IntegrationTests.SmtpServer;using System.IO.Compression;using System.Net.Sockets;using System.Text;-using AliasServerDb;-using AliasVault.Cryptography.Server;+using AliasVault.Cryptography;using AliasVault.IntegrationTests.SmtpServer.Helpers;using MailKit.Net.Smtp;using MailKit.Security;diff --git a/apps/server/Tests/AliasVault.UnitTests/AliasVault.UnitTests.csproj b/apps/server/Tests/AliasVault.UnitTests/AliasVault.UnitTests.csprojindex 07f814ab5..0b76ad3fb 100644--- a/apps/server/Tests/AliasVault.UnitTests/AliasVault.UnitTests.csproj+++ b/apps/server/Tests/AliasVault.UnitTests/AliasVault.UnitTests.csproj@@ -53,8 +53,7 @@<ProjectReference Include="..\..\AliasVault.Api\AliasVault.Api.csproj" /><ProjectReference Include="..\..\Databases\AliasClientDb\AliasClientDb.csproj" /><ProjectReference Include="..\..\Databases\AliasServerDb\AliasServerDb.csproj" />- <ProjectReference Include="..\..\Utilities\Cryptography\AliasVault.Cryptography.Client\AliasVault.Cryptography.Client.csproj" />- <ProjectReference Include="..\..\Utilities\Cryptography\AliasVault.Cryptography.Server\AliasVault.Cryptography.Server.csproj" />+ <ProjectReference Include="..\..\Utilities\AliasVault.Cryptography\AliasVault.Cryptography.csproj" /><ProjectReference Include="..\..\Utilities\AliasVault.FaviconExtractor\AliasVault.FaviconExtractor.csproj" /><ProjectReference Include="..\..\Utilities\AliasVault.TotpGenerator\AliasVault.TotpGenerator.csproj" /></ItemGroup>diff --git a/apps/server/Tests/AliasVault.UnitTests/Services/AnonymizedSenderBucketTests.cs b/apps/server/Tests/AliasVault.UnitTests/Services/AnonymizedSenderBucketTests.csindex a310bcba6..f19e8e408 100644--- a/apps/server/Tests/AliasVault.UnitTests/Services/AnonymizedSenderBucketTests.cs+++ b/apps/server/Tests/AliasVault.UnitTests/Services/AnonymizedSenderBucketTests.cs@@ -8,7 +8,7 @@namespace AliasVault.UnitTests.Services;using System.Globalization;-using AliasVault.Cryptography.Server;+using AliasVault.Cryptography;/// <summary>/// Tests for <see cref="AnonymizedSenderBucket"/>.diff --git a/apps/server/Tests/AliasVault.UnitTests/Utilities/ConversionUtilityTest.cs b/apps/server/Tests/AliasVault.UnitTests/Utilities/ConversionUtilityTest.csdeleted file mode 100644index 72736c907..000000000--- a/apps/server/Tests/AliasVault.UnitTests/Utilities/ConversionUtilityTest.cs+++ /dev/null@@ -1,151 +0,0 @@-//------------------------------------------------------------------------// <copyright file="ConversionUtilityTest.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.UnitTests.Utilities;--using System.Text.RegularExpressions;-using AliasVault.Shared.Utilities;--/// <summary>-/// Tests for the ConversionUtility class.-/// </summary>-public class ConversionUtilityTest-{- /// <summary>- /// Tests the conversion of a simple anchor tag to open in a new tab.- /// </summary>- [Test]- public void TestAnchorTabConversionSimple()- {- string anchorHtml = "<a href=\"https://dutchamzmasters.lt.acemlnb.com/Prod/link-tracker?redirectUrl=aHR0cHMlM0ElMkYlMkZ3d3cuZHV0Y2hhbXptYXN0ZXJzLmNvbSUyRnRoYW5rLXlvdTloN3poZ3Rp&sig=CpED3rRPX48ddoWTUZURadAYPYgPppT312jUNnvUCPo5&iat=1679512450&a=%7C%7C25799960%7C%7C&account=dutchamzmasters%2Eactivehosted%2Ecom&email=DQeVbqE%2Fy2FD5V3I2cvSxXjJCI3Tg5qfUHKGneOhzjJYZ1kM3LVZcQ%3D%3D%3AvdAW7N7fs1pZlI1ib%2BNbsMYz5m4FssAR&s=5241db963ffe25d6f4b762fc00038ee2&i=163A299A10A816\"></a>";- string convertedAnchorTags = ConversionUtility.SanitizeAndPrepareEmailHtml(anchorHtml);-- // Check that conversion works as expected.- Assert.That(convertedAnchorTags, Does.Contain("target=\"_blank\""));- }-- /// <summary>- /// Tests the conversion of a complex anchor tag with multiple attributes to open in a new tab.- /// </summary>- [Test]- public void TestAnchorTabConversionComplex1()- {- string anchorHtml = "<a\nhref=\"https://dutchamzmasters.lt.acemlnb.com/Prod/link-tracker?redirectUrl=aHR0cHMlM0ElMkYlMkZ3d3cuZHV0Y2hhbXptYXN0ZXJzLmNvbSUyRnRoYW5rLXlvdTloN3poZ3Rp&sig=CpED3rRPX48ddoWTUZURadAYPYgPppT312jUNnvUCPo5&iat=1679512450&a=%7C%7C25799960%7C%7C&account=dutchamzmasters%2Eactivehosted%2Ecom&email=DQeVbqE%2Fy2FD5V3I2cvSxXjJCI3Tg5qfUHKGneOhzjJYZ1kM3LVZcQ%3D%3D%3AvdAW7N7fs1pZlI1ib%2BNbsMYz5m4FssAR&s=5241db963ffe25d6f4b762fc00038ee2&i=163A299A10A816\" data-ac-default-color=\"1\" style=\"margin: 0; outline: none; padding: 0; color: #045FB4; text-decoration: underline; font-weight: bold;\"><span style=\"color: ; font-size: inherit; font-weight: inherit; line-height: inherit; text-decoration: inherit;\">Start hier met de training >>></span></a>";- string convertedAnchorTags = ConversionUtility.SanitizeAndPrepareEmailHtml(anchorHtml);-- // Check that conversion works as expected.- Assert.That(convertedAnchorTags, Does.Contain("target=\"_blank\""));- }-- /// <summary>- /// Tests the conversion of a complex anchor tag with nested elements to open in a new tab.- /// </summary>- [Test]- public void TestAnchorTabConversionComplex2()- {- string anchorHtml = "<div class=\"btn btn--flat btn--large\" style=\"Margin-bottom: 20px;text-align: center;\">\n <!--[if !mso]><!--><a style=\"border-radius: 4px;display: inline-block;font-size: 14px;font-weight: bold;line-height: 24px;padding: 12px 24px;text-align: center;text-decoration: none !important;transition: opacity 0.1s ease-in;color: #212529 !important;background-color: #ffdd55;font-family: Open Sans, sans-serif;\" href=\"https://eazegamesbv.cmail19.com/t/j-l-sktidll-ddhdthjhkj-j/\">Haal je beloning op</a><!--<![endif]-->\n <!--[if mso]><p style=\"line-height:0;margin:0;\"> </p><v:roundrect xmlns:v=\"urn:schemas-microsoft-com:vml\" href=\"https://eazegamesbv.cmail19.com/t/j-l-sktidll-ddhdthjhkj-j/\" style=\"width:136.5pt\" arcsize=\"9%\" fillcolor=\"#FFDD55\" stroke=\"f\"><v:textbox style=\"mso-fit-shape-to-text:t\" inset=\"0pt,8.25pt,0pt,8.25pt\"><center style=\"font-size:14px;line-height:24px;color:#212529;font-family:Open Sans,sans-serif;font-weight:bold;mso-line-height-rule:exactly;mso-text-raise:1.5px\">Haal je beloning op</center></v:textbox></v:roundrect><![endif]--></div>";- string convertedAnchorTags = ConversionUtility.SanitizeAndPrepareEmailHtml(anchorHtml);-- // Check that conversion works as expected.- Assert.That(convertedAnchorTags, Does.Contain("target=\"_blank\""));- }-- /// <summary>- /// Tests the conversion of a complex anchor tag within a table cell to open in a new tab.- /// </summary>- [Test]- public void TestAnchorTabConversionComplex3()- {- string anchorHtml = "<td style=\"word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; vertical-align: top; font-family: Helvetica, Arial, sans-serif; font-weight: normal; margin: 0; Margin: 0; font-size: 16px; line-height: 1.3; text-align: center; color: #fefefe; background: #f17130; border-radius: 5px; border: 0 solid #f17130; width: 400px; padding: 5px; border-collapse: collapse;\"><a href=\"https://click.info.wijkopenautos.nl/f/a/chSbfTJZeP5dGZaVjOIUlw~~/AABMyAA~/RgRnzW26P0SwaHR0cHM6Ly93d3cud2lqa29wZW5hdXRvcy5ubC9pbnNwZWN0aW9uL2UwZTg0M2Y4NGEzZDRjYjc4MDYwMGU2NDEzNzc1NmEyLz9NSUQ9TkxfQ1JNXzFfM18wXzE5NjY3MF8yNDE5NTgwMTEyNDdfMSZ0bXM9MTcwOTg5Mzc4MyZ1dG1fc291cmNlPUNSTSZ1dG1fbWVkaXVtPWVtYWlsJnV0bV9jYW1wYWlnbj0zXzdXBXNwY2V1Qgpl6bro6mX9yH0mUhJidWxhYmVlckBhc2Rhc2QubmxYBAAAAAw~\" style=\"margin: 0; Margin: 0; line-height: 1.3; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: bold; color: #fefefe; text-decoration: none; display: inline-block; background: #f17130; border: 0 solid #f17130; width: 400px; text-align: center; padding: 5px; border-radius: 5px;\">Ontvang nu jouw prijs <b>></b></a></td>";- string convertedAnchorTags = ConversionUtility.SanitizeAndPrepareEmailHtml(anchorHtml);-- // Check that conversion works as expected.- Assert.That(convertedAnchorTags, Does.Contain("target=\"_blank\""));- }-- /// <summary>- /// Tests the conversion of a complex anchor tag within a table cell to open in a new tab.- /// </summary>- [Test]- public void TestAnchorTabConversionComplex4()- {- string anchorHtml = "<a href=\"https://www.maxmind.com/en/account/set-password?token=FEA9D6D78B624D6BB048687F4D0A2DD9\">https://www<span>.</span>maxmind<span>.</span>com/en/account/set-password?token=FEA9D6D78B624D6BB048687F4D0A2DD9</a>";- string convertedAnchorTags = ConversionUtility.SanitizeAndPrepareEmailHtml(anchorHtml);-- // Check that conversion works as expected.- Assert.That(convertedAnchorTags, Does.Contain("target=\"_blank\""));- }-- /// <summary>- /// Tests the conversion of a complex anchor tag with existing target="_blank" attribute to- /// not get a second attribute after conversion.- /// </summary>- [Test]- public void TestAnchorTabConversionComplex5()- {- string anchorHtml = "<a href=\"test.html\" target=\"_blank\">test anchor text</a>";- string convertedAnchorTags = ConversionUtility.SanitizeAndPrepareEmailHtml(anchorHtml);-- int targetBlankCount = Regex.Matches(convertedAnchorTags, "target=\"_blank\"", RegexOptions.NonBacktracking).Count;-- Assert.Multiple(() =>- {- // Check that only one target="_blank" appears.- Assert.That(targetBlankCount, Is.EqualTo(1), "There should be exactly one target=\"_blank\" attribute.");-- // Ensure other attributes are preserved- Assert.That(convertedAnchorTags, Does.Contain("href=\"test.html\""), "The href attribute should be preserved.");-- // Check that the anchor text is preserved- Assert.That(convertedAnchorTags, Does.Contain(">test anchor text</a>"), "The anchor text should be preserved.");- });- }-- /// <summary>- /// Tests that the single-pass sanitize-and-prepare both rewrites anchors to open in a new tab- /// (with security rel attributes) and strips dangerous content.- /// </summary>- [Test]- public void TestSanitizeAndPrepareEmailHtml()- {- string html = "<div><script>alert('xss')</script><a href=\"https://example.com\">link</a></div>";- string result = ConversionUtility.SanitizeAndPrepareEmailHtml(html);-- Assert.Multiple(() =>- {- // Anchors are rewritten to open in a new tab with security attributes.- Assert.That(result, Does.Contain("target=\"_blank\""), "The anchor should open in a new tab.");- Assert.That(result, Does.Contain("noopener"), "The anchor should have rel=noopener.");- Assert.That(result, Does.Contain("noreferrer"), "The anchor should have rel=noreferrer.");-- // Dangerous content is removed.- Assert.That(result, Does.Not.Contain("<script"), "Script tags should be stripped.");-- // Safe content is preserved.- Assert.That(result, Does.Contain("href=\"https://example.com\""), "The href should be preserved.");- Assert.That(result, Does.Contain(">link</a>"), "The anchor text should be preserved.");- });- }-- /// <summary>- /// Tests that an existing target attribute is normalized to _blank without duplicating it.- /// </summary>- [Test]- public void TestSanitizeAndPrepareEmailHtmlNormalizesExistingTarget()- {- string html = "<a href=\"https://example.com\" target=\"_self\">link</a>";- string result = ConversionUtility.SanitizeAndPrepareEmailHtml(html);-- int targetCount = Regex.Matches(result, "target=", RegexOptions.NonBacktracking).Count;-- Assert.Multiple(() =>- {- Assert.That(targetCount, Is.EqualTo(1), "There should be exactly one target attribute.");- Assert.That(result, Does.Contain("target=\"_blank\""), "The target should be normalized to _blank.");- });- }-}diff --git a/apps/server/Tests/AliasVault.UnitTests/Utilities/EmailEncryptionTests.cs b/apps/server/Tests/AliasVault.UnitTests/Utilities/EmailEncryptionTests.csindex 43f35d78a..bfdc12db5 100644--- a/apps/server/Tests/AliasVault.UnitTests/Utilities/EmailEncryptionTests.cs+++ b/apps/server/Tests/AliasVault.UnitTests/Utilities/EmailEncryptionTests.cs@@ -10,7 +10,7 @@ namespace AliasVault.UnitTests.Utilities;using System.IO.Compression;using System.Text;using AliasServerDb;-using AliasVault.Cryptography.Server;+using AliasVault.Cryptography;using AliasVault.Shared.Models.Enums;/// <summary>diff --git a/apps/server/Tests/AliasVault.UnitTests/Utilities/RsaEncryptionTests.cs b/apps/server/Tests/AliasVault.UnitTests/Utilities/RsaEncryptionTests.csindex fb57ff1c6..ce7218f8d 100644--- a/apps/server/Tests/AliasVault.UnitTests/Utilities/RsaEncryptionTests.cs+++ b/apps/server/Tests/AliasVault.UnitTests/Utilities/RsaEncryptionTests.cs@@ -8,7 +8,7 @@namespace AliasVault.UnitTests.Utilities;using System.Text.Json;-using AliasVault.Cryptography.Server;+using AliasVault.Cryptography;/// <summary>/// Tests for the SrpArgonEncryption class.diff --git a/apps/server/Tests/AliasVault.UnitTests/Utilities/SrpEncryptionTests.cs b/apps/server/Tests/AliasVault.UnitTests/Utilities/SrpEncryptionTests.csindex 25ec6c041..76fb02278 100644--- a/apps/server/Tests/AliasVault.UnitTests/Utilities/SrpEncryptionTests.cs+++ b/apps/server/Tests/AliasVault.UnitTests/Utilities/SrpEncryptionTests.cs@@ -9,7 +9,7 @@ namespace AliasVault.UnitTests.Utilities;using System.Security.Cryptography;using System.Text;-using AliasVault.Cryptography.Client;+using AliasVault.Cryptography;using SecureRemotePassword;/// <summary>@@ -33,7 +33,7 @@ public class SrpEncryptionTestsConsole.WriteLine($"Derived key: {key.Length} bytes (hex: {Convert.ToHexString(key).Replace("-", string.Empty)})");// SymmetricEncrypt the plaintext- string encrypted = Cryptography.Server.Encryption.SymmetricEncrypt(plaintext, key);+ string encrypted = Cryptography.Encryption.SymmetricEncrypt(plaintext, key);Console.WriteLine($"Encrypted: {encrypted}");Assert.That(encrypted, Is.Not.Null);@@ -41,7 +41,7 @@ public class SrpEncryptionTestsAssert.That(encrypted, Is.Not.EqualTo(plaintext));// SymmetricDecrypt the ciphertext- string decrypted = Cryptography.Server.Encryption.SymmetricDecrypt(encrypted, key);+ string decrypted = Cryptography.Encryption.SymmetricDecrypt(encrypted, key);Console.WriteLine($"Decrypted: {decrypted}");Assert.That(decrypted, Is.EqualTo(plaintext));@@ -61,7 +61,7 @@ public class SrpEncryptionTestsvar encryptionKey = Convert.FromBase64String(jsEncryptionKeyBase64);// Try to decrypt it from .NET.- var decrypted = Cryptography.Server.Encryption.SymmetricDecrypt(jsEncryptedBase64Contents, encryptionKey);+ var decrypted = Cryptography.Encryption.SymmetricDecrypt(jsEncryptedBase64Contents, encryptionKey);// Assert that its equal as the original what we expect.var originalUnencrypted = "U1FMaXRlIGZvcm1hdCAzABAAAQEAQCAgAAAAAQAAAAMAAAAAAAAAAAAAAAIAAAAEAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAC52iQ0P+AACDvUADvUPxQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIFNAQcXHx8Bgml0YWJsZVBhc3N3b3Jkc1Bhc3N3b3JkcwJDUkVBVEUgVEFCTEUgIlBhc3N3b3JkcyIgKAogICAgIklkIiBURVhUIE5PVCBOVUxMIENPTlNUUkFJTlQgIlBLX1Bhc3N3b3JkcyIgUFJJTUFSWSBLRVksCiAgICAiVmFsdWUiIFRFWFQgTlVMTCwKICAgICJDcmVhdGVkQXQiIFRFWFQgTk9UIE5VTEwsCiAgICAiVXBkYXRlZEF0IiBURVhUIE5PVCBOVUxMCikxAgYXRR8BAGluZGV4c3FsaXRlX2F1dG9pbmRleF9QYXNzd29yZHNfMVBhc3N3b3JkcwMAAAAIAAAAAA0AAAADDrMAD5EPIg6zAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABtAwVVQTszNTVDMzNFQzYtQ0NDOC00QTI1LUI4MjgtNTJCQTQ5RUE1RDE3VGVzdCBmYWN0b3J5IGluc2VydCBTUUxpdGUyMDI0LTA2LTI0IDE0OjEwOjUxLjI3MjAwMDEtMDEtMDEgMDA6MDA6MDBtAgVVQTszRTk3ODAyREItOUVCMy00QzZCLUE3QjktNzQ2RUNGMzc0ODg4VGVzdCBmYWN0b3J5IGluc2VydCBTUUxpdGUyMDI0LTA2LTI0IDE0OjEwOjUxLjA0OTAwMDEtMDEtMDEgMDA6MDA6MDBtAQVVQTszNjk2M0I1RTktREE1RS00ODAwLTlDMjAtM0QwOTdCRUJCNDIyVGVzdCBmYWN0b3J5IGluc2VydCBTUUxpdGUyMDI0LTA2LTI0IDE0OjEwOjQ5LjY3MzAwMDEtMDEtMDEgMDA6MDA6MDAKAAAAAw+GAA/XD68PhgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgDVQFFOTc4MDJEQi05RUIzLTRDNkItQTdCOS03NDZFQ0YzNzQ4ODgCJwNVCTY5NjNCNUU5LURBNUUtNDgwMC05QzIwLTNEMDk3QkVCQjQyMigDVQE1NUMzM0VDNi1DQ0M4LTRBMjUtQjgyOC01MkJBNDlFQTVEMTcD";@@ -82,12 +82,12 @@ public class SrpEncryptionTestsbyte[] key = DeriveTestKey(password, salt);// SymmetricEncrypt the plaintext- string encrypted = Cryptography.Server.Encryption.SymmetricEncrypt(plaintext, key);+ string encrypted = Cryptography.Encryption.SymmetricEncrypt(plaintext, key);// SymmetricDecrypt the ciphertext using a different keybyte[] key2 = DeriveTestKey("your-password2", salt);- Assert.Throws<AuthenticationTagMismatchException>(() => Cryptography.Server.Encryption.SymmetricDecrypt(encrypted, key2));+ Assert.Throws<AuthenticationTagMismatchException>(() => Cryptography.Encryption.SymmetricDecrypt(encrypted, key2));}/// <summary>@@ -106,14 +106,12 @@ public class SrpEncryptionTestsbyte[] passwordHash = DeriveTestKey(password, salt);var passwordHashString = Convert.ToHexString(passwordHash).Replace("-", string.Empty);- var srpSignup = Srp.PasswordChangeAsync(client, salt, email, passwordHashString);-- var privateKey = srpSignup.PrivateKey;- var verifier = srpSignup.Verifier;+ var privateKey = client.DerivePrivateKey(salt, email, passwordHashString);+ var verifier = client.DeriveVerifier(privateKey);// Login -----------------------------------// 1. Client generates an ephemeral value.- var clientEphemeral = Srp.GenerateEphemeralClient();+ var clientEphemeral = client.GenerateEphemeral();// --> Then client sends request to server.@@ -124,7 +122,7 @@ public class SrpEncryptionTests// --> Send serverEphemeral.Public to client.// 3. Client derives shared session key.- var clientSession = Srp.DeriveSessionClient(privateKey, clientEphemeral.Secret, serverEphemeral.Public, salt, email);+ var clientSession = client.DeriveSession(clientEphemeral.Secret, serverEphemeral.Public, salt, email, privateKey);// --> send session.Proof to server.@@ -135,7 +133,7 @@ public class SrpEncryptionTestsAssert.That(serverSession, Is.Not.Null, "Server session is null, likely indicating that the provided password is incorrect.");// 5. Client verifies the proof.- Srp.VerifySession(clientEphemeral.Public, clientSession, serverSession.Proof);+ client.VerifySession(clientEphemeral.Public, clientSession, serverSession.Proof);// Ensure the keys match.Assert.That(clientSession.Key, Is.EqualTo(serverSession.Key));@@ -157,14 +155,14 @@ public class SrpEncryptionTestsnew Random().NextBytes(plainBytes);// SymmetricEncrypt the plainBytes- var cipherBytes = Cryptography.Server.Encryption.SymmetricEncrypt(plainBytes, key);+ var cipherBytes = Cryptography.Encryption.SymmetricEncrypt(plainBytes, key);Assert.That(cipherBytes, Is.Not.Null);Assert.That(cipherBytes, Is.Not.Empty);Assert.That(cipherBytes, Is.Not.EqualTo(plainBytes));// SymmetricDecrypt the cipherBytes- var decrypted = Cryptography.Server.Encryption.SymmetricDecrypt(cipherBytes, key);+ var decrypted = Cryptography.Encryption.SymmetricDecrypt(cipherBytes, key);Assert.That(decrypted, Is.EqualTo(plainBytes));}diff --git a/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Client/AliasVault.Cryptography.Client.csproj b/apps/server/Utilities/AliasVault.Cryptography/AliasVault.Cryptography.csprojsimilarity index 65%rename from apps/server/Utilities/Cryptography/AliasVault.Cryptography.Client/AliasVault.Cryptography.Client.csprojrename to apps/server/Utilities/AliasVault.Cryptography/AliasVault.Cryptography.csprojindex aa6d292e4..828b4479f 100644--- a/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Client/AliasVault.Cryptography.Client.csproj+++ b/apps/server/Utilities/AliasVault.Cryptography/AliasVault.Cryptography.csproj@@ -8,19 +8,17 @@</PropertyGroup><PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">- <DocumentationFile>bin\Debug\net10.0\CryptographyClient.xml</DocumentationFile><TreatWarningsAsErrors>true</TreatWarningsAsErrors>+ <DocumentationFile>bin\Debug\net10.0\AliasVault.Cryptography.xml</DocumentationFile></PropertyGroup><PropertyGroup Condition=" '$(Configuration)' == 'Release' ">- <DocumentationFile>bin\Release\net10.0\CryptographyClient.xml</DocumentationFile><TreatWarningsAsErrors>true</TreatWarningsAsErrors>+ <DocumentationFile>bin\Release\net10.0\AliasVault.Cryptography.xml</DocumentationFile></PropertyGroup><ItemGroup>- <AdditionalFiles Include="..\..\..\stylecop.json">- <Link>stylecop.json</Link>- </AdditionalFiles>+ <AdditionalFiles Include="..\..\stylecop.json" Link="stylecop.json" /></ItemGroup><ItemGroup>@@ -31,4 +29,9 @@</PackageReference></ItemGroup>+ <ItemGroup>+ <ProjectReference Include="..\..\Databases\AliasServerDb\AliasServerDb.csproj" />+ <ProjectReference Include="..\..\Shared\AliasVault.Shared.Server\AliasVault.Shared.Server.csproj" />+ </ItemGroup>+</Project>diff --git a/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Server/AnonymizedSenderBucket.cs b/apps/server/Utilities/AliasVault.Cryptography/AnonymizedSenderBucket.cssimilarity index 97%rename from apps/server/Utilities/Cryptography/AliasVault.Cryptography.Server/AnonymizedSenderBucket.csrename to apps/server/Utilities/AliasVault.Cryptography/AnonymizedSenderBucket.csindex 99f45046e..e6eb90b70 100644--- a/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Server/AnonymizedSenderBucket.cs+++ b/apps/server/Utilities/AliasVault.Cryptography/AnonymizedSenderBucket.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Cryptography.Server;+namespace AliasVault.Cryptography;using System.Buffers.Binary;using System.Security.Cryptography;diff --git a/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Server/CertificateGenerator.cs b/apps/server/Utilities/AliasVault.Cryptography/CertificateGenerator.cssimilarity index 98%rename from apps/server/Utilities/Cryptography/AliasVault.Cryptography.Server/CertificateGenerator.csrename to apps/server/Utilities/AliasVault.Cryptography/CertificateGenerator.csindex 57f7e72e5..97e629913 100644--- a/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Server/CertificateGenerator.cs+++ b/apps/server/Utilities/AliasVault.Cryptography/CertificateGenerator.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Cryptography.Server;+namespace AliasVault.Cryptography;using System;using System.IO;diff --git a/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Server/DataProtectionExtensions.cs b/apps/server/Utilities/AliasVault.Cryptography/DataProtectionExtensions.cssimilarity index 99%rename from apps/server/Utilities/Cryptography/AliasVault.Cryptography.Server/DataProtectionExtensions.csrename to apps/server/Utilities/AliasVault.Cryptography/DataProtectionExtensions.csindex a9acdd7ec..c868081f8 100644--- a/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Server/DataProtectionExtensions.cs+++ b/apps/server/Utilities/AliasVault.Cryptography/DataProtectionExtensions.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Cryptography.Server;+namespace AliasVault.Cryptography;using System.Security.Cryptography.X509Certificates;using AliasServerDb;diff --git a/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Client/Defaults.cs b/apps/server/Utilities/AliasVault.Cryptography/Defaults.cssimilarity index 96%rename from apps/server/Utilities/Cryptography/AliasVault.Cryptography.Client/Defaults.csrename to apps/server/Utilities/AliasVault.Cryptography/Defaults.csindex 482ded163..8727db378 100644--- a/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Client/Defaults.cs+++ b/apps/server/Utilities/AliasVault.Cryptography/Defaults.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Cryptography.Client;+namespace AliasVault.Cryptography;/// <summary>/// Cryptography defaults.diff --git a/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Server/EmailEncryption.cs b/apps/server/Utilities/AliasVault.Cryptography/EmailEncryption.cssimilarity index 99%rename from apps/server/Utilities/Cryptography/AliasVault.Cryptography.Server/EmailEncryption.csrename to apps/server/Utilities/AliasVault.Cryptography/EmailEncryption.csindex 88c886758..f874689f5 100644--- a/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Server/EmailEncryption.cs+++ b/apps/server/Utilities/AliasVault.Cryptography/EmailEncryption.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Cryptography.Server;+namespace AliasVault.Cryptography;using AliasServerDb;diff --git a/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Server/Encryption.cs b/apps/server/Utilities/AliasVault.Cryptography/Encryption.cssimilarity index 99%rename from apps/server/Utilities/Cryptography/AliasVault.Cryptography.Server/Encryption.csrename to apps/server/Utilities/AliasVault.Cryptography/Encryption.csindex 67acafb4e..4dd04d79d 100644--- a/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Server/Encryption.cs+++ b/apps/server/Utilities/AliasVault.Cryptography/Encryption.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Cryptography.Server;+namespace AliasVault.Cryptography;using System.Security.Cryptography;using System.Text;diff --git a/apps/server/Utilities/AliasVault.Cryptography/Srp.cs b/apps/server/Utilities/AliasVault.Cryptography/Srp.csnew file mode 100644index 000000000..4c8afee06--- /dev/null+++ b/apps/server/Utilities/AliasVault.Cryptography/Srp.cs@@ -0,0 +1,66 @@+//-----------------------------------------------------------------------+// <copyright file="Srp.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.Cryptography;++using SecureRemotePassword;++/// <summary>+/// Server side of the SRP (secure remote password) protocol, which lets a user authenticate+/// without sending the password over the network. The client side lives in the Rust core.+/// </summary>+public static class Srp+{+ /// <summary>+ /// Generate an ephemeral value for the server.+ /// </summary>+ /// <param name="verifier">Verifier.</param>+ /// <returns>Ephemeral as string.</returns>+ public static SrpEphemeral GenerateEphemeralServer(string verifier)+ {+ var server = new SrpServer();+ return server.GenerateEphemeral(verifier);+ }++ /// <summary>+ /// Derive a shared session key on the server side.+ /// </summary>+ /// <param name="serverEphemeralSecret">serverEphemeralSecret.</param>+ /// <param name="clientEphemeralPublic">clientEphemeralPublic.</param>+ /// <param name="salt">Salt.</param>+ /// <param name="username">Username.</param>+ /// <param name="verifier">Verifier.</param>+ /// <param name="clientSessionProof">Client session proof.</param>+ /// <returns>SrpSession.</returns>+ public static SrpSession? DeriveSessionServer(string serverEphemeralSecret, string clientEphemeralPublic, string salt, string username, string verifier, string clientSessionProof)+ {+ // Make sure the username is lowercase as the SRP protocol is case sensitive.+ username = username.ToLowerInvariant();++ try+ {+ var server = new SrpServer();+ return server.DeriveSession(+ serverEphemeralSecret,+ clientEphemeralPublic,+ salt,+ username,+ verifier,+ clientSessionProof);+ }+ catch (System.Security.SecurityException)+ {+ // Incorrect password provided, return null.+ return null;+ }+ catch (FormatException)+ {+ // Malformed (non-hexadecimal) ephemeral or proof provided, return null.+ return null;+ }+ }+}diff --git a/apps/server/Utilities/AliasVault.InstallCli/Program.cs b/apps/server/Utilities/AliasVault.InstallCli/Program.csindex 7b70694f5..d72439164 100644--- a/apps/server/Utilities/AliasVault.InstallCli/Program.cs+++ b/apps/server/Utilities/AliasVault.InstallCli/Program.cs@@ -7,7 +7,6 @@using AliasServerDb;using Microsoft.AspNetCore.Identity;-using Microsoft.EntityFrameworkCore;using Microsoft.EntityFrameworkCore.Metadata;// Add return type for top-level statementsdiff --git a/apps/server/Utilities/AliasVault.InstallCli/README.md b/apps/server/Utilities/AliasVault.InstallCli/README.mdindex 5a1b54f26..95dd6acf6 100644--- a/apps/server/Utilities/AliasVault.InstallCli/README.md+++ b/apps/server/Utilities/AliasVault.InstallCli/README.md@@ -4,5 +4,5 @@ setup scripts to initialize the project.It contains the following features:- Hash random admin password during CLI setup.-See the [install.sh](../../../install.sh) script in the root of this solution for more information on how this+See the [install.sh](../../../../install.sh) script in the root of this repository for more information on how thisCLI is used.diff --git a/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Client/Models/SrpPasswordChange.cs b/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Client/Models/SrpPasswordChange.csdeleted file mode 100644index 02124c824..000000000--- a/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Client/Models/SrpPasswordChange.cs+++ /dev/null@@ -1,49 +0,0 @@-//------------------------------------------------------------------------// <copyright file="SrpPasswordChange.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.Cryptography.Client.Models;--/// <summary>-/// Represents the data required for signing up or changing password with the Secure Remote Password (SRP) protocol.-/// </summary>-public class SrpPasswordChange-{- /// <summary>- /// Initializes a new instance of the <see cref="SrpPasswordChange"/> class with the specified salt, private key, and verifier.- /// </summary>- /// <param name="username">The username.</param>- /// <param name="salt">The salt value.</param>- /// <param name="privateKey">The private key value.</param>- /// <param name="verifier">The verifier value.</param>- public SrpPasswordChange(string username, string salt, string privateKey, string verifier)- {- Username = username.ToLowerInvariant().Trim();- Salt = salt;- PrivateKey = privateKey;- Verifier = verifier;- }-- /// <summary>- /// Gets the username value.- /// </summary>- public string Username { get; }-- /// <summary>- /// Gets the salt value.- /// </summary>- public string Salt { get; }-- /// <summary>- /// Gets the private key value.- /// </summary>- public string PrivateKey { get; }-- /// <summary>- /// Gets the verifier value.- /// </summary>- public string Verifier { get; }-}diff --git a/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Client/Srp.cs b/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Client/Srp.csdeleted file mode 100644index fa6d0a466..000000000--- a/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Client/Srp.cs+++ /dev/null@@ -1,149 +0,0 @@-//------------------------------------------------------------------------// <copyright file="Srp.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.Cryptography.Client;--using AliasVault.Cryptography.Client.Models;-using SecureRemotePassword;--/// <summary>-/// SRP is a secure remote password protocol that allows a user to authenticate themselves-/// to a server without sending the password over the network.-/// </summary>-public static class Srp-{- /// <summary>- /// Prepare password change step used for both registration and actual password change.- /// </summary>- /// <param name="client">SrpClient.</param>- /// <param name="salt">Salt.</param>- /// <param name="username">Username.</param>- /// <param name="passwordHashString">Hashed password string.</param>- /// <returns>SrpSignup model.</returns>- public static SrpPasswordChange PasswordChangeAsync(SrpClient client, string salt, string username, string passwordHashString)- {- // Derive a key from the password using Argon2id.- // Make sure the username is lowercase as the SRP protocol is case sensitive.- username = username.ToLowerInvariant();-- // Signup or password change: client generates a salt and verifier.- var privateKey = DerivePrivateKey(salt, username, passwordHashString);- var verifier = client.DeriveVerifier(privateKey);-- return new SrpPasswordChange(username, salt, privateKey, verifier);- }-- /// <summary>- /// Derive a private key for a user.- /// </summary>- /// <param name="salt">Salt.</param>- /// <param name="username">Username.</param>- /// <param name="passwordHashString">Hashed password string.</param>- /// <returns>Private key as string.</returns>- public static string DerivePrivateKey(string salt, string username, string passwordHashString)- {- // Make sure the username is lowercase as the SRP protocol is case sensitive.- username = username.ToLowerInvariant();-- var client = new SrpClient();- return client.DerivePrivateKey(salt, username, passwordHashString);- }-- /// <summary>- /// Generate an ephemeral value for the client.- /// </summary>- /// <returns>Ephemeral as string.</returns>- public static SrpEphemeral GenerateEphemeralClient()- {- var client = new SrpClient();- return client.GenerateEphemeral();- }-- /// <summary>- /// Generate an ephemeral value for the client.- /// </summary>- /// <param name="verifier">Verifier.</param>- /// <returns>Ephemeral as string.</returns>- public static SrpEphemeral GenerateEphemeralServer(string verifier)- {- var server = new SrpServer();- return server.GenerateEphemeral(verifier);- }-- /// <summary>- /// Derive a shared session key on the client side.- /// </summary>- /// <param name="privateKey">Password hash.</param>- /// <param name="clientSecretEphemeral">Client ephemeral secret.</param>- /// <param name="serverEphemeralPublic">Server public ephemeral.</param>- /// <param name="salt">Salt.</param>- /// <param name="username">Username.</param>- /// <returns>session.</returns>- public static SrpSession DeriveSessionClient(string privateKey, string clientSecretEphemeral, string serverEphemeralPublic, string salt, string username)- {- // Make sure the username is lowercase as the SRP protocol is case sensitive.- username = username.ToLowerInvariant();-- var client = new SrpClient();- return client.DeriveSession(- clientSecretEphemeral,- serverEphemeralPublic,- salt,- username,- privateKey);- }-- /// <summary>- /// Derive a shared session key on the server side.- /// </summary>- /// <param name="serverEphemeralSecret">serverEphemeralSecret.</param>- /// <param name="clientEphemeralPublic">clientEphemeralPublic.</param>- /// <param name="salt">Salt.</param>- /// <param name="username">Username.</param>- /// <param name="verifier">Verifier.</param>- /// <param name="clientSessionProof">Client session proof.</param>- /// <returns>SrpSession.</returns>- public static SrpSession? DeriveSessionServer(string serverEphemeralSecret, string clientEphemeralPublic, string salt, string username, string verifier, string clientSessionProof)- {- // Make sure the username is lowercase as the SRP protocol is case sensitive.- username = username.ToLowerInvariant();-- try- {- var server = new SrpServer();- return server.DeriveSession(- serverEphemeralSecret,- clientEphemeralPublic,- salt,- username,- verifier,- clientSessionProof);- }- catch (System.Security.SecurityException)- {- // Incorrect password provided, return null.- return null;- }- catch (FormatException)- {- // Malformed (non-hexadecimal) ephemeral or proof provided, return null.- return null;- }- }-- /// <summary>- /// Verify the session on the client side.- /// </summary>- /// <param name="clientEphemeralPublic">clientEphemeralPublic.</param>- /// <param name="clientSession">clientSession.</param>- /// <param name="serverSessionProof">serverSessionProof.</param>- public static void VerifySession(string clientEphemeralPublic, SrpSession clientSession, string serverSessionProof)- {- var client = new SrpClient();- client.VerifySession(clientEphemeralPublic, clientSession, serverSessionProof);- }-}diff --git a/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Server/AliasVault.Cryptography.Server.csproj b/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Server/AliasVault.Cryptography.Server.csprojdeleted file mode 100644index fa7a68f0d..000000000--- a/apps/server/Utilities/Cryptography/AliasVault.Cryptography.Server/AliasVault.Cryptography.Server.csproj+++ /dev/null@@ -1,36 +0,0 @@-<Project Sdk="Microsoft.NET.Sdk">-- <PropertyGroup>- <TargetFramework>net10.0</TargetFramework>- <ImplicitUsings>enable</ImplicitUsings>- <Nullable>enable</Nullable>- <LangVersion>14</LangVersion>- </PropertyGroup>-- <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>- <DocumentationFile>bin\Debug\net10.0\Cryptography.xml</DocumentationFile>- </PropertyGroup>-- <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>- <DocumentationFile>bin\Release\net10.0\Cryptography.xml</DocumentationFile>- </PropertyGroup>-- <ItemGroup>- <AdditionalFiles Include="..\..\..\stylecop.json" Link="stylecop.json" />- </ItemGroup>-- <ItemGroup>- <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">- <PrivateAssets>all</PrivateAssets>- <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>- </PackageReference>- </ItemGroup>-- <ItemGroup>- <ProjectReference Include="..\..\..\Databases\AliasServerDb\AliasServerDb.csproj" />- <ProjectReference Include="..\..\..\Shared\AliasVault.Shared.Server\AliasVault.Shared.Server.csproj" />- </ItemGroup>--</Project>diff --git a/apps/server/aliasvault.sln b/apps/server/aliasvault.slnindex a931044fc..395157efd 100644--- a/apps/server/aliasvault.sln+++ b/apps/server/aliasvault.sln@@ -23,9 +23,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AliasServerDb", "Databases\EndProjectProject("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AliasClientDb", "Databases\AliasClientDb\AliasClientDb.csproj", "{FE10F294-817F-477E-A24F-8597A15AF0B5}"EndProject-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{8A477241-B96C-4174-968D-D40CB77F1ECD}"-EndProject-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AliasVault.SmtpService", "Services\AliasVault.SmtpService\AliasVault.SmtpService.csproj", "{B095A174-E528-4D38-BEC1-D1D38B3B30C0}"+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AliasVault.SmtpService", "AliasVault.SmtpService\AliasVault.SmtpService.csproj", "{B095A174-E528-4D38-BEC1-D1D38B3B30C0}"EndProjectProject("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AliasVault.IntegrationTests", "Tests\AliasVault.IntegrationTests\AliasVault.IntegrationTests.csproj", "{1C7C8DE9-5F2A-43DB-A25E-33319E80A509}"EndProject@@ -35,25 +33,17 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AliasVault.InstallCli", "UtEndProjectProject("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AliasVault.Logging", "Utilities\AliasVault.Logging\AliasVault.Logging.csproj", "{FF0B0E64-1AE2-415C-A404-0EB78010821A}"EndProject-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AliasVault.RazorComponents", "Shared\AliasVault.RazorComponents\AliasVault.RazorComponents.csproj", "{59642CEF-D90A-4A6B-AD3F-9C6300D1E3FC}"-EndProjectProject("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AliasVault.WorkerStatus", "Utilities\AliasVault.WorkerStatus\AliasVault.WorkerStatus.csproj", "{951C3DF8-DF22-4B2B-839F-FBA26DDD8ABD}"EndProjectProject("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AliasVault.TotpGenerator", "Utilities\AliasVault.TotpGenerator\AliasVault.TotpGenerator.csproj", "{E8D9C551-67D2-4651-8EDF-4262DF7375CE}"EndProjectProject("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AliasVault.Auth", "Utilities\AliasVault.Auth\AliasVault.Auth.csproj", "{DA175274-0FF7-4436-9266-742F96C2D1ED}"EndProject-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cryptography", "Cryptography", "{BB7E701E-B1C6-453E-800A-E12CE256318D}"-EndProject-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AliasVault.Cryptography.Server", "Utilities\Cryptography\AliasVault.Cryptography.Server\AliasVault.Cryptography.Server.csproj", "{341EC443-0B6B-4E8C-AF46-D6156573CEA5}"-EndProject-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AliasVault.Cryptography.Client", "Utilities\Cryptography\AliasVault.Cryptography.Client\AliasVault.Cryptography.Client.csproj", "{542C7B7D-C2B4-4AE3-9B2C-C62FCF4DFF8E}"+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AliasVault.Cryptography", "Utilities\AliasVault.Cryptography\AliasVault.Cryptography.csproj", "{341EC443-0B6B-4E8C-AF46-D6156573CEA5}"EndProjectProject("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{DD359F0A-0180-4F8F-9E48-46213386BA4D}"EndProject-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AliasVault.Shared.Core", "Shared\AliasVault.Shared.Core\AliasVault.Shared.Core.csproj", "{40CA41BF-9E67-4D0A-A3F8-38B94992E4CA}"-EndProject-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AliasVault.TaskRunner", "Services\AliasVault.TaskRunner\AliasVault.TaskRunner.csproj", "{D631A936-DD1C-40CC-B735-BD0A5D4F46A1}"+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AliasVault.TaskRunner", "AliasVault.TaskRunner\AliasVault.TaskRunner.csproj", "{D631A936-DD1C-40CC-B735-BD0A5D4F46A1}"EndProjectProject("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AliasVault.Shared.Server", "Shared\AliasVault.Shared.Server\AliasVault.Shared.Server.csproj", "{34FADEB6-4B56-463B-B359-F844B43D76D9}"EndProject@@ -111,10 +101,6 @@ Global{FF0B0E64-1AE2-415C-A404-0EB78010821A}.Debug|Any CPU.Build.0 = Debug|Any CPU{FF0B0E64-1AE2-415C-A404-0EB78010821A}.Release|Any CPU.ActiveCfg = Release|Any CPU{FF0B0E64-1AE2-415C-A404-0EB78010821A}.Release|Any CPU.Build.0 = Release|Any CPU- {59642CEF-D90A-4A6B-AD3F-9C6300D1E3FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU- {59642CEF-D90A-4A6B-AD3F-9C6300D1E3FC}.Debug|Any CPU.Build.0 = Debug|Any CPU- {59642CEF-D90A-4A6B-AD3F-9C6300D1E3FC}.Release|Any CPU.ActiveCfg = Release|Any CPU- {59642CEF-D90A-4A6B-AD3F-9C6300D1E3FC}.Release|Any CPU.Build.0 = Release|Any CPU{951C3DF8-DF22-4B2B-839F-FBA26DDD8ABD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU{951C3DF8-DF22-4B2B-839F-FBA26DDD8ABD}.Debug|Any CPU.Build.0 = Debug|Any CPU{951C3DF8-DF22-4B2B-839F-FBA26DDD8ABD}.Release|Any CPU.ActiveCfg = Release|Any CPU@@ -131,14 +117,6 @@ Global{341EC443-0B6B-4E8C-AF46-D6156573CEA5}.Debug|Any CPU.Build.0 = Debug|Any CPU{341EC443-0B6B-4E8C-AF46-D6156573CEA5}.Release|Any CPU.ActiveCfg = Release|Any CPU{341EC443-0B6B-4E8C-AF46-D6156573CEA5}.Release|Any CPU.Build.0 = Release|Any CPU- {542C7B7D-C2B4-4AE3-9B2C-C62FCF4DFF8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU- {542C7B7D-C2B4-4AE3-9B2C-C62FCF4DFF8E}.Debug|Any CPU.Build.0 = Debug|Any CPU- {542C7B7D-C2B4-4AE3-9B2C-C62FCF4DFF8E}.Release|Any CPU.ActiveCfg = Release|Any CPU- {542C7B7D-C2B4-4AE3-9B2C-C62FCF4DFF8E}.Release|Any CPU.Build.0 = Release|Any CPU- {40CA41BF-9E67-4D0A-A3F8-38B94992E4CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU- {40CA41BF-9E67-4D0A-A3F8-38B94992E4CA}.Debug|Any CPU.Build.0 = Debug|Any CPU- {40CA41BF-9E67-4D0A-A3F8-38B94992E4CA}.Release|Any CPU.ActiveCfg = Release|Any CPU- {40CA41BF-9E67-4D0A-A3F8-38B94992E4CA}.Release|Any CPU.Build.0 = Release|Any CPU{D631A936-DD1C-40CC-B735-BD0A5D4F46A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU{D631A936-DD1C-40CC-B735-BD0A5D4F46A1}.Debug|Any CPU.Build.0 = Debug|Any CPU{D631A936-DD1C-40CC-B735-BD0A5D4F46A1}.Release|Any CPU.ActiveCfg = Release|Any CPU@@ -158,19 +136,13 @@ Global{AF013D08-1BF6-4E23-87D2-37F614BE7952} = {29DE523D-EEF2-41E9-AC12-F20D8D02BEBB}{1277105D-50CD-4CE0-9C2C-549F46867E54} = {5F7417F6-4388-49CC-9511-ED63C4A6488A}{FE10F294-817F-477E-A24F-8597A15AF0B5} = {5F7417F6-4388-49CC-9511-ED63C4A6488A}- {B095A174-E528-4D38-BEC1-D1D38B3B30C0} = {8A477241-B96C-4174-968D-D40CB77F1ECD}{1C7C8DE9-5F2A-43DB-A25E-33319E80A509} = {29DE523D-EEF2-41E9-AC12-F20D8D02BEBB}{857BCD0E-753F-437A-AF75-B995B4D9A5FE} = {01AB9389-2F89-4F8E-A688-BF4BF1FC42C8}{FF0B0E64-1AE2-415C-A404-0EB78010821A} = {01AB9389-2F89-4F8E-A688-BF4BF1FC42C8}- {59642CEF-D90A-4A6B-AD3F-9C6300D1E3FC} = {DD359F0A-0180-4F8F-9E48-46213386BA4D}{951C3DF8-DF22-4B2B-839F-FBA26DDD8ABD} = {01AB9389-2F89-4F8E-A688-BF4BF1FC42C8}{E8D9C551-67D2-4651-8EDF-4262DF7375CE} = {01AB9389-2F89-4F8E-A688-BF4BF1FC42C8}{DA175274-0FF7-4436-9266-742F96C2D1ED} = {01AB9389-2F89-4F8E-A688-BF4BF1FC42C8}- {BB7E701E-B1C6-453E-800A-E12CE256318D} = {01AB9389-2F89-4F8E-A688-BF4BF1FC42C8}- {341EC443-0B6B-4E8C-AF46-D6156573CEA5} = {BB7E701E-B1C6-453E-800A-E12CE256318D}- {542C7B7D-C2B4-4AE3-9B2C-C62FCF4DFF8E} = {BB7E701E-B1C6-453E-800A-E12CE256318D}- {40CA41BF-9E67-4D0A-A3F8-38B94992E4CA} = {DD359F0A-0180-4F8F-9E48-46213386BA4D}- {D631A936-DD1C-40CC-B735-BD0A5D4F46A1} = {8A477241-B96C-4174-968D-D40CB77F1ECD}+ {341EC443-0B6B-4E8C-AF46-D6156573CEA5} = {01AB9389-2F89-4F8E-A688-BF4BF1FC42C8}{34FADEB6-4B56-463B-B359-F844B43D76D9} = {DD359F0A-0180-4F8F-9E48-46213386BA4D}EndGlobalSectionGlobalSection(ExtensibilityGlobals) = postSolutiondiff --git a/apps/web/src/utils/AppDownloads.ts b/apps/web/src/utils/AppDownloads.tsindex 8bbaf8bcc..194d4b014 100644--- a/apps/web/src/utils/AppDownloads.ts+++ b/apps/web/src/utils/AppDownloads.ts@@ -1,5 +1,5 @@/**- * A downloadable client (the shared BrowserExtensionInfo / MobileAppInfo).+ * A downloadable client app (browser extension or mobile app).*/export type AppInfo = {name: string;@@ -8,7 +8,7 @@ export type AppInfo = {isAvailable: boolean;};-/** The browser extensions, in the order of the shared constants. */+/** The browser extensions. */export const BROWSER_EXTENSIONS: AppInfo[] = [{ name: 'Google Chrome', iconPath: '/img/browser-icons/chrome.svg', downloadUrl: 'https://chromewebstore.google.com/detail/aliasvault/bmoggiinmnodjphdjnmpcnlleamkfedj', isAvailable: true },{ name: 'Firefox', iconPath: '/img/browser-icons/firefox.svg', downloadUrl: 'https://addons.mozilla.org/en-US/firefox/addon/aliasvault/', isAvailable: true },diff --git a/core/client/src/auth/SrpAuthService.ts b/core/client/src/auth/SrpAuthService.tsindex c03a561fe..716d17e09 100644--- a/core/client/src/auth/SrpAuthService.ts+++ b/core/client/src/auth/SrpAuthService.ts@@ -65,7 +65,7 @@ export type NewPasswordMaterial = {/*** Default encryption settings for Argon2Id.- * These match the server defaults in AliasVault.Cryptography.Client/Defaults.cs+ * These match the server defaults in apps/server/Utilities/AliasVault.Cryptography/Defaults.cs*/export const DEFAULT_ENCRYPTION = {type: 'Argon2Id',diff --git a/core/models/README.md b/core/models/README.mdindex d4ce96b5b..8a7323b90 100644--- a/core/models/README.md+++ b/core/models/README.md@@ -16,14 +16,11 @@ Automatically generates platform-specific models and icon assets from TypeScript| Source | Generated Output | Language ||-----------------------------|-----------------------------------------------------------------------|---------------|-| `src/vault/FieldKey.ts` | `apps/server/Databases/AliasClientDb/Models/FieldKey.cs` | C# || `src/vault/FieldKey.ts` | `apps/mobile-app/ios/VaultModels/FieldKey.swift` | Swift || `src/vault/FieldKey.ts` | `apps/mobile-app/android/.../vaultstore/models/FieldKey.kt` | Kotlin |-| `src/icons/ItemTypeIcons.ts`| `apps/server/Databases/AliasClientDb/Models/ItemTypeIcons.cs` | C# || `src/icons/ItemTypeIcons.ts`| `apps/mobile-app/ios/VaultModels/ItemTypeIcons.swift` | Swift || `src/icons/ItemTypeIcons.ts`| `apps/mobile-app/android/.../vaultstore/models/ItemTypeIcons.kt` | Kotlin || `src/icons/ItemTypeIcons.ts`| `apps/mobile-app/components/items/ItemTypeIconComponents.tsx` | React Native |-| `src/icons/AppIcons.ts` | `apps/server/Databases/AliasClientDb/Models/AppIcons.cs` | C# || `src/icons/AppIcons.ts` | `apps/mobile-app/ios/VaultModels/AppIcons.swift` | Swift || `src/icons/AppIcons.ts` | `apps/mobile-app/android/.../vaultstore/models/AppIcons.kt` | Kotlin || `src/icons/AppIcons.ts` | `apps/mobile-app/components/items/AppIconComponents.tsx` | React Native |diff --git a/core/models/build.sh b/core/models/build.shindex cc04b55b2..821e6c083 100755--- a/core/models/build.sh+++ b/core/models/build.sh@@ -23,10 +23,10 @@ node scripts/generate-vault-table-registry.cjsnpm run testecho ""-echo "- Generating platform-specific models (C#, Swift, Kotlin)..."+echo "- Generating platform-specific models (Swift, Kotlin, React Native)..."node scripts/generate-field-keys.cjs-echo "- Generating password-generator defaults (Rust, C#)..."+echo "- Generating password-generator defaults (Rust)..."node scripts/generate-password-defaults.cjsecho "- Generating app defaults (Swift, Kotlin)..."diff --git a/core/models/scripts/generate-field-keys.cjs b/core/models/scripts/generate-field-keys.cjsindex 5eb3f642c..af7544b98 100755--- a/core/models/scripts/generate-field-keys.cjs+++ b/core/models/scripts/generate-field-keys.cjs@@ -1,6 +1,6 @@#!/usr/bin/env node/**- * Generates FieldKey, FieldType, ItemType constants, SystemFieldRegistry, and the icon catalogs (ItemTypeIcons, AppIcons) for C#, Swift, Kotlin and React Native from TypeScript source.+ * Generates FieldKey, FieldType, ItemType constants and the icon catalogs (ItemTypeIcons, AppIcons) for Swift, Kotlin and React Native from TypeScript source.* All type definitions are dynamically extracted from the TypeScript source files.*/@@ -11,12 +11,6 @@ const path = require('path');const REPO_ROOT = path.join(__dirname, '../../..');const TS_SOURCE = path.join(REPO_ROOT, 'core/models/src/vault/FieldKey.ts');const TS_ITEM_SOURCE = path.join(REPO_ROOT, 'core/models/src/vault/Item.ts');-const TS_REGISTRY_SOURCE = path.join(REPO_ROOT, 'core/models/src/vault/SystemFieldRegistry.ts');-const CS_OUTPUT = path.join(REPO_ROOT, 'apps/server/Databases/AliasClientDb/Models/FieldKey.cs');-const CS_FIELD_TYPE_OUTPUT = path.join(REPO_ROOT, 'apps/server/Databases/AliasClientDb/Models/FieldType.cs');-const CS_FIELD_TYPE_ENUM_OUTPUT = path.join(REPO_ROOT, 'apps/server/Databases/AliasClientDb/Models/FieldTypeKind.cs');-const CS_ITEM_TYPE_OUTPUT = path.join(REPO_ROOT, 'apps/server/Databases/AliasClientDb/Models/ItemType.cs');-const CS_REGISTRY_OUTPUT = path.join(REPO_ROOT, 'apps/server/Databases/AliasClientDb/Models/SystemFieldRegistry.cs');const SWIFT_OUTPUT = path.join(REPO_ROOT, 'apps/mobile-app/ios/VaultModels/FieldKey.swift');const SWIFT_FIELD_TYPE_OUTPUT = path.join(REPO_ROOT, 'apps/mobile-app/ios/VaultModels/FieldType.swift');const SWIFT_ITEM_TYPE_OUTPUT = path.join(REPO_ROOT, 'apps/mobile-app/ios/VaultModels/ItemType.swift');@@ -37,7 +31,6 @@ const ICON_CATALOGS = [rnKeyTypeName: 'IconKey',lookup: false,outputs: {- cs: path.join(REPO_ROOT, 'apps/server/Databases/AliasClientDb/Models/ItemTypeIcons.cs'),swift: path.join(REPO_ROOT, 'apps/mobile-app/ios/VaultModels/ItemTypeIcons.swift'),kotlin: path.join(REPO_ROOT, 'apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/models/ItemTypeIcons.kt'),rn: path.join(REPO_ROOT, 'apps/mobile-app/components/items/ItemTypeIconComponents.tsx'),@@ -52,7 +45,6 @@ const ICON_CATALOGS = [rnKeyTypeName: 'AppIconKey',lookup: true,outputs: {- cs: path.join(REPO_ROOT, 'apps/server/Databases/AliasClientDb/Models/AppIcons.cs'),swift: path.join(REPO_ROOT, 'apps/mobile-app/ios/VaultModels/AppIcons.swift'),kotlin: path.join(REPO_ROOT, 'apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/models/AppIcons.kt'),rn: path.join(REPO_ROOT, 'apps/mobile-app/components/items/AppIconComponents.tsx'),@@ -148,172 +140,6 @@ function parseItemTypes(tsContent) {return itemTypes;}-/**- * Parse FieldCategories from TypeScript source- * Returns an array of category names in order- */-function parseFieldCategories(tsContent) {- const categories = [];-- // Find the FieldCategories constant- const match = tsContent.match(/export const FieldCategories\s*=\s*\{([^}]+)\}/s);- if (!match) {- console.warn('Warning: Could not find FieldCategories in source');- return categories;- }-- const body = match[1];- // Match each category: Primary: 'Primary',- const categoryRegex = /(\w+):\s*'(\w+)'/g;- let categoryMatch;-- while ((categoryMatch = categoryRegex.exec(body)) !== null) {- categories.push(categoryMatch[1]);- }-- return categories;-}--/**- * Parse ItemTypeFieldConfig type from TypeScript source- * Returns an array of property definitions- */-function parseItemTypeFieldConfig(tsContent) {- const properties = [];-- // Find the ItemTypeFieldConfig type- const match = tsContent.match(/export type ItemTypeFieldConfig\s*=\s*\{([^}]+)\}/s);- if (!match) {- console.warn('Warning: Could not find ItemTypeFieldConfig in source');- return properties;- }-- const body = match[1];- // Match properties with comments- const lines = body.split(/\r?\n/);- let currentComment = '';-- for (const line of lines) {- const trimmed = line.trim();-- // Capture comments- const commentMatch = trimmed.match(/\/\*\*\s*(.+)\s*\*\//);- if (commentMatch) {- currentComment = commentMatch[1].trim();- }-- // Match property: PropertyName: type;- const propMatch = trimmed.match(/^(\w+):\s*(\w+);?$/);- if (propMatch) {- properties.push({- name: propMatch[1],- type: propMatch[2],- comment: currentComment- });- currentComment = '';- }- }-- return properties;-}--/**- * Parse SystemFieldDefinition type from TypeScript source- * Returns an array of property definitions- */-function parseSystemFieldDefinition(tsContent) {- const properties = [];-- // Find the SystemFieldDefinition type- const match = tsContent.match(/export type SystemFieldDefinition\s*=\s*\{([\s\S]*?)\n\};/);- if (!match) {- console.warn('Warning: Could not find SystemFieldDefinition in source');- return properties;- }-- const body = match[1];- const lines = body.split(/\r?\n/);- let currentComment = '';-- for (const line of lines) {- const trimmed = line.trim();-- // Capture single-line comments- const singleCommentMatch = trimmed.match(/\/\*\*\s*(.+)\s*\*\//);- if (singleCommentMatch) {- currentComment = singleCommentMatch[1].trim();- continue;- }-- // Match property definition- const propMatch = trimmed.match(/^(\w+):\s*(.+);?$/);- if (propMatch && !trimmed.startsWith('/*') && !trimmed.startsWith('*')) {- let propType = propMatch[2].replace(/;$/, '').trim();-- // Simplify complex types for C# mapping- let csharpType = mapTypeToCSharp(propType);-- properties.push({- name: propMatch[1],- tsType: propType,- csharpType: csharpType,- comment: currentComment- });- currentComment = '';- }- }-- return properties;-}--/**- * Map TypeScript type to C# type- */-function mapTypeToCSharp(tsType) {- if (tsType === 'string') return 'string';- if (tsType === 'boolean') return 'bool';- if (tsType === 'number') return 'int';- if (tsType === 'FieldType') return 'string'; // FieldType is a string union- if (tsType === 'FieldCategory') return 'FieldCategory';- if (tsType.includes('Partial<Record<ItemType, ItemTypeFieldConfig>>')) {- return 'IReadOnlyDictionary<string, ItemTypeFieldConfig>';- }- return 'string'; // Default fallback-}--/**- * Generate C# static class for FieldKey- */-function generateCSharp(fieldKeys) {- const header = `// <auto-generated />-// This file is auto-generated from core/models/src/vault/FieldKey.ts-// Do not edit this file directly. Run 'npm run generate:models' to regenerate.--namespace AliasClientDb.Models;--/// <summary>-/// System field keys for the field-based data model.-/// These keys map to FieldDefinition.FieldKey values.-/// </summary>-public static class FieldKey-{`;-- const fields = Object.entries(fieldKeys)- .map(([name, { value, comment }]) => {- return ` /// <summary>- /// ${comment}- /// </summary>- public const string ${name} = "${value}";`;- })- .join('\n\n');-- const footer = `-}-`;-- return header + '\n' + fields + footer;-}-/*** Generate Swift enum*/@@ -380,176 +206,6 @@ object FieldKey {`;return header + '\n' + fields + footer;}-/**- * Generate C# static class for FieldType- */-function generateCSharpFieldType(fieldTypes) {- const header = `// <auto-generated />-// This file is auto-generated from core/models/src/vault/Item.ts-// Do not edit this file directly. Run 'npm run generate:models' to regenerate.--#nullable enable--namespace AliasClientDb.Models;--/// <summary>-/// Field types for rendering and validation.-/// </summary>-public static class FieldType-{`;-- const fields = fieldTypes- .map(type => {- return ` /// <summary>- /// ${type} field type.- /// </summary>- public const string ${type} = "${type}";`;- })- .join('\n\n');-- const allTypes = `-- /// <summary>- /// All available field types.- /// </summary>- public static readonly string[] All = { ${fieldTypes.map(t => t).join(', ')} };-- /// <summary>- /// Checks if a string value is a valid field type.- /// </summary>- /// <param name="value">The value to check.</param>- /// <returns>True if the value is a valid field type.</returns>- public static bool IsValid(string? value)- {- return ${fieldTypes.map(t => `value == ${t}`).join(' || ')};- }`;-- const footer = `-}-`;-- return header + '\n' + fields + allTypes + footer;-}--/**- * Generate C# enum (FieldTypeKind) + string converters for FieldType.- * The enum gives callers a closed, compile-time-checked set of field types (the string- * constants in FieldType cannot serve as a parameter type). The converters map each enum- * member to its FieldType constant, so a removed/renamed field type breaks compilation here.- */-function generateCSharpFieldTypeEnum(fieldTypes) {- const header = `// <auto-generated />-// This file is auto-generated from core/models/src/vault/Item.ts-// Do not edit this file directly. Run 'npm run generate:models' to regenerate.--#nullable enable--namespace AliasClientDb.Models;--/// <summary>-/// Strongly-typed field types. Mirrors the string constants in <see cref="FieldType"/> so that-/// callers (e.g. importers) are forced to pick a known field type at compile time. Convert to and-/// from the canonical <see cref="FieldType"/> strings with <see cref="FieldTypeKindExtensions"/>.-/// </summary>-public enum FieldTypeKind-{`;-- const members = fieldTypes- .map(type => {- return ` /// <summary>- /// ${type} field type.- /// </summary>- ${type},`;- })- .join('\n\n');-- const enumFooter = `-}--/// <summary>-/// Conversion helpers between <see cref="FieldTypeKind"/> and the canonical <see cref="FieldType"/> strings.-/// </summary>-public static class FieldTypeKindExtensions-{- /// <summary>- /// Converts a <see cref="FieldTypeKind"/> to its canonical <see cref="FieldType"/> string.- /// </summary>- /// <param name="kind">The field type kind.</param>- /// <returns>The canonical field type string.</returns>- public static string ToFieldTypeString(this FieldTypeKind kind) => kind switch- {-${fieldTypes.map(t => ` FieldTypeKind.${t} => FieldType.${t},`).join('\n')}- _ => FieldType.${fieldTypes[0]},- };-- /// <summary>- /// Converts a canonical <see cref="FieldType"/> string to a <see cref="FieldTypeKind"/>.- /// Unknown or null values fall back to <see cref="FieldTypeKind.${fieldTypes[0]}"/>.- /// </summary>- /// <param name="value">The canonical field type string.</param>- /// <returns>The matching field type kind.</returns>- public static FieldTypeKind ToFieldTypeKind(string? value) => value switch- {-${fieldTypes.map(t => ` FieldType.${t} => FieldTypeKind.${t},`).join('\n')}- _ => FieldTypeKind.${fieldTypes[0]},- };-}-`;-- return header + '\n' + members + enumFooter;-}--/**- * Generate C# static class for ItemType- */-function generateCSharpItemType(itemTypes) {- const header = `// <auto-generated />-// This file is auto-generated from core/models/src/vault/Item.ts-// Do not edit this file directly. Run 'npm run generate:models' to regenerate.--#nullable enable--namespace AliasClientDb.Models;--/// <summary>-/// Item types supported by the vault.-/// </summary>-public static class ItemType-{`;-- const fields = itemTypes- .map(type => {- return ` /// <summary>- /// ${type} item type.- /// </summary>- public const string ${type} = "${type}";`;- })- .join('\n\n');-- const allTypes = `-- /// <summary>- /// All available item types.- /// </summary>- public static readonly string[] All = { ${itemTypes.map(t => t).join(', ')} };-- /// <summary>- /// Checks if a string value is a valid item type.- /// </summary>- /// <param name="value">The value to check.</param>- /// <returns>True if the value is a valid item type.</returns>- public static bool IsValid(string? value)- {- return ${itemTypes.map(t => `value == ${t}`).join(' || ')};- }`;-- const footer = `-}-`;-- return header + '\n' + fields + allTypes + footer;-}-/*** Generate Swift struct for FieldType*/@@ -724,322 +380,6 @@ object ItemType {`;return header + '\n' + fields + allTypes + footer;}-/**- * Parse the TypeScript SystemFieldRegistry.ts file and extract field definitions- */-function parseSystemFieldRegistry(tsContent) {- const fields = {};-- // Find the start of SystemFieldRegistry definition- const registryStart = tsContent.indexOf('export const SystemFieldRegistry');- if (registryStart === -1) {- return fields;- }-- // Extract just the registry content- const registryContent = tsContent.slice(registryStart);-- // Match each field definition block using a state machine approach- // Look for patterns like: 'login.username': {- const fieldStartRegex = /'([a-z]+\.[a-z_]+)':\s*\{/g;- let match;-- while ((match = fieldStartRegex.exec(registryContent)) !== null) {- const fieldKey = match[1];- const startIdx = match.index + match[0].length;-- // Find matching closing brace by counting braces- let braceCount = 1;- let endIdx = startIdx;- while (braceCount > 0 && endIdx < registryContent.length) {- if (registryContent[endIdx] === '{') braceCount++;- if (registryContent[endIdx] === '}') braceCount--;- endIdx++;- }-- const fieldBody = registryContent.slice(startIdx, endIdx - 1);-- // Skip if this doesn't look like a SystemFieldDefinition (needs FieldKey property)- if (!fieldBody.includes('FieldKey:')) {- continue;- }-- const field = {- FieldKey: fieldKey,- FieldType: extractStringValue(fieldBody, 'FieldType'),- IsHidden: extractBoolValue(fieldBody, 'IsHidden'),- IsMultiValue: extractBoolValue(fieldBody, 'IsMultiValue'),- EnableHistory: extractBoolValue(fieldBody, 'EnableHistory'),- Category: extractEnumValue(fieldBody, 'Category', 'FieldCategories'),- DefaultDisplayOrder: extractNumberValue(fieldBody, 'DefaultDisplayOrder'),- ApplicableToTypes: extractApplicableToTypes(fieldBody)- };-- fields[fieldKey] = field;- }-- return fields;-}--/**- * Extract a string value from a field body- */-function extractStringValue(body, propName) {- const match = body.match(new RegExp(`${propName}:\\s*'([^']+)'`));- return match ? match[1] : '';-}--/**- * Extract a boolean value from a field body- */-function extractBoolValue(body, propName) {- const match = body.match(new RegExp(`${propName}:\\s*(true|false)`));- return match ? match[1] === 'true' : false;-}--/**- * Extract a number value from a field body- */-function extractNumberValue(body, propName) {- const match = body.match(new RegExp(`${propName}:\\s*(\\d+)`));- return match ? parseInt(match[1], 10) : 0;-}--/**- * Extract an enum value from a field body (e.g., FieldCategories.Login -> Login)- */-function extractEnumValue(body, propName, enumName) {- const match = body.match(new RegExp(`${propName}:\\s*${enumName}\\.(\\w+)`));- return match ? match[1] : '';-}--/**- * Extract ApplicableToTypes object from field body- */-function extractApplicableToTypes(body) {- const applicableToTypes = {};-- // Find the start of ApplicableToTypes- const startMatch = body.match(/ApplicableToTypes:\s*\{/);- if (!startMatch) {- return applicableToTypes;- }-- const startIdx = startMatch.index + startMatch[0].length;-- // Find matching closing brace by counting braces- let braceCount = 1;- let endIdx = startIdx;- while (braceCount > 0 && endIdx < body.length) {- if (body[endIdx] === '{') braceCount++;- if (body[endIdx] === '}') braceCount--;- endIdx++;- }-- const typesBody = body.slice(startIdx, endIdx - 1);-- // Match each item type configuration: ItemType: { ShowByDefault: bool }- const itemTypeRegex = /(\w+):\s*\{\s*ShowByDefault:\s*(true|false)\s*\}/g;- let typeMatch;-- while ((typeMatch = itemTypeRegex.exec(typesBody)) !== null) {- const itemType = typeMatch[1];- const showByDefault = typeMatch[2] === 'true';- applicableToTypes[itemType] = { ShowByDefault: showByDefault };- }-- return applicableToTypes;-}--/**- * Generate C# SystemFieldRegistry with full metadata- * All types are dynamically generated from the parsed TypeScript- */-function generateCSharpSystemFieldRegistry(fields, categories, itemTypeFieldConfigProps, systemFieldDefProps) {- // Generate FieldCategory enum dynamically- const categoryEnum = categories.map((cat, index) => {- return ` /// <summary>${cat} fields.</summary>- ${cat}${index < categories.length - 1 ? ',' : ''}`;- }).join('\n');-- // Generate ItemTypeFieldConfig record dynamically- const itemTypeFieldConfigParams = itemTypeFieldConfigProps- .map(p => `${mapTypeToCSharp(p.type)} ${p.name}`)- .join(', ');-- // Generate SystemFieldDefinition record dynamically- const systemFieldDefParams = systemFieldDefProps- .map(p => `${p.csharpType} ${p.name}`)- .join(',\n ');-- const systemFieldDefXmlParams = systemFieldDefProps- .map(p => `/// <param name="${p.name}">${p.comment || p.name}</param>`)- .join('\n');-- const header = `// <auto-generated />-// This file is auto-generated from core/models/src/vault/SystemFieldRegistry.ts-// Do not edit this file directly. Run 'npm run generate:models' to regenerate.--#nullable enable--namespace AliasClientDb.Models;--/// <summary>-/// Field categories for grouping in UI.-/// </summary>-public enum FieldCategory-{-${categoryEnum}-}--/// <summary>-/// Per-item-type configuration for a system field.-/// </summary>-${itemTypeFieldConfigProps.map(p => `/// <param name="${p.name}">${p.comment || p.name}</param>`).join('\n')}-public record ItemTypeFieldConfig(${itemTypeFieldConfigParams});--/// <summary>-/// System field definition with metadata.-/// </summary>-${systemFieldDefXmlParams}-public record SystemFieldDefinition(- ${systemFieldDefParams});--/// <summary>-/// Registry of all system-defined fields.-/// These fields are immutable and their metadata is defined in code.-/// </summary>-public static class SystemFieldRegistry-{- /// <summary>- /// All system field definitions indexed by field key.- /// </summary>- public static readonly IReadOnlyDictionary<string, SystemFieldDefinition> Fields =- new Dictionary<string, SystemFieldDefinition>- {-`;-- const fieldEntries = Object.entries(fields)- .map(([key, field]) => {- const applicableTypes = Object.entries(field.ApplicableToTypes)- .map(([type, config]) => `["${type}"] = new ItemTypeFieldConfig(${config.ShowByDefault})`)- .join(', ');-- return ` [FieldKey.${fieldKeyToPropertyName(key)}] = new SystemFieldDefinition(- FieldKey: "${field.FieldKey}",- FieldType: "${field.FieldType}",- IsHidden: ${field.IsHidden.toString().toLowerCase()},- IsMultiValue: ${field.IsMultiValue.toString().toLowerCase()},- ApplicableToTypes: new Dictionary<string, ItemTypeFieldConfig> { ${applicableTypes} },- EnableHistory: ${field.EnableHistory.toString().toLowerCase()},- Category: FieldCategory.${field.Category},- DefaultDisplayOrder: ${field.DefaultDisplayOrder})`;- })- .join(',\n');-- // Extract unique prefixes from field keys for IsSystemFieldPrefix- const prefixes = [...new Set(Object.keys(fields).map(k => k.split('.')[0]))];- const prefixChecks = prefixes.map(p => `fieldKey.StartsWith("${p}.")`).join(' ||\n ');-- const methods = `- };-- /// <summary>- /// Get system field definition by key.- /// </summary>- /// <param name="fieldKey">The field key to look up.</param>- /// <returns>The field definition, or null if not found.</returns>- public static SystemFieldDefinition? GetSystemField(string fieldKey)- {- return Fields.TryGetValue(fieldKey, out var field) ? field : null;- }-- /// <summary>- /// Check if a field key represents a system field.- /// </summary>- /// <param name="fieldKey">The field key to check.</param>- /// <returns>True if the field key is a system field.</returns>- public static bool IsSystemField(string fieldKey)- {- return Fields.ContainsKey(fieldKey);- }-- /// <summary>- /// Check if a field applies to a specific item type.- /// </summary>- /// <param name="field">The field definition.</param>- /// <param name="itemType">The item type to check.</param>- /// <returns>True if the field applies to the item type.</returns>- public static bool FieldAppliesToType(SystemFieldDefinition field, string itemType)- {- return field.ApplicableToTypes.ContainsKey(itemType);- }-- /// <summary>- /// Get all system fields applicable to a specific item type.- /// Results are sorted by DefaultDisplayOrder.- /// </summary>- /// <param name="itemType">The item type.</param>- /// <returns>Fields applicable to the item type.</returns>- public static IEnumerable<SystemFieldDefinition> GetFieldsForItemType(string itemType)- {- return Fields.Values- .Where(f => f.ApplicableToTypes.ContainsKey(itemType))- .OrderBy(f => f.DefaultDisplayOrder);- }-- /// <summary>- /// Get system fields that should be shown by default for a specific item type.- /// Results are sorted by DefaultDisplayOrder.- /// </summary>- /// <param name="itemType">The item type.</param>- /// <returns>Fields shown by default for the item type.</returns>- public static IEnumerable<SystemFieldDefinition> GetDefaultFieldsForItemType(string itemType)- {- return Fields.Values- .Where(f => f.ApplicableToTypes.TryGetValue(itemType, out var config) && config.ShowByDefault)- .OrderBy(f => f.DefaultDisplayOrder);- }-- /// <summary>- /// Get system fields that are not shown by default for a specific item type.- /// These are the fields that can be added via an "add field" button.- /// Results are sorted by DefaultDisplayOrder.- /// </summary>- /// <param name="itemType">The item type.</param>- /// <returns>Optional fields for the item type.</returns>- public static IEnumerable<SystemFieldDefinition> GetOptionalFieldsForItemType(string itemType)- {- return Fields.Values- .Where(f => f.ApplicableToTypes.TryGetValue(itemType, out var config) && !config.ShowByDefault)- .OrderBy(f => f.DefaultDisplayOrder);- }-- /// <summary>- /// Check if a field key matches a known system field prefix.- /// </summary>- /// <param name="fieldKey">The field key to check.</param>- /// <returns>True if the field key has a system field prefix.</returns>- public static bool IsSystemFieldPrefix(string fieldKey)- {- return ${prefixChecks};- }-}-`;-- return header + fieldEntries + methods;-}--/**- * Convert field key to C# property name (e.g., 'login.username' -> 'LoginUsername')- */-function fieldKeyToPropertyName(fieldKey) {- return fieldKey- .split('.')- .map(part => part.split('_').map(word => word.charAt(0).toUpperCase() + word.slice(1)).join(''))- .join('');-}-/*** Ensure directory exists*/@@ -1129,55 +469,6 @@ function parseIconSvgs(tsContent, constName) {}-/**- * Generate a C# static class for an icon catalog- */-function generateCSharpIcons(icons, catalog) {- const header = `// <auto-generated />-// This file is auto-generated from ${catalog.sourceFile}-// Do not edit this file directly. Run 'npm run generate:models' to regenerate.-${catalog.lookup ? '\n#nullable enable\n' : ''}-namespace AliasClientDb.Models;--/// <summary>-${catalog.description.map(line => `/// ${line}`).join('\n')}-/// </summary>-public static class ${catalog.className}-{-`;-- const iconFields = Object.entries(icons)- .map(([name, svg]) => {- // Escape the SVG for C# string literal- const escapedSvg = svg.replace(/"/g, '\\"').replace(/\n/g, '\\n');- return ` /// <summary>${name} icon SVG.</summary>- public const string ${name} = "${escapedSvg}";`;- })- .join('\n\n');-- const lookup = catalog.lookup ? `-- /// <summary>- /// Gets the SVG for an icon key, or null when the key is unknown to this client.- /// </summary>- /// <param name="key">The icon key.</param>- /// <returns>The SVG markup, or null.</returns>- public static string? GetSvg(string key)- {- return key switch- {-${Object.keys(icons).map(name => ` "${name}" => ${name},`).join('\n')}- _ => null,- };- }` : '';-- const footer = `-}-`;-- return header + iconFields + lookup + footer;-}-/*** Generate a Swift struct for an icon catalog*/@@ -1438,65 +729,9 @@ function main() {throw new Error('No item types found in Item.ts source file');}- // Read TypeScript SystemFieldRegistry source- if (!fs.existsSync(TS_REGISTRY_SOURCE)) {- throw new Error(`Source file not found: ${TS_REGISTRY_SOURCE}`);- }-- const tsRegistryContent = fs.readFileSync(TS_REGISTRY_SOURCE, 'utf8');-- // Parse types dynamically from TypeScript- const categories = parseFieldCategories(tsRegistryContent);- const itemTypeFieldConfigProps = parseItemTypeFieldConfig(tsRegistryContent);- const systemFieldDefProps = parseSystemFieldDefinition(tsRegistryContent);- const systemFields = parseSystemFieldRegistry(tsRegistryContent);-- if (Object.keys(systemFields).length === 0) {- throw new Error('No system fields found in registry source file');- }-console.log(`Parsed ${Object.keys(fieldKeys).length} field keys`);console.log(`Parsed ${fieldTypes.length} field types: ${fieldTypes.join(', ')}`);console.log(`Parsed ${itemTypes.length} item types: ${itemTypes.join(', ')}`);- console.log(`Parsed ${categories.length} field categories: ${categories.join(', ')}`);- console.log(`Parsed ${itemTypeFieldConfigProps.length} ItemTypeFieldConfig properties`);- console.log(`Parsed ${systemFieldDefProps.length} SystemFieldDefinition properties`);- console.log(`Parsed ${Object.keys(systemFields).length} system field definitions`);-- // Generate C# FieldKey- ensureDir(CS_OUTPUT);- const csContent = generateCSharp(fieldKeys);- fs.writeFileSync(CS_OUTPUT, csContent, 'utf8');- console.log(`Generated: ${CS_OUTPUT}`);-- // Generate C# FieldType- ensureDir(CS_FIELD_TYPE_OUTPUT);- const csFieldTypeContent = generateCSharpFieldType(fieldTypes);- fs.writeFileSync(CS_FIELD_TYPE_OUTPUT, csFieldTypeContent, 'utf8');- console.log(`Generated: ${CS_FIELD_TYPE_OUTPUT}`);-- // Generate C# FieldTypeKind enum (+ string converters)- ensureDir(CS_FIELD_TYPE_ENUM_OUTPUT);- const csFieldTypeEnumContent = generateCSharpFieldTypeEnum(fieldTypes);- fs.writeFileSync(CS_FIELD_TYPE_ENUM_OUTPUT, csFieldTypeEnumContent, 'utf8');- console.log(`Generated: ${CS_FIELD_TYPE_ENUM_OUTPUT}`);-- // Generate C# ItemType- ensureDir(CS_ITEM_TYPE_OUTPUT);- const csItemTypeContent = generateCSharpItemType(itemTypes);- fs.writeFileSync(CS_ITEM_TYPE_OUTPUT, csItemTypeContent, 'utf8');- console.log(`Generated: ${CS_ITEM_TYPE_OUTPUT}`);-- // Generate C# SystemFieldRegistry- ensureDir(CS_REGISTRY_OUTPUT);- const csRegistryContent = generateCSharpSystemFieldRegistry(- systemFields,- categories,- itemTypeFieldConfigProps,- systemFieldDefProps- );- fs.writeFileSync(CS_REGISTRY_OUTPUT, csRegistryContent, 'utf8');- console.log(`Generated: ${CS_REGISTRY_OUTPUT}`);// Generate Swift FieldKeyensureDir(SWIFT_OUTPUT);@@ -1549,7 +784,6 @@ function main() {console.log(`Parsed ${Object.keys(iconSvgs).length} ${catalog.className} SVGs: ${Object.keys(iconSvgs).join(', ')}`);const generated = [- [catalog.outputs.cs, generateCSharpIcons(iconSvgs, catalog)],[catalog.outputs.swift, generateSwiftIcons(iconSvgs, catalog)],[catalog.outputs.kotlin, generateKotlinIcons(iconSvgs, catalog)],[catalog.outputs.rn, generateReactNativeIcons(iconSvgs, catalog)],diff --git a/core/models/scripts/generate-password-defaults.cjs b/core/models/scripts/generate-password-defaults.cjsindex 125b06ab4..f800bdaae 100644--- a/core/models/scripts/generate-password-defaults.cjs+++ b/core/models/scripts/generate-password-defaults.cjs@@ -5,7 +5,6 @@* Input: core/models/src/defaults/PasswordGeneratorDefaults.ts* Outputs:* - core/rust/src/password_generator/defaults.rs (Rust)- * - apps/server/Databases/AliasClientDb/Models/PasswordGeneratorDefaults.cs (C#)** Note: Typescript clients import the constants directly from `@aliasvault/models/defaults`.*/@@ -18,7 +17,6 @@ const TS_SOURCE = path.join(REPO_ROOT, 'core/models/src/defaults/PasswordGeneratconst TS_SOURCE_REL = 'core/models/src/defaults/PasswordGeneratorDefaults.ts';const RUST_OUTPUT = path.join(REPO_ROOT, 'core/rust/src/password_generator/defaults.rs');-const CS_OUTPUT = path.join(REPO_ROOT, 'apps/server/Databases/AliasClientDb/Models/PasswordGeneratorDefaults.cs');/*** Parse the `export const NAME = VALUE;` lines (each with its leading single-line@@ -61,15 +59,6 @@ function parseConstants(source) {return constants;}-/** SCREAMING_SNAKE_CASE -> PascalCase (DEFAULT_PASSWORD_LENGTH -> DefaultPasswordLength). */-function toPascalCase(name) {- return name- .toLowerCase()- .split('_')- .map((part) => part.charAt(0).toUpperCase() + part.slice(1))- .join('');-}-function generateRust(constants) {const header = `//! Client-facing defaults for the password/passphrase generator.//!@@ -85,32 +74,6 @@ function generateRust(constants) {return `${header}\n${body}\n`;}-function generateCSharp(constants) {- const header = `// <auto-generated />-// This file is auto-generated from ${TS_SOURCE_REL}-// Do not edit this file directly. Run 'core/models/build.sh' (or-// 'node core/models/scripts/generate-password-defaults.cjs') to regenerate.--#nullable enable--namespace AliasClientDb.Models;--/// <summary>-/// Password generator defaults shared across all AliasVault clients.-/// </summary>-public static class PasswordGeneratorDefaults-{`;-- const body = constants- .map((c) => {- const csName = toPascalCase(c.name);- return ` /// <summary>\n /// ${c.doc}\n /// </summary>\n public const int ${csName} = ${c.value};`;- })- .join('\n\n');-- return `${header}\n${body}\n}\n`;-}-function writeIfChanged(filePath, contents) {const existing = fs.existsSync(filePath) ? fs.readFileSync(filePath, 'utf8') : null;if (existing === contents) {@@ -130,7 +93,6 @@ function main() {console.log(` ${constants.map((c) => `${c.name}=${c.value}`).join(', ')}`);writeIfChanged(RUST_OUTPUT, generateRust(constants));- writeIfChanged(CS_OUTPUT, generateCSharp(constants));}main();diff --git a/core/models/src/defaults/PasswordGeneratorDefaults.ts b/core/models/src/defaults/PasswordGeneratorDefaults.tsindex ea1838db7..80bef625f 100644--- a/core/models/src/defaults/PasswordGeneratorDefaults.ts+++ b/core/models/src/defaults/PasswordGeneratorDefaults.ts@@ -2,9 +2,7 @@* Single source of truth for the password-length and Diceware word-count* defaults and UI slider ranges shared across every AliasVault client.*- * This file is distributed by core/models/build.sh to all platforms including:- * - `core/rust/src/password_generator/defaults.rs` (Rust core)- * - `apps/server/Databases/AliasClientDb/Models/PasswordGeneratorDefaults.cs` (C# web client)+ * core/models/build.sh generates `core/rust/src/password_generator/defaults.rs` (Rust core) from this file.** The TypeScript clients (browser extension, mobile app) import the constants directly from `@/utils/dist/core/models/defaults`.*/diff --git a/core/models/src/icons/ItemTypeIcons.ts b/core/models/src/icons/ItemTypeIcons.tsindex 695068d6b..3723d3ded 100644--- a/core/models/src/icons/ItemTypeIcons.ts+++ b/core/models/src/icons/ItemTypeIcons.ts@@ -3,7 +3,6 @@* This is the single source of truth for all item type icons across platforms.** Generated platform-specific files:- * - C#: apps/server/Databases/AliasClientDb/Models/ItemTypeIcons.cs* - Swift (iOS): apps/mobile-app/ios/VaultModels/ItemTypeIcons.swift* - Kotlin (Android): apps/mobile-app/android/.../vaultstore/models/ItemTypeIcons.kt* - TypeScript: distributed via build.sh to browser-extension and mobile-appdiff --git a/dockerfiles/all-in-one/Dockerfile b/dockerfiles/all-in-one/Dockerfileindex 29f4cdda9..667259a65 100644--- a/dockerfiles/all-in-one/Dockerfile+++ b/dockerfiles/all-in-one/Dockerfile@@ -52,7 +52,7 @@ COPY apps/server/ ./apps/server/WORKDIR /src/apps/server# Restore only the published projects explicitly (not the test projects)-RUN for project in AliasVault.Api/AliasVault.Api.csproj AliasVault.Admin/AliasVault.Admin.csproj Services/AliasVault.SmtpService/AliasVault.SmtpService.csproj Services/AliasVault.TaskRunner/AliasVault.TaskRunner.csproj Utilities/AliasVault.InstallCli/AliasVault.InstallCli.csproj; do \+RUN for project in AliasVault.Api/AliasVault.Api.csproj AliasVault.Admin/AliasVault.Admin.csproj AliasVault.SmtpService/AliasVault.SmtpService.csproj AliasVault.TaskRunner/AliasVault.TaskRunner.csproj Utilities/AliasVault.InstallCli/AliasVault.InstallCli.csproj; do \dotnet restore "$project" || exit 1; \done@@ -67,11 +67,11 @@ RUN dotnet publish AliasVault.Admin/AliasVault.Admin.csproj \-c Release -o /app/admin --no-restore# Build SMTP Service-RUN dotnet publish Services/AliasVault.SmtpService/AliasVault.SmtpService.csproj \+RUN dotnet publish AliasVault.SmtpService/AliasVault.SmtpService.csproj \-c Release -o /app/smtp --no-restore# Build Task Runner-RUN dotnet publish Services/AliasVault.TaskRunner/AliasVault.TaskRunner.csproj \+RUN dotnet publish AliasVault.TaskRunner/AliasVault.TaskRunner.csproj \-c Release -o /app/taskrunner --no-restore# Build Install CLIdiff --git a/dockerfiles/docker-compose.build.yml b/dockerfiles/docker-compose.build.ymlindex 8699308a4..be9aa3e37 100644--- a/dockerfiles/docker-compose.build.yml+++ b/dockerfiles/docker-compose.build.yml@@ -33,10 +33,10 @@ services:image: aliasvault-smtpbuild:context: .- dockerfile: apps/server/Services/AliasVault.SmtpService/Dockerfile+ dockerfile: apps/server/AliasVault.SmtpService/Dockerfiletask-runner:image: aliasvault-task-runnerbuild:context: .- dockerfile: apps/server/Services/AliasVault.TaskRunner/Dockerfile+ dockerfile: apps/server/AliasVault.TaskRunner/Dockerfilediff --git a/scripts/bump-versions.sh b/scripts/bump-versions.shindex 07cd6e4ac..7cdb7f5c5 100755--- a/scripts/bump-versions.sh+++ b/scripts/bump-versions.sh@@ -146,9 +146,9 @@ extract_build_increment() {# Function to read and validate semantic versionread_semver() {# Get current version from server- local current_major=$(grep "public const int VersionMajor = " "$REPO_ROOT/apps/server/Shared/AliasVault.Shared.Core/AppInfo.cs" | tr -d ';' | tr -d ' ' | cut -d'=' -f2)- local current_minor=$(grep "public const int VersionMinor = " "$REPO_ROOT/apps/server/Shared/AliasVault.Shared.Core/AppInfo.cs" | tr -d ';' | tr -d ' ' | cut -d'=' -f2)- local current_stage=$(grep "public const string VersionStage = " "$REPO_ROOT/apps/server/Shared/AliasVault.Shared.Core/AppInfo.cs" | cut -d'"' -f2)+ local current_major=$(grep "public const int VersionMajor = " "$REPO_ROOT/apps/server/Shared/AliasVault.Shared/AppInfo.cs" | tr -d ';' | tr -d ' ' | cut -d'=' -f2)+ local current_minor=$(grep "public const int VersionMinor = " "$REPO_ROOT/apps/server/Shared/AliasVault.Shared/AppInfo.cs" | tr -d ';' | tr -d ' ' | cut -d'=' -f2)+ local current_stage=$(grep "public const string VersionStage = " "$REPO_ROOT/apps/server/Shared/AliasVault.Shared/AppInfo.cs" | cut -d'"' -f2)local suggested_version="${current_major}.$((current_minor + 1)).0"while true; do@@ -245,10 +245,10 @@ update_version() {# Function to extract version from server AppInfo.csget_server_version() {- local major=$(grep "public const int VersionMajor = " "$REPO_ROOT/apps/server/Shared/AliasVault.Shared.Core/AppInfo.cs" | tr -d ';' | tr -d ' ' | cut -d'=' -f2)- local minor=$(grep "public const int VersionMinor = " "$REPO_ROOT/apps/server/Shared/AliasVault.Shared.Core/AppInfo.cs" | tr -d ';' | tr -d ' ' | cut -d'=' -f2)- local patch=$(grep "public const int VersionPatch = " "$REPO_ROOT/apps/server/Shared/AliasVault.Shared.Core/AppInfo.cs" | tr -d ';' | tr -d ' ' | cut -d'=' -f2)- local stage=$(grep "public const string VersionStage = " "$REPO_ROOT/apps/server/Shared/AliasVault.Shared.Core/AppInfo.cs" | cut -d'"' -f2)+ local major=$(grep "public const int VersionMajor = " "$REPO_ROOT/apps/server/Shared/AliasVault.Shared/AppInfo.cs" | tr -d ';' | tr -d ' ' | cut -d'=' -f2)+ local minor=$(grep "public const int VersionMinor = " "$REPO_ROOT/apps/server/Shared/AliasVault.Shared/AppInfo.cs" | tr -d ';' | tr -d ' ' | cut -d'=' -f2)+ local patch=$(grep "public const int VersionPatch = " "$REPO_ROOT/apps/server/Shared/AliasVault.Shared/AppInfo.cs" | tr -d ';' | tr -d ' ' | cut -d'=' -f2)+ local stage=$(grep "public const string VersionStage = " "$REPO_ROOT/apps/server/Shared/AliasVault.Shared/AppInfo.cs" | cut -d'"' -f2)echo "$major.$minor.$patch$stage"}@@ -603,16 +603,16 @@ elif [[ "$MARKETING_UPDATE" == true ]]; then# Update server versionecho -e "${BLUE}Updating server version...${RESET}"- update_version "$REPO_ROOT/apps/server/Shared/AliasVault.Shared.Core/AppInfo.cs" \+ update_version "$REPO_ROOT/apps/server/Shared/AliasVault.Shared/AppInfo.cs" \"public const int VersionMajor = [0-9][0-9]*;" \"public const int VersionMajor = $major;"- update_version "$REPO_ROOT/apps/server/Shared/AliasVault.Shared.Core/AppInfo.cs" \+ update_version "$REPO_ROOT/apps/server/Shared/AliasVault.Shared/AppInfo.cs" \"public const int VersionMinor = [0-9][0-9]*;" \"public const int VersionMinor = $minor;"- update_version "$REPO_ROOT/apps/server/Shared/AliasVault.Shared.Core/AppInfo.cs" \+ update_version "$REPO_ROOT/apps/server/Shared/AliasVault.Shared/AppInfo.cs" \"public const int VersionPatch = [0-9][0-9]*;" \"public const int VersionPatch = $patch;"- update_version "$REPO_ROOT/apps/server/Shared/AliasVault.Shared.Core/AppInfo.cs" \+ update_version "$REPO_ROOT/apps/server/Shared/AliasVault.Shared/AppInfo.cs" \"public const string VersionStage = \"[^\"]*\";" \"public const string VersionStage = \"$version_suffix\";"diff --git a/scripts/dev.sh b/scripts/dev.shindex 65075c76c..9e3781ff2 100755--- a/scripts/dev.sh+++ b/scripts/dev.sh@@ -228,8 +228,8 @@ run_worker() {ConnectionStrings__AliasServerDbContext="$CONN_STR" \dotnet watch --project "$ROOT_DIR/apps/server/$proj"}-start_smtp() { run_worker "Services/AliasVault.SmtpService"; }-start_taskrunner() { run_worker "Services/AliasVault.TaskRunner"; }+start_smtp() { run_worker "AliasVault.SmtpService"; }+start_taskrunner() { run_worker "AliasVault.TaskRunner"; }start_web() {require npmdiff --git a/scripts/local-docker-build-push.sh b/scripts/local-docker-build-push.shindex bcc5fbb85..36fd3336a 100755--- a/scripts/local-docker-build-push.sh+++ b/scripts/local-docker-build-push.sh@@ -109,8 +109,8 @@ build_multi() {"client:apps/web/Dockerfile""admin:apps/server/AliasVault.Admin/Dockerfile""reverse-proxy:apps/server/Dockerfile"- "smtp:apps/server/Services/AliasVault.SmtpService/Dockerfile"- "task-runner:apps/server/Services/AliasVault.TaskRunner/Dockerfile"+ "smtp:apps/server/AliasVault.SmtpService/Dockerfile"+ "task-runner:apps/server/AliasVault.TaskRunner/Dockerfile""installcli:apps/server/Utilities/AliasVault.InstallCli/Dockerfile")diff --git a/scripts/review-versions.sh b/scripts/review-versions.shindex be677dae9..863eb9168 100755--- a/scripts/review-versions.sh+++ b/scripts/review-versions.sh@@ -9,10 +9,10 @@ fi# Function to extract version from server AppInfo.csget_server_version() {- local major=$(grep "public const int VersionMajor = " ../apps/server/Shared/AliasVault.Shared.Core/AppInfo.cs | tr -d ';' | tr -d ' ' | cut -d'=' -f2)- local minor=$(grep "public const int VersionMinor = " ../apps/server/Shared/AliasVault.Shared.Core/AppInfo.cs | tr -d ';' | tr -d ' ' | cut -d'=' -f2)- local patch=$(grep "public const int VersionPatch = " ../apps/server/Shared/AliasVault.Shared.Core/AppInfo.cs | tr -d ';' | tr -d ' ' | cut -d'=' -f2)- local stage=$(grep "public const string VersionStage = " ../apps/server/Shared/AliasVault.Shared.Core/AppInfo.cs | cut -d'"' -f2)+ local major=$(grep "public const int VersionMajor = " ../apps/server/Shared/AliasVault.Shared/AppInfo.cs | tr -d ';' | tr -d ' ' | cut -d'=' -f2)+ local minor=$(grep "public const int VersionMinor = " ../apps/server/Shared/AliasVault.Shared/AppInfo.cs | tr -d ';' | tr -d ' ' | cut -d'=' -f2)+ local patch=$(grep "public const int VersionPatch = " ../apps/server/Shared/AliasVault.Shared/AppInfo.cs | tr -d ';' | tr -d ' ' | cut -d'=' -f2)+ local stage=$(grep "public const string VersionStage = " ../apps/server/Shared/AliasVault.Shared/AppInfo.cs | cut -d'"' -f2)echo "$major.$minor.$patch$stage"}