Skip to content

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

Refactor ProcessFile callback (#773)

Leendert de Borst4ddd5512aa1f
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportService1Password.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportService1Password.razor
index 835232b02..88abbf09c 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportService1Password.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportService1Password.razor
@@ -19,7 +19,7 @@
@code {
private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.ImportExport.ImportServices", "AliasVault.Client");
- private static async Task<object> ProcessFile(string filename, byte[] fileBytes)
+ private static async Task<List<ImportedCredential>> ProcessFile(string filename, byte[] fileBytes)
{
var fileContents = Encoding.UTF8.GetString(fileBytes);
return await OnePasswordImporter.ImportFromCsvAsync(fileContents);
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceAliasVault.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceAliasVault.razor
index 7bddf53e0..7826a0fbb 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceAliasVault.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceAliasVault.razor
@@ -32,7 +32,7 @@
/// <param name="filename">The name of the uploaded file.</param>
/// <param name="fileBytes">The file content as bytes.</param>
/// <returns>A list of ImportedCredential objects.</returns>
- private async Task<object> ProcessFile(string filename, byte[] fileBytes)
+ private async Task<List<ImportedCredential>> ProcessFile(string filename, byte[] fileBytes)
{
try
{
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceBitwarden.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceBitwarden.razor
index ada172fd2..c776fdb54 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceBitwarden.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceBitwarden.razor
@@ -19,7 +19,7 @@
@code {
private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.ImportExport.ImportServices", "AliasVault.Client");
- private static async Task<object> ProcessFile(string filename, byte[] fileBytes)
+ private static async Task<List<ImportedCredential>> ProcessFile(string filename, byte[] fileBytes)
{
var fileContents = Encoding.UTF8.GetString(fileBytes);
return await BitwardenImporter.ImportFromCsvAsync(fileContents);
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceCard.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceCard.razor
index cb1ea4c80..a1c0bc142 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceCard.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceCard.razor
@@ -295,10 +295,10 @@
/// <summary>
/// The callback for processing files (accepts filename and bytes).
/// This callback should determine whether to process as text or binary based on the file extension.
- /// Returns either a List&lt;ImportedCredential&gt; or an AvuxImportResult for .avux files.
+ /// Returns a List&lt;ImportedCredential&gt; with optional FaviconBytes embedded for .avux files.
/// </summary>
[Parameter]
- public Func<string, byte[], Task<object>>? ProcessFileCallback { get; set; }
+ public Func<string, byte[], Task<List<ImportedCredential>>>? ProcessFileCallback { get; set; }
/// <summary>
/// Gets or sets the accepted file types (e.g., ".csv", ".avux").
@@ -347,10 +347,6 @@
private string? _pendingAvexFilename;
private bool _requiresPassword = false;
- // Fields for .avux import handling
- private bool IsAvuxImport { get; set; } = false;
- private Dictionary<Guid, (string Source, byte[] FileData)> AvuxLogos { get; set; } = new();
-
/// <summary>
/// Sets the imported credentials and continues to the preview step.
/// </summary>
@@ -499,18 +495,7 @@
// Process via the normal file handler as if it was an .avux upload
// This ensures consistent handling and avoids EF tracking issues
- var result = await ProcessFileCallback!("decrypted.avux", avuxBytes);
-
- if (result is List<ImportedCredential> credentials)
- {
- IsAvuxImport = false;
- AvuxLogos = new();
- ImportedCredentials = credentials;
- }
- else
- {
- throw new InvalidOperationException($"Unexpected result type from .avux processing: {result?.GetType().Name ?? "null"}");
- }
+ ImportedCredentials = await ProcessFileCallback!("decrypted.avux", avuxBytes);
// Clear password and encrypted data
_decryptionPassword = string.Empty;
@@ -981,27 +966,7 @@
var delayTask = Task.Delay(500);
await Task.WhenAll(processingTask, delayTask);
- var result = await processingTask;
-
- // Handle different result types
- if (result is AvuxImportResult avuxResult)
- {
- // .avux file with logos
- IsAvuxImport = true;
- AvuxLogos = avuxResult.Logos;
- ImportedCredentials = avuxResult.Credentials;
- }
- else if (result is List<ImportedCredential> credentials)
- {
- // Regular import
- IsAvuxImport = false;
- AvuxLogos = new();
- ImportedCredentials = credentials;
- }
- else
- {
- throw new InvalidOperationException($"Unexpected result type: {result?.GetType().Name ?? "null"}");
- }
+ ImportedCredentials = await processingTask;
// If password is required, the callback will handle setting the step to PasswordInput
// So we only proceed to preview if no password is required
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceChrome.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceChrome.razor
index c15a65349..a6a529ab9 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceChrome.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceChrome.razor
@@ -19,7 +19,7 @@
@code {
private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.ImportExport.ImportServices", "AliasVault.Client");
- private static async Task<object> ProcessFile(string filename, byte[] fileBytes)
+ private static async Task<List<ImportedCredential>> ProcessFile(string filename, byte[] fileBytes)
{
var fileContents = Encoding.UTF8.GetString(fileBytes);
return await ChromeImporter.ImportFromCsvAsync(fileContents);
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceDashlane.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceDashlane.razor
index 00a4b304a..b372f6038 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceDashlane.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceDashlane.razor
@@ -19,7 +19,7 @@
@code {
private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.ImportExport.ImportServices", "AliasVault.Client");
- private static async Task<object> ProcessFile(string filename, byte[] fileBytes)
+ private static async Task<List<ImportedCredential>> ProcessFile(string filename, byte[] fileBytes)
{
var fileContents = Encoding.UTF8.GetString(fileBytes);
return await DashlaneImporter.ImportFromCsvAsync(fileContents);
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceDropbox.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceDropbox.razor
index 49c4e7a81..2edbeb18e 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceDropbox.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceDropbox.razor
@@ -19,7 +19,7 @@
@code {
private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.ImportExport.ImportServices", "AliasVault.Client");
- private static async Task<object> ProcessFile(string filename, byte[] fileBytes)
+ private static async Task<List<ImportedCredential>> ProcessFile(string filename, byte[] fileBytes)
{
var fileContents = Encoding.UTF8.GetString(fileBytes);
return await DropboxImporter.ImportFromCsvAsync(fileContents);
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceEdge.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceEdge.razor
index 704ef7722..5ad49d666 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceEdge.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceEdge.razor
@@ -19,7 +19,7 @@
@code {
private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.ImportExport.ImportServices", "AliasVault.Client");
- private static async Task<object> ProcessFile(string filename, byte[] fileBytes)
+ private static async Task<List<ImportedCredential>> ProcessFile(string filename, byte[] fileBytes)
{
var fileContents = Encoding.UTF8.GetString(fileBytes);
return await EdgeImporter.ImportFromCsvAsync(fileContents);
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceEnpass.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceEnpass.razor
index c396da03c..a381c2014 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceEnpass.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceEnpass.razor
@@ -19,7 +19,7 @@
@code {
private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.ImportExport.ImportServices", "AliasVault.Client");
- private static async Task<object> ProcessFile(string filename, byte[] fileBytes)
+ private static async Task<List<ImportedCredential>> ProcessFile(string filename, byte[] fileBytes)
{
var fileContents = Encoding.UTF8.GetString(fileBytes);
return await EnpassImporter.ImportFromCsvAsync(fileContents);
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceFirefox.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceFirefox.razor
index 61d7ede30..c93daf449 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceFirefox.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceFirefox.razor
@@ -19,7 +19,7 @@
@code {
private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.ImportExport.ImportServices", "AliasVault.Client");
- private static async Task<object> ProcessFile(string filename, byte[] fileBytes)
+ private static async Task<List<ImportedCredential>> ProcessFile(string filename, byte[] fileBytes)
{
var fileContents = Encoding.UTF8.GetString(fileBytes);
return await FirefoxImporter.ImportFromCsvAsync(fileContents);
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceGenericCsv.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceGenericCsv.razor
index c5425b937..771a99d0b 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceGenericCsv.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceGenericCsv.razor
@@ -36,7 +36,7 @@
@code {
private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.ImportExport.ImportServices", "AliasVault.Client");
- private static async Task<object> ProcessFile(string filename, byte[] fileBytes)
+ private static async Task<List<ImportedCredential>> ProcessFile(string filename, byte[] fileBytes)
{
var fileContents = System.Text.Encoding.UTF8.GetString(fileBytes);
return await GenericCsvImporter.ImportFromCsvAsync(fileContents);
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceKeePass.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceKeePass.razor
index 5b47ff393..90c292f62 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceKeePass.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceKeePass.razor
@@ -18,7 +18,7 @@
@code {
private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.ImportExport.ImportServices", "AliasVault.Client");
- private static async Task<object> ProcessFile(string filename, byte[] fileBytes)
+ private static async Task<List<ImportedCredential>> ProcessFile(string filename, byte[] fileBytes)
{
var fileContents = System.Text.Encoding.UTF8.GetString(fileBytes);
return await KeePassImporter.ImportFromCsvAsync(fileContents);
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceKeePassXC.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceKeePassXC.razor
index fa2df2619..33f9c3a9e 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceKeePassXC.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceKeePassXC.razor
@@ -18,7 +18,7 @@
@code {
private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.ImportExport.ImportServices", "AliasVault.Client");
- private static async Task<object> ProcessFile(string filename, byte[] fileBytes)
+ private static async Task<List<ImportedCredential>> ProcessFile(string filename, byte[] fileBytes)
{
var fileContents = System.Text.Encoding.UTF8.GetString(fileBytes);
return await KeePassXcImporter.ImportFromCsvAsync(fileContents);
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceLastPass.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceLastPass.razor
index 0339112ee..275b3e73b 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceLastPass.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceLastPass.razor
@@ -18,7 +18,7 @@
@code {
private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.ImportExport.ImportServices", "AliasVault.Client");
- private static async Task<object> ProcessFile(string filename, byte[] fileBytes)
+ private static async Task<List<ImportedCredential>> ProcessFile(string filename, byte[] fileBytes)
{
var fileContents = System.Text.Encoding.UTF8.GetString(fileBytes);
return await LastPassImporter.ImportFromCsvAsync(fileContents);
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceNordPass.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceNordPass.razor
index 797283a62..8a0c69f36 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceNordPass.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceNordPass.razor
@@ -18,7 +18,7 @@
@code {
private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.ImportExport.ImportServices", "AliasVault.Client");
- private static async Task<object> ProcessFile(string filename, byte[] fileBytes)
+ private static async Task<List<ImportedCredential>> ProcessFile(string filename, byte[] fileBytes)
{
var fileContents = System.Text.Encoding.UTF8.GetString(fileBytes);
return await NordPassImporter.ImportFromCsvAsync(fileContents);
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceProtonPass.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceProtonPass.razor
index 7edc2a134..ae1e67710 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceProtonPass.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceProtonPass.razor
@@ -18,7 +18,7 @@
@code {
private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.ImportExport.ImportServices", "AliasVault.Client");
- private static async Task<object> ProcessFile(string filename, byte[] fileBytes)
+ private static async Task<List<ImportedCredential>> ProcessFile(string filename, byte[] fileBytes)
{
var fileContents = System.Text.Encoding.UTF8.GetString(fileBytes);
return await ProtonPassImporter.ImportFromCsvAsync(fileContents);
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceRoboform.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceRoboform.razor
index d8cd02db6..1c4089ccc 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceRoboform.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceRoboform.razor
@@ -18,7 +18,7 @@
@code {
private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.ImportExport.ImportServices", "AliasVault.Client");
- private static async Task<object> ProcessFile(string filename, byte[] fileBytes)
+ private static async Task<List<ImportedCredential>> ProcessFile(string filename, byte[] fileBytes)
{
var fileContents = System.Text.Encoding.UTF8.GetString(fileBytes);
return await RoboformImporter.ImportFromCsvAsync(fileContents);
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceStrongbox.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceStrongbox.razor
index b9503c276..4d20bd615 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceStrongbox.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceStrongbox.razor
@@ -18,7 +18,7 @@
@code {
private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.ImportExport.ImportServices", "AliasVault.Client");
- private static async Task<object> ProcessFile(string filename, byte[] fileBytes)
+ private static async Task<List<ImportedCredential>> ProcessFile(string filename, byte[] fileBytes)
{
var fileContents = System.Text.Encoding.UTF8.GetString(fileBytes);
return await StrongboxImporter.ImportFromCsvAsync(fileContents);
diff --git a/apps/server/Utilities/AliasVault.ImportExport/Models/AvuxImportResult.cs b/apps/server/Utilities/AliasVault.ImportExport/Models/AvuxImportResult.cs
deleted file mode 100644
index 52d332854..000000000
--- a/apps/server/Utilities/AliasVault.ImportExport/Models/AvuxImportResult.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// <copyright file="AvuxImportResult.cs" company="Luka Burazin">
-// Copyright (c) Luka Burazin. All rights reserved.
-// </copyright>
-
-namespace AliasVault.ImportExport.Models;
-
-/// <summary>
-/// Represents the result of importing an .avux file.
-/// Contains imported credentials and associated logo data.
-/// </summary>
-public class AvuxImportResult
-{
- /// <summary>
- /// Gets or sets the imported credentials.
- /// </summary>
- public List<ImportedCredential> Credentials { get; set; } = new();
-
- /// <summary>
- /// Gets or sets the logo data dictionary mapping logo ID to (Source domain, File data).
- /// Example: { guid1 => ("github.com", byte[]), guid2 => ("google.com", byte[]) }.
- /// </summary>
- public Dictionary<Guid, (string Source, byte[] FileData)> Logos { get; set; } = new();
-}