Skip to content

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

Refactor Native interface code to reside inside JSInterop namespace (#1404)

Leendert de Borst7ddb54c95564
diff --git a/apps/server/AliasVault.Client/Program.cs b/apps/server/AliasVault.Client/Program.cs
index 2db423f29..79aea0829 100644
--- a/apps/server/AliasVault.Client/Program.cs
+++ b/apps/server/AliasVault.Client/Program.cs
@@ -10,7 +10,7 @@ using AliasVault.Client;
using AliasVault.Client.Main.Services;
using AliasVault.Client.Providers;
using AliasVault.Client.Services;
-using AliasVault.Client.Services.Native;
+using AliasVault.Client.Services.JsInterop.RustCore;
using AliasVault.RazorComponents.Services;
using AliasVault.Shared.Core;
using Blazor.WebAssembly.DynamicCulture.Loader;
@@ -101,7 +101,7 @@ builder.Services.AddScoped<ClipboardCopyService>();
builder.Services.AddScoped<ConfirmModalService>();
builder.Services.AddScoped<QuickCreateStateService>();
builder.Services.AddScoped<LanguageService>();
-builder.Services.AddScoped<RustCore>();
+builder.Services.AddScoped<RustCoreService>();
builder.Services.AddAuthorizationCore();
builder.Services.AddBlazoredLocalStorage();
diff --git a/apps/server/AliasVault.Client/Services/Database/DbService.cs b/apps/server/AliasVault.Client/Services/Database/DbService.cs
index 0d0c06f6e..cd370dcc5 100644
--- a/apps/server/AliasVault.Client/Services/Database/DbService.cs
+++ b/apps/server/AliasVault.Client/Services/Database/DbService.cs
@@ -15,7 +15,7 @@ using AliasClientDb.Models;
using AliasVault.Client.Services;
using AliasVault.Client.Services.Auth;
using AliasVault.Client.Services.JsInterop.Models;
-using AliasVault.Client.Services.Native;
+using AliasVault.Client.Services.JsInterop.RustCore;
using AliasVault.Client.Utilities;
using AliasVault.Shared.Models.Enums;
using AliasVault.Shared.Models.WebApi.Vault;
@@ -32,7 +32,7 @@ public sealed class DbService : IDisposable
private const string _UNKNOWN_VERSION = "Unknown";
private readonly AuthService _authService;
private readonly JsInteropService _jsInteropService;
- private readonly RustCore _rustCore;
+ private readonly RustCoreService _rustCore;
private readonly HttpClient _httpClient;
private readonly DbServiceState _state = new();
private readonly Config _config;
@@ -51,12 +51,12 @@ public sealed class DbService : IDisposable
/// </summary>
/// <param name="authService">AuthService.</param>
/// <param name="jsInteropService">JsInteropService.</param>
- /// <param name="rustCore">RustCore service for WASM interop.</param>
+ /// <param name="rustCore">RustCoreService for WASM interop.</param>
/// <param name="httpClient">HttpClient.</param>
/// <param name="config">Config instance.</param>
/// <param name="globalNotificationService">Global notification service.</param>
/// <param name="logger">ILogger instance.</param>
- public DbService(AuthService authService, JsInteropService jsInteropService, RustCore rustCore, HttpClient httpClient, Config config, GlobalNotificationService globalNotificationService, ILogger<DbService> logger)
+ public DbService(AuthService authService, JsInteropService jsInteropService, RustCoreService rustCore, HttpClient httpClient, Config config, GlobalNotificationService globalNotificationService, ILogger<DbService> logger)
{
_authService = authService;
_jsInteropService = jsInteropService;
diff --git a/apps/server/AliasVault.Client/Services/Native/MergeInput.cs b/apps/server/AliasVault.Client/Services/JsInterop/RustCore/MergeInput.cs
similarity index 94%
rename from apps/server/AliasVault.Client/Services/Native/MergeInput.cs
rename to apps/server/AliasVault.Client/Services/JsInterop/RustCore/MergeInput.cs
index df1d97457..55c869b9e 100644
--- a/apps/server/AliasVault.Client/Services/Native/MergeInput.cs
+++ b/apps/server/AliasVault.Client/Services/JsInterop/RustCore/MergeInput.cs
@@ -5,7 +5,7 @@
// </copyright>
//-----------------------------------------------------------------------
-namespace AliasVault.Client.Services.Native;
+namespace AliasVault.Client.Services.JsInterop.RustCore;
using System.Text.Json.Serialization;
diff --git a/apps/server/AliasVault.Client/Services/Native/MergeOutput.cs b/apps/server/AliasVault.Client/Services/JsInterop/RustCore/MergeOutput.cs
similarity index 95%
rename from apps/server/AliasVault.Client/Services/Native/MergeOutput.cs
rename to apps/server/AliasVault.Client/Services/JsInterop/RustCore/MergeOutput.cs
index 55ee305e6..cbdbf211d 100644
--- a/apps/server/AliasVault.Client/Services/Native/MergeOutput.cs
+++ b/apps/server/AliasVault.Client/Services/JsInterop/RustCore/MergeOutput.cs
@@ -5,7 +5,7 @@
// </copyright>
//-----------------------------------------------------------------------
-namespace AliasVault.Client.Services.Native;
+namespace AliasVault.Client.Services.JsInterop.RustCore;
using System.Text.Json.Serialization;
diff --git a/apps/server/AliasVault.Client/Services/Native/MergeStats.cs b/apps/server/AliasVault.Client/Services/JsInterop/RustCore/MergeStats.cs
similarity index 96%
rename from apps/server/AliasVault.Client/Services/Native/MergeStats.cs
rename to apps/server/AliasVault.Client/Services/JsInterop/RustCore/MergeStats.cs
index be0868778..a779d76ce 100644
--- a/apps/server/AliasVault.Client/Services/Native/MergeStats.cs
+++ b/apps/server/AliasVault.Client/Services/JsInterop/RustCore/MergeStats.cs
@@ -5,7 +5,7 @@
// </copyright>
//-----------------------------------------------------------------------
-namespace AliasVault.Client.Services.Native;
+namespace AliasVault.Client.Services.JsInterop.RustCore;
using System.Text.Json.Serialization;
diff --git a/apps/server/AliasVault.Client/Services/Native/RustCore.cs b/apps/server/AliasVault.Client/Services/JsInterop/RustCore/RustCoreService.cs
similarity index 94%
rename from apps/server/AliasVault.Client/Services/Native/RustCore.cs
rename to apps/server/AliasVault.Client/Services/JsInterop/RustCore/RustCoreService.cs
index 81c39af41..91feac283 100644
--- a/apps/server/AliasVault.Client/Services/Native/RustCore.cs
+++ b/apps/server/AliasVault.Client/Services/JsInterop/RustCore/RustCoreService.cs
@@ -1,11 +1,11 @@
//-----------------------------------------------------------------------
-// <copyright file="RustCore.cs" company="aliasvault">
+// <copyright file="RustCoreService.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.Client.Services.Native;
+namespace AliasVault.Client.Services.JsInterop.RustCore;
using System.Text.Json;
using Microsoft.JSInterop;
@@ -14,7 +14,7 @@ using Microsoft.JSInterop;
/// JavaScript interop wrapper for the Rust WASM core library.
/// Provides vault merge and credential matching functionality via WASM.
/// </summary>
-public class RustCore : IAsyncDisposable
+public class RustCoreService : IAsyncDisposable
{
private static readonly JsonSerializerOptions JsonOptions = new()
{
@@ -26,10 +26,10 @@ public class RustCore : IAsyncDisposable
private bool? isAvailable;
/// <summary>
- /// Initializes a new instance of the <see cref="RustCore"/> class.
+ /// Initializes a new instance of the <see cref="RustCoreService"/> class.
/// </summary>
/// <param name="jsRuntime">The JS runtime for interop.</param>
- public RustCore(IJSRuntime jsRuntime)
+ public RustCoreService(IJSRuntime jsRuntime)
{
this.jsRuntime = jsRuntime;
}
diff --git a/apps/server/AliasVault.Client/Services/Native/SqlStatement.cs b/apps/server/AliasVault.Client/Services/JsInterop/RustCore/SqlStatement.cs
similarity index 94%
rename from apps/server/AliasVault.Client/Services/Native/SqlStatement.cs
rename to apps/server/AliasVault.Client/Services/JsInterop/RustCore/SqlStatement.cs
index 38f90301f..bf21390a8 100644
--- a/apps/server/AliasVault.Client/Services/Native/SqlStatement.cs
+++ b/apps/server/AliasVault.Client/Services/JsInterop/RustCore/SqlStatement.cs
@@ -5,7 +5,7 @@
// </copyright>
//-----------------------------------------------------------------------
-namespace AliasVault.Client.Services.Native;
+namespace AliasVault.Client.Services.JsInterop.RustCore;
using System.Text.Json.Serialization;
diff --git a/apps/server/AliasVault.Client/Services/Native/SyncableTables.cs b/apps/server/AliasVault.Client/Services/JsInterop/RustCore/SyncableTables.cs
similarity index 94%
rename from apps/server/AliasVault.Client/Services/Native/SyncableTables.cs
rename to apps/server/AliasVault.Client/Services/JsInterop/RustCore/SyncableTables.cs
index 768e64b8b..7156405db 100644
--- a/apps/server/AliasVault.Client/Services/Native/SyncableTables.cs
+++ b/apps/server/AliasVault.Client/Services/JsInterop/RustCore/SyncableTables.cs
@@ -5,7 +5,7 @@
// </copyright>
//-----------------------------------------------------------------------
-namespace AliasVault.Client.Services.Native;
+namespace AliasVault.Client.Services.JsInterop.RustCore;
/// <summary>
/// List of syncable table names that need to be read for merge operations.
diff --git a/apps/server/AliasVault.Client/Services/Native/TableData.cs b/apps/server/AliasVault.Client/Services/JsInterop/RustCore/TableData.cs
similarity index 94%
rename from apps/server/AliasVault.Client/Services/Native/TableData.cs
rename to apps/server/AliasVault.Client/Services/JsInterop/RustCore/TableData.cs
index ff1519163..a2916d556 100644
--- a/apps/server/AliasVault.Client/Services/Native/TableData.cs
+++ b/apps/server/AliasVault.Client/Services/JsInterop/RustCore/TableData.cs
@@ -5,7 +5,7 @@
// </copyright>
//-----------------------------------------------------------------------
-namespace AliasVault.Client.Services.Native;
+namespace AliasVault.Client.Services.JsInterop.RustCore;
using System.Text.Json.Serialization;