Skip to content

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

Refactor API routes and update to v2 for all web app calls (#2159)

Leendert de Borst0499ac6757e4
diff --git a/apps/server/AliasVault.Client/ApiRoutes.cs b/apps/server/AliasVault.Client/ApiRoutes.cs
new file mode 100644
index 000000000..e26db04b7
--- /dev/null
+++ b/apps/server/AliasVault.Client/ApiRoutes.cs
@@ -0,0 +1,25 @@
+//-----------------------------------------------------------------------
+// <copyright file="ApiRoutes.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;
+
+/// <summary>
+/// Builds the relative request paths for the AliasVault API that all requests go through.
+/// </summary>
+public static class ApiRoutes
+{
+ /// <summary>
+ /// The API version every call from this client goes through.
+ /// </summary>
+ private const string VersionPrefix = "v2";
+
+ /// <summary>
+ /// Returns the relative path for an API endpoint.
+ /// </summary>
+ /// <param name="path">Endpoint path without version prefix, e.g. "Auth/login".</param>
+ /// <returns>Relative request path, e.g. "v2/Auth/login".</returns>
+ public static string ApiRoute(string path) => $"{VersionPrefix}/{path}";
+}
diff --git a/apps/server/AliasVault.Client/Auth/Pages/Login.razor b/apps/server/AliasVault.Client/Auth/Pages/Login.razor
index cc46486ce..ec1627768 100644
--- a/apps/server/AliasVault.Client/Auth/Pages/Login.razor
+++ b/apps/server/AliasVault.Client/Auth/Pages/Login.razor
@@ -252,7 +252,7 @@ else
var username = _loginModel.Username.ToLowerInvariant().Trim();
// Send request to server with username to get server ephemeral public key.
- var result = await Http.PostAsJsonAsync("v2/Auth/login", new LoginInitiateRequest(username));
+ var result = await Http.PostAsJsonAsync(ApiRoute("Auth/login"), new LoginInitiateRequest(username));
var responseContent = await result.Content.ReadAsStringAsync();
if (!result.IsSuccessStatusCode)
@@ -288,7 +288,7 @@ else
srpIdentity);
// 4. Client sends proof of session key to server.
- result = await Http.PostAsJsonAsync("v2/Auth/validate", new ValidateLoginRequest(username, _loginModel.RememberMe, _clientEphemeral.Public, _clientSession.Proof));
+ result = await Http.PostAsJsonAsync(ApiRoute("Auth/validate"), new ValidateLoginRequest(username, _loginModel.RememberMe, _clientEphemeral.Public, _clientSession.Proof));
responseContent = await result.Content.ReadAsStringAsync();
if (!result.IsSuccessStatusCode)
@@ -330,7 +330,7 @@ else
var username = _loginModel.Username.ToLowerInvariant().Trim();
// Validate 2-factor auth code auth and login
- var result = await Http.PostAsJsonAsync("v2/Auth/validate-recovery-code", new ValidateLoginRequestRecoveryCode(username, _loginModel.RememberMe, _clientEphemeral.Public, _clientSession.Proof, _loginModelRecoveryCode.RecoveryCode));
+ var result = await Http.PostAsJsonAsync(ApiRoute("Auth/validate-recovery-code"), new ValidateLoginRequestRecoveryCode(username, _loginModel.RememberMe, _clientEphemeral.Public, _clientSession.Proof, _loginModelRecoveryCode.RecoveryCode));
var responseContent = await result.Content.ReadAsStringAsync();
if (!result.IsSuccessStatusCode)
@@ -388,7 +388,7 @@ else
var username = _loginModel.Username.ToLowerInvariant().Trim();
// Validate 2-factor auth code auth and login
- var result = await Http.PostAsJsonAsync("v2/Auth/validate-2fa", new ValidateLoginRequest2Fa(username, _loginModel.RememberMe, _clientEphemeral.Public, _clientSession.Proof, _loginModel2Fa.TwoFactorCode ?? 0));
+ var result = await Http.PostAsJsonAsync(ApiRoute("Auth/validate-2fa"), new ValidateLoginRequest2Fa(username, _loginModel.RememberMe, _clientEphemeral.Public, _clientSession.Proof, _loginModel2Fa.TwoFactorCode ?? 0));
var responseContent = await result.Content.ReadAsStringAsync();
if (!result.IsSuccessStatusCode)
diff --git a/apps/server/AliasVault.Client/Auth/Pages/Setup/Components/UsernameStep.razor b/apps/server/AliasVault.Client/Auth/Pages/Setup/Components/UsernameStep.razor
index 6959ac23f..d133a36e1 100644
--- a/apps/server/AliasVault.Client/Auth/Pages/Setup/Components/UsernameStep.razor
+++ b/apps/server/AliasVault.Client/Auth/Pages/Setup/Components/UsernameStep.razor
@@ -174,7 +174,7 @@
try
{
- var response = await Http.PostAsJsonAsync("v1/Auth/validate-username", new { Username });
+ var response = await Http.PostAsJsonAsync(ApiRoute("Auth/validate-username"), new { Username });
if (response.IsSuccessStatusCode)
{
diff --git a/apps/server/AliasVault.Client/Auth/Pages/Unlock.razor b/apps/server/AliasVault.Client/Auth/Pages/Unlock.razor
index aebc200d5..3ef275ebb 100644
--- a/apps/server/AliasVault.Client/Auth/Pages/Unlock.razor
+++ b/apps/server/AliasVault.Client/Auth/Pages/Unlock.razor
@@ -272,7 +272,7 @@ else
// If user has no valid authentication an automatic redirect to login page will take place.
try
{
- await Http.GetAsync("v2/Status");
+ await Http.GetAsync(ApiRoute("Status"));
}
catch (Exception ex)
{
diff --git a/apps/server/AliasVault.Client/Auth/Services/MobileLoginUtility.cs b/apps/server/AliasVault.Client/Auth/Services/MobileLoginUtility.cs
index 14a70dcd4..f0804bc6e 100644
--- a/apps/server/AliasVault.Client/Auth/Services/MobileLoginUtility.cs
+++ b/apps/server/AliasVault.Client/Auth/Services/MobileLoginUtility.cs
@@ -69,7 +69,7 @@ public sealed class MobileLoginUtility : IDisposable
{
ClientPublicKey = keyPair.PublicKey,
};
- var response = await _httpClient.PostAsJsonAsync("v2/Auth/mobile-login/initiate", request);
+ var response = await _httpClient.PostAsJsonAsync(ApiRoute("Auth/mobile-login/initiate"), request);
if (!response.IsSuccessStatusCode)
{
@@ -183,7 +183,7 @@ public sealed class MobileLoginUtility : IDisposable
try
{
- var response = await _httpClient.GetAsync($"v2/Auth/mobile-login/poll/{_requestId}");
+ var response = await _httpClient.GetAsync(ApiRoute($"Auth/mobile-login/poll/{_requestId}"));
if (!response.IsSuccessStatusCode)
{
diff --git a/apps/server/AliasVault.Client/GlobalUsings.cs b/apps/server/AliasVault.Client/GlobalUsings.cs
index 95db21460..28516b383 100644
--- a/apps/server/AliasVault.Client/GlobalUsings.cs
+++ b/apps/server/AliasVault.Client/GlobalUsings.cs
@@ -15,3 +15,5 @@ global using AliasVault.Client.Services;
global using AliasVault.Client.Services.Auth;
global using AliasVault.Client.Services.JsInterop;
global using AliasVault.Client.Services.Database;
+
+global using static AliasVault.Client.ApiRoutes;
diff --git a/apps/server/AliasVault.Client/Main/Components/Email/EmailModal.razor b/apps/server/AliasVault.Client/Main/Components/Email/EmailModal.razor
index 089a4a845..f7cb1a172 100644
--- a/apps/server/AliasVault.Client/Main/Components/Email/EmailModal.razor
+++ b/apps/server/AliasVault.Client/Main/Components/Email/EmailModal.razor
@@ -347,7 +347,7 @@
try
{
- var response = await HttpClient.DeleteAsync($"v1/Email/{Email.Id}");
+ var response = await HttpClient.DeleteAsync(ApiRoute($"Email/{Email.Id}"));
if (response.IsSuccessStatusCode)
{
await OnEmailDeleted.InvokeAsync(Email.Id);
@@ -604,7 +604,7 @@
}
else
{
- var response = await HttpClient.GetAsync($"v1/Email/{Email!.Id}/attachments/{attachment.Id}");
+ var response = await HttpClient.GetAsync(ApiRoute($"Email/{Email!.Id}/attachments/{attachment.Id}"));
if (response.IsSuccessStatusCode)
{
diff --git a/apps/server/AliasVault.Client/Main/Components/Email/EmailPreview.razor b/apps/server/AliasVault.Client/Main/Components/Email/EmailPreview.razor
index b3915fa5c..da1b85d6e 100644
--- a/apps/server/AliasVault.Client/Main/Components/Email/EmailPreview.razor
+++ b/apps/server/AliasVault.Client/Main/Components/Email/EmailPreview.razor
@@ -262,7 +262,7 @@
try
{
- var response = await HttpClient.DeleteAsync($"v1/Email/{Email.Id}");
+ var response = await HttpClient.DeleteAsync(ApiRoute($"Email/{Email.Id}"));
if (response.IsSuccessStatusCode)
{
await OnEmailDeleted.InvokeAsync(Email.Id);
@@ -445,7 +445,7 @@
}
else
{
- var response = await HttpClient.GetAsync($"v1/Email/{Email!.Id}/attachments/{attachment.Id}");
+ var response = await HttpClient.GetAsync(ApiRoute($"Email/{Email!.Id}/attachments/{attachment.Id}"));
if (response.IsSuccessStatusCode)
{
diff --git a/apps/server/AliasVault.Client/Main/Components/Email/RecentEmails.razor b/apps/server/AliasVault.Client/Main/Components/Email/RecentEmails.razor
index 0d3e739be..70ef75717 100644
--- a/apps/server/AliasVault.Client/Main/Components/Email/RecentEmails.razor
+++ b/apps/server/AliasVault.Client/Main/Components/Email/RecentEmails.razor
@@ -436,7 +436,7 @@
/// </summary>
private async Task LoadAliasVaultEmails()
{
- var request = new HttpRequestMessage(HttpMethod.Get, $"v1/EmailBox/{EmailAddress}");
+ var request = new HttpRequestMessage(HttpMethod.Get, ApiRoute($"EmailBox/{EmailAddress}"));
try
{
var response = await HttpClient.SendAsync(request);
@@ -527,7 +527,7 @@
StateHasChanged();
await Task.Delay(1);
- EmailApiModel? mail = await HttpClient.GetFromJsonAsync<EmailApiModel>($"v1/Email/{emailId}");
+ EmailApiModel? mail = await HttpClient.GetFromJsonAsync<EmailApiModel>(ApiRoute($"Email/{emailId}"));
if (mail != null)
{
// Decrypt the email content locally.
diff --git a/apps/server/AliasVault.Client/Main/Pages/Emails/Home.razor b/apps/server/AliasVault.Client/Main/Pages/Emails/Home.razor
index 9202f9b4d..2095c9b95 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Emails/Home.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Emails/Home.razor
@@ -301,7 +301,7 @@ else
Addresses = emailClaimList,
};
- var request = new HttpRequestMessage(HttpMethod.Post, $"v1/EmailBox/bulk");
+ var request = new HttpRequestMessage(HttpMethod.Post, ApiRoute("EmailBox/bulk"));
request.Content = new StringContent(JsonSerializer.Serialize(requestModel), Encoding.UTF8, "application/json");
try
@@ -606,7 +606,7 @@ else
StateHasChanged();
await Task.Delay(1);
- EmailApiModel? mail = await HttpClient.GetFromJsonAsync<EmailApiModel>($"v1/Email/{emailId}");
+ EmailApiModel? mail = await HttpClient.GetFromJsonAsync<EmailApiModel>(ApiRoute($"Email/{emailId}"));
if (mail != null)
{
// Decrypt the email content locally.
@@ -675,7 +675,7 @@ else
try
{
- EmailApiModel? mail = await HttpClient.GetFromJsonAsync<EmailApiModel>($"v1/Email/{emailId}");
+ EmailApiModel? mail = await HttpClient.GetFromJsonAsync<EmailApiModel>(ApiRoute($"Email/{emailId}"));
if (sequence != _previewLoadSequence)
{
return;
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/ChangePassword.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/ChangePassword.razor
index d68527ee9..4a447a5f2 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/ChangePassword.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/ChangePassword.razor
@@ -283,7 +283,7 @@ else
/// </summary>
private async Task GetCurrentPasswordEphemeralAndSalt()
{
- var response = await Http.GetFromJsonAsync<PasswordChangeInitiateResponse>("v1/Auth/change-password/initiate");
+ var response = await Http.GetFromJsonAsync<PasswordChangeInitiateResponse>(ApiRoute("Auth/change-password/initiate"));
if (response == null)
{
@@ -396,7 +396,7 @@ else
// 4. Client sends proof of session key to server.
try {
- var response = await Http.PostAsJsonAsync("v1/Vault/change-password", vaultPasswordChangeObject);
+ var response = await Http.PostAsJsonAsync(ApiRoute("Vault/change-password"), vaultPasswordChangeObject);
var responseContent = await response.Content.ReadAsStringAsync();
if (!response.IsSuccessStatusCode)
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/ActiveSessionsSection.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/ActiveSessionsSection.razor
index 2e784ef69..4b38b9cba 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/ActiveSessionsSection.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/ActiveSessionsSection.razor
@@ -74,7 +74,7 @@
{
IsLoading = true;
StateHasChanged();
- var sessionsResponse = await Http.GetFromJsonAsync<List<RefreshTokenModel>>("v1/Security/sessions");
+ var sessionsResponse = await Http.GetFromJsonAsync<List<RefreshTokenModel>>(ApiRoute("Security/sessions"));
if (sessionsResponse is not null)
{
Sessions = sessionsResponse;
@@ -93,7 +93,7 @@
{
try
{
- var response = await Http.DeleteAsync($"v1/Security/sessions/{id}");
+ var response = await Http.DeleteAsync(ApiRoute($"Security/sessions/{id}"));
if (response.IsSuccessStatusCode)
{
GlobalNotificationService.AddSuccessMessage(Localizer["RevokeSuccessMessage"], true);
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/RecentAuthLogsSection.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/RecentAuthLogsSection.razor
index ffbd80d84..1d7d237c1 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/RecentAuthLogsSection.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/RecentAuthLogsSection.razor
@@ -74,7 +74,7 @@
{
IsLoading = true;
StateHasChanged();
- var authlogResponse = await Http.GetFromJsonAsync<List<AuthLogModel>>("v1/Security/authlogs");
+ var authlogResponse = await Http.GetFromJsonAsync<List<AuthLogModel>>(ApiRoute("Security/authlogs"));
if (authlogResponse is not null)
{
// Only show the latest 20 auth logs to save space in UI.
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/TwoFactorAuthenticationSection.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/TwoFactorAuthenticationSection.razor
index cf863a507..afa154a2e 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/TwoFactorAuthenticationSection.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/TwoFactorAuthenticationSection.razor
@@ -51,7 +51,7 @@
IsLoading = true;
StateHasChanged();
- var twoFactorResponse = await Http.GetFromJsonAsync<TwoFactorEnabledResult>("v1/TwoFactorAuth/status");
+ var twoFactorResponse = await Http.GetFromJsonAsync<TwoFactorEnabledResult>(ApiRoute("TwoFactorAuth/status"));
if (twoFactorResponse is not null)
{
TwoFactorEnabled = twoFactorResponse.TwoFactorEnabled;
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/DeleteAccount.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/DeleteAccount.razor
index 4b2418551..6d28c0bb0 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/DeleteAccount.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/DeleteAccount.razor
@@ -159,7 +159,7 @@
{
// First verify the current password.
var username = await GetUsernameAsync();
- var result = await Http.PostAsJsonAsync("v1/Auth/delete-account/initiate", new LoginInitiateRequest(username));
+ var result = await Http.PostAsJsonAsync(ApiRoute("Auth/delete-account/initiate"), new LoginInitiateRequest(username));
var responseContent = await result.Content.ReadAsStringAsync();
if (!result.IsSuccessStatusCode)
@@ -196,7 +196,7 @@
srpIdentity);
// Send final delete request with SRP proof.
- result = await Http.PostAsJsonAsync("v1/Auth/delete-account/confirm", new DeleteAccountRequest(username, ClientEphemeral.Public, ClientSession.Proof));
+ result = await Http.PostAsJsonAsync(ApiRoute("Auth/delete-account/confirm"), new DeleteAccountRequest(username, ClientEphemeral.Public, ClientSession.Proof));
responseContent = await result.Content.ReadAsStringAsync();
if (!result.IsSuccessStatusCode)
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Disable2Fa.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Disable2Fa.razor
index 2655b367a..337a50dd7 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Disable2Fa.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Disable2Fa.razor
@@ -51,7 +51,7 @@ else
// Check on server if 2FA is enabled
if (firstRender)
{
- var response = await Http.GetFromJsonAsync<TwoFactorEnabledResult>("v1/TwoFactorAuth/status");
+ var response = await Http.GetFromJsonAsync<TwoFactorEnabledResult>(ApiRoute("TwoFactorAuth/status"));
if (response is not null && !response.TwoFactorEnabled)
{
GlobalNotificationService.AddErrorMessage(Localizer["TwoFactorNotEnabled"]);
@@ -66,7 +66,7 @@ else
private async Task DisableTwoFactor()
{
- var response = await Http.PostAsync("v1/TwoFactorAuth/disable", null);
+ var response = await Http.PostAsync(ApiRoute("TwoFactorAuth/disable"), null);
if (response.IsSuccessStatusCode)
{
GlobalNotificationService.AddSuccessMessage(Localizer["TwoFactorDisabledSuccess"]);
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Enable2Fa.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Enable2Fa.razor
index 22766eead..492bde07b 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Enable2Fa.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Enable2Fa.razor
@@ -80,7 +80,7 @@ else
if (firstRender)
{
// Get the QR code and secret for the authenticator app.
- var response = await Http.PostAsync("v1/TwoFactorAuth/enable", null);
+ var response = await Http.PostAsync(ApiRoute("TwoFactorAuth/enable"), null);
if (response.IsSuccessStatusCode)
{
var result = await response.Content.ReadFromJsonAsync<TwoFactorSetupResult>();
@@ -106,7 +106,7 @@ else
private async Task VerifySetup()
{
- var response = await Http.PostAsJsonAsync("v1/TwoFactorAuth/verify", VerifyModel.Code);
+ var response = await Http.PostAsJsonAsync(ApiRoute("TwoFactorAuth/verify"), VerifyModel.Code);
if (response.IsSuccessStatusCode)
{
var result = await response.Content.ReadFromJsonAsync<TwoFactorVerifyResult>();
diff --git a/apps/server/AliasVault.Client/Main/Pages/Test/Test1.razor b/apps/server/AliasVault.Client/Main/Pages/Test/Test1.razor
index c1d14630f..345a2bee3 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Test/Test1.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Test/Test1.razor
@@ -37,7 +37,7 @@
private async Task MakeWebApiCall()
{
- await HttpClient.GetAsync("v1/Test");
+ await HttpClient.GetAsync(ApiRoute("Test"));
IsLoading = false;
StateHasChanged();
diff --git a/apps/server/AliasVault.Client/Main/Pages/Test/Test2.razor b/apps/server/AliasVault.Client/Main/Pages/Test/Test2.razor
index 6520b767b..7dfb029ff 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Test/Test2.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Test/Test2.razor
@@ -37,7 +37,7 @@
private async Task MakeWebApiCall()
{
- await HttpClient.GetAsync("v1/Test");
+ await HttpClient.GetAsync(ApiRoute("Test"));
IsLoading = false;
StateHasChanged();
diff --git a/apps/server/AliasVault.Client/Services/Auth/AuthService.cs b/apps/server/AliasVault.Client/Services/Auth/AuthService.cs
index aa8ccda1b..4e0f2c063 100644
--- a/apps/server/AliasVault.Client/Services/Auth/AuthService.cs
+++ b/apps/server/AliasVault.Client/Services/Auth/AuthService.cs
@@ -61,7 +61,7 @@ public sealed class AuthService(HttpClient httpClient, ILocalStorageService loca
var accessToken = await GetAccessTokenAsync();
var refreshToken = await GetRefreshTokenAsync();
var tokenInput = new TokenModel { Token = accessToken, RefreshToken = refreshToken };
- using var request = new HttpRequestMessage(HttpMethod.Post, "v2/Auth/refresh")
+ using var request = new HttpRequestMessage(HttpMethod.Post, ApiRoute("Auth/refresh"))
{
Content = JsonContent.Create(tokenInput),
};
@@ -441,7 +441,7 @@ public sealed class AuthService(HttpClient httpClient, ILocalStorageService loca
RefreshToken = await GetRefreshTokenAsync(),
};
- using var request = new HttpRequestMessage(HttpMethod.Post, "v2/Auth/revoke-token")
+ using var request = new HttpRequestMessage(HttpMethod.Post, ApiRoute("Auth/revoke-token"))
{
Content = JsonContent.Create(tokenInput),
};
@@ -511,7 +511,7 @@ public sealed class AuthService(HttpClient httpClient, ILocalStorageService loca
RefreshToken = await GetRefreshTokenAsync(),
};
- using var request = new HttpRequestMessage(HttpMethod.Post, "v2/Auth/revoke")
+ using var request = new HttpRequestMessage(HttpMethod.Post, ApiRoute("Auth/revoke"))
{
Content = JsonContent.Create(tokenInput),
};
diff --git a/apps/server/AliasVault.Client/Services/Auth/UserRegistrationService.cs b/apps/server/AliasVault.Client/Services/Auth/UserRegistrationService.cs
index aea0ddb0d..94f54b1c5 100644
--- a/apps/server/AliasVault.Client/Services/Auth/UserRegistrationService.cs
+++ b/apps/server/AliasVault.Client/Services/Auth/UserRegistrationService.cs
@@ -62,7 +62,7 @@ public class UserRegistrationService(HttpClient httpClient, AuthenticationStateP
var srpVerifier = await rustCoreService.SrpDeriveVerifierAsync(privateKey);
var registerRequest = new RegisterRequest(username, salt, srpVerifier, encryptionType, encryptionSettings, srpIdentity);
- var result = await httpClient.PostAsJsonAsync("v1/Auth/register", registerRequest);
+ var result = await httpClient.PostAsJsonAsync(ApiRoute("Auth/register"), registerRequest);
var responseContent = await result.Content.ReadAsStringAsync();
if (!result.IsSuccessStatusCode)
diff --git a/apps/server/AliasVault.Client/Services/Database/DbService.cs b/apps/server/AliasVault.Client/Services/Database/DbService.cs
index 1c9b3fe16..f82e2ad70 100644
--- a/apps/server/AliasVault.Client/Services/Database/DbService.cs
+++ b/apps/server/AliasVault.Client/Services/Database/DbService.cs
@@ -748,7 +748,7 @@ public sealed class DbService : IDisposable
_logger.LogInformation("Local vault is outdated. Fetching latest vault from server for merge...");
// Fetch the latest vault from server.
- var response = await _httpClient.GetFromJsonAsync<VaultGetResponse>("v1/Vault");
+ var response = await _httpClient.GetFromJsonAsync<VaultGetResponse>(ApiRoute("Vault"));
if (response?.Vault == null || string.IsNullOrEmpty(response.Vault.Blob))
{
_logger.LogError("Failed to fetch vault from server for merge.");
@@ -991,7 +991,7 @@ public sealed class DbService : IDisposable
try
{
- var response = await _httpClient.PostAsJsonAsync("v1/Vault", vaultObject);
+ var response = await _httpClient.PostAsJsonAsync(ApiRoute("Vault"), vaultObject);
// 413: server / reverse-proxy rejected the upload because the vault exceeded MAX_UPLOAD_SIZE_MB.
// Show the targeted message and skip the generic notification fired in the catch / fallthrough.
diff --git a/apps/server/AliasVault.Client/Services/FaviconService.cs b/apps/server/AliasVault.Client/Services/FaviconService.cs
index e2e6f9ecb..ec7c1eb22 100644
--- a/apps/server/AliasVault.Client/Services/FaviconService.cs
+++ b/apps/server/AliasVault.Client/Services/FaviconService.cs
@@ -90,8 +90,7 @@ public sealed class FaviconService(HttpClient httpClient)
{
try
{
- var apiReturn = await httpClient.GetFromJsonAsync<FaviconExtractModel>(
- $"v1/Favicon/Extract?url={Uri.EscapeDataString(url)}");
+ var apiReturn = await httpClient.GetFromJsonAsync<FaviconExtractModel>(ApiRoute($"Favicon/Extract?url={Uri.EscapeDataString(url)}"));
return apiReturn?.Image;
}
catch
@@ -156,7 +155,7 @@ public sealed class FaviconService(HttpClient httpClient)
HttpResponseMessage response;
try
{
- response = await httpClient.PostAsJsonAsync("v1/Favicon/ExtractBatch", request, cancellationToken);
+ response = await httpClient.PostAsJsonAsync(ApiRoute("Favicon/ExtractBatch"), request, cancellationToken);
}
catch
{
diff --git a/apps/server/AliasVault.Client/Services/ItemService.cs b/apps/server/AliasVault.Client/Services/ItemService.cs
index 74f702180..bc89b6a6e 100644
--- a/apps/server/AliasVault.Client/Services/ItemService.cs
+++ b/apps/server/AliasVault.Client/Services/ItemService.cs
@@ -110,7 +110,7 @@ public sealed class ItemService(HttpClient httpClient, DbService dbService, Conf
// Check if email is already taken
try
{
- var response = await httpClient.PostAsync($"v1/Identity/CheckEmail/{email}", null);
+ var response = await httpClient.PostAsync(ApiRoute($"Identity/CheckEmail/{email}"), null);
var result = await response.Content.ReadFromJsonAsync<Dictionary<string, bool>>();
isEmailTaken = result?["isTaken"] ?? false;
}
diff --git a/apps/server/AliasVault.Client/Services/VaultSync/VaultKeyService.cs b/apps/server/AliasVault.Client/Services/VaultSync/VaultKeyService.cs
index 5093912cc..1ce52e8ba 100644
--- a/apps/server/AliasVault.Client/Services/VaultSync/VaultKeyService.cs
+++ b/apps/server/AliasVault.Client/Services/VaultSync/VaultKeyService.cs
@@ -28,7 +28,7 @@ using Microsoft.JSInterop;
/// <param name="logger">ILogger instance.</param>
public sealed class VaultKeyService(HttpClient httpClient, ILocalStorageService localStorage, JsInteropService jsInteropService, RustCoreService rustCoreService, ILogger<VaultKeyService> logger)
{
- private static readonly string VaultKeyEndpoint = $"v2/VaultKey/{UnlockMethodTypes.ToToken(UnlockMethodType.Password)}";
+ private static readonly string VaultKeyEndpoint = ApiRoute($"VaultKey/{UnlockMethodTypes.ToToken(UnlockMethodType.Password)}");
/// <summary>
/// Fetch the current user's password vault key from the server.
@@ -100,7 +100,7 @@ public sealed class VaultKeyService(HttpClient httpClient, ILocalStorageService
if (online)
{
// Legacy account: the derived key is the encryption key and the salt comes from the login handshake.
- var initiate = await httpClient.PostAsJsonAsync("v2/Auth/login", new LoginInitiateRequest(username));
+ var initiate = await httpClient.PostAsJsonAsync(ApiRoute("Auth/login"), new LoginInitiateRequest(username));
initiate.EnsureSuccessStatusCode();
var loginResponse = await initiate.Content.ReadFromJsonAsync<LoginInitiateResponse>() ?? throw new InvalidOperationException("Empty login initiate response.");
await StoreDerivationParamsAsync(new EncryptionKeyDerivationParams(loginResponse.Salt, loginResponse.EncryptionType, loginResponse.EncryptionSettings));
diff --git a/apps/server/AliasVault.Client/Services/VaultSync/VaultSyncService.cs b/apps/server/AliasVault.Client/Services/VaultSync/VaultSyncService.cs
index 69ffb1645..12b740a03 100644
--- a/apps/server/AliasVault.Client/Services/VaultSync/VaultSyncService.cs
+++ b/apps/server/AliasVault.Client/Services/VaultSync/VaultSyncService.cs
@@ -33,8 +33,6 @@ using Microsoft.JSInterop;
/// <param name="logger">ILogger instance.</param>
public sealed class VaultSyncService(HttpClient httpClient, AuthService authService, VaultKeyService vaultKeyService, JsInteropService jsInteropService, RustCoreService rustCoreService, VaultSyncState state, ILogger<VaultSyncService> logger)
{
- private const string VaultEndpoint = "v2/Vault";
- private const string BlobsDownloadEndpoint = "v2/Vault/blobs/download";
private const string AttachmentBlobCategory = "attachment";
/// <summary>
@@ -47,6 +45,9 @@ public sealed class VaultSyncService(HttpClient httpClient, AuthService authServ
/// </summary>
private const int BlobTransferBatchMaxCount = 100;
+ private static readonly string VaultEndpoint = ApiRoute("Vault");
+ private static readonly string BlobsDownloadEndpoint = ApiRoute("Vault/blobs/download");
+
/// <summary>
/// Gets the sync state recorded by the last pull.
/// </summary>