Skip to content

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

Update web app translations (#1347)

Leendert de Borstd562b183c54b
diff --git a/apps/server/AliasVault.Client/Auth/Components/MobileUnlockModal.razor b/apps/server/AliasVault.Client/Auth/Components/MobileUnlockModal.razor
index 7c80f75c3..ced3ed2c0 100644
--- a/apps/server/AliasVault.Client/Auth/Components/MobileUnlockModal.razor
+++ b/apps/server/AliasVault.Client/Auth/Components/MobileUnlockModal.razor
@@ -1,6 +1,7 @@
@using AliasVault.Client.Auth.Models
@using AliasVault.Client.Auth.Services
@using AliasVault.Client.Main.Components.Layout
+@using AliasVault.Client.Utilities
@using Microsoft.Extensions.Localization
@using Microsoft.Extensions.DependencyInjection
@implements IDisposable
@@ -69,6 +70,7 @@
@code {
private string? _qrCodeUrl;
+ private MobileLoginErrorCode? _errorCode;
private string? _errorMessage;
private int _timeRemaining = 120; // 2 minutes in seconds
private MobileLoginUtility? _mobileLoginUtility;
@@ -93,6 +95,8 @@
private IStringLocalizer SharedLocalizer => LocalizerFactory.Create("SharedResources", "AliasVault.Client");
+ private IStringLocalizer MobileLoginLocalizer => LocalizerFactory.Create("MobileLogin", "AliasVault.Client");
+
/// <summary>
/// Whether the modal is open.
/// </summary>
@@ -152,6 +156,7 @@
try
{
_isLoading = true;
+ _errorCode = null;
_errorMessage = null;
_qrCodeUrl = null;
_timeRemaining = 120;
@@ -186,11 +191,20 @@
HandleSuccessAsync,
HandleErrorAsync);
}
+ catch (MobileLoginException ex)
+ {
+ Logger.LogError(ex, "Error initiating mobile login");
+ _isLoading = false;
+ _errorCode = ex.ErrorCode;
+ _errorMessage = GetErrorMessage(ex.ErrorCode);
+ StateHasChanged();
+ }
catch (Exception ex)
{
Logger.LogError(ex, "Error initiating mobile login");
_isLoading = false;
- _errorMessage = SharedLocalizer["ErrorUnknown"];
+ _errorCode = MobileLoginErrorCode.Generic;
+ _errorMessage = GetErrorMessage(MobileLoginErrorCode.Generic);
StateHasChanged();
}
}
@@ -219,13 +233,28 @@
/// <summary>
/// Handle error.
/// </summary>
- private void HandleErrorAsync(string errorMessage)
+ private void HandleErrorAsync(MobileLoginErrorCode errorCode)
{
_isLoading = false;
- _errorMessage = errorMessage;
+ _qrCodeUrl = null; // Hide QR code when error occurs
+ _errorCode = errorCode;
+ _errorMessage = GetErrorMessage(errorCode);
StateHasChanged();
}
+ /// <summary>
+ /// Get translated error message for error code.
+ /// </summary>
+ private string GetErrorMessage(MobileLoginErrorCode errorCode)
+ {
+ return errorCode switch
+ {
+ MobileLoginErrorCode.Timeout => MobileLoginLocalizer["ErrorTimeout"],
+ MobileLoginErrorCode.Generic => SharedLocalizer["ErrorUnknown"],
+ _ => SharedLocalizer["ErrorUnknown"]
+ };
+ }
+
/// <summary>
/// Handle modal close.
/// </summary>
@@ -246,6 +275,7 @@
_countdownTimer?.Dispose();
_countdownTimer = null;
_qrCodeUrl = null;
+ _errorCode = null;
_errorMessage = null;
_timeRemaining = 120;
_isLoading = true;
diff --git a/apps/server/AliasVault.Client/Auth/Services/MobileLoginUtility.cs b/apps/server/AliasVault.Client/Auth/Services/MobileLoginUtility.cs
index eca095023..e57213bce 100644
--- a/apps/server/AliasVault.Client/Auth/Services/MobileLoginUtility.cs
+++ b/apps/server/AliasVault.Client/Auth/Services/MobileLoginUtility.cs
@@ -13,6 +13,7 @@ using System.Threading;
using System.Threading.Tasks;
using AliasVault.Client.Auth.Models;
using AliasVault.Client.Services.JsInterop;
+using AliasVault.Client.Utilities;
using AliasVault.Shared.Models.WebApi.Auth;
using Microsoft.Extensions.Logging;
@@ -47,42 +48,54 @@ public sealed class MobileLoginUtility : IDisposable
/// Initiates a mobile login request and returns the request ID for QR code generation.
/// </summary>
/// <returns>The request ID.</returns>
- /// <exception cref="HttpRequestException">Thrown when the request fails with status code.</exception>
+ /// <exception cref="MobileLoginException">Thrown when the request fails.</exception>
public async Task<string> InitiateAsync()
{
- // Generate RSA key pair
- var keyPair = await _jsInteropService.GenerateRsaKeyPair();
- _privateKey = keyPair.PrivateKey;
-
- // Send public key to server
- var request = new MobileLoginInitiateRequest
+ try
{
- ClientPublicKey = keyPair.PublicKey,
- };
- var response = await _httpClient.PostAsJsonAsync("v1/Auth/mobile-login/initiate", request);
+ // Generate RSA key pair
+ var keyPair = await _jsInteropService.GenerateRsaKeyPair();
+ _privateKey = keyPair.PrivateKey;
+
+ // Send public key to server
+ var request = new MobileLoginInitiateRequest
+ {
+ ClientPublicKey = keyPair.PublicKey,
+ };
+ var response = await _httpClient.PostAsJsonAsync("v1/Auth/mobile-login/initiate", request);
+
+ if (!response.IsSuccessStatusCode)
+ {
+ throw new MobileLoginException(MobileLoginErrorCode.Generic);
+ }
- if (!response.IsSuccessStatusCode)
+ var result = await response.Content.ReadFromJsonAsync<MobileLoginInitiateResponse>();
+ if (result == null)
+ {
+ throw new MobileLoginException(MobileLoginErrorCode.Generic);
+ }
+
+ _requestId = result.RequestId;
+ return _requestId;
+ }
+ catch (MobileLoginException)
{
- throw new HttpRequestException($"Failed to initiate mobile login: {response.StatusCode}", null, response.StatusCode);
+ throw;
}
-
- var result = await response.Content.ReadFromJsonAsync<MobileLoginInitiateResponse>();
- if (result == null)
+ catch (Exception ex)
{
- throw new InvalidOperationException("Failed to parse mobile login initiate response");
+ _logger.LogError(ex, "Failed to initiate mobile login");
+ throw new MobileLoginException(MobileLoginErrorCode.Generic);
}
-
- _requestId = result.RequestId;
- return _requestId;
}
/// <summary>
/// Starts polling the server for mobile login response.
/// </summary>
/// <param name="onSuccess">Callback for successful authentication with decrypted login result.</param>
- /// <param name="onError">Callback for errors.</param>
+ /// <param name="onError">Callback for errors with error code.</param>
/// <returns>Task.</returns>
- public Task StartPollingAsync(Func<MobileLoginResult, Task> onSuccess, Action<string> onError)
+ public Task StartPollingAsync(Func<MobileLoginResult, Task> onSuccess, Action<MobileLoginErrorCode> onError)
{
if (string.IsNullOrEmpty(_requestId) || string.IsNullOrEmpty(_privateKey))
{
@@ -102,7 +115,7 @@ public sealed class MobileLoginUtility : IDisposable
if (!_cancellationTokenSource.IsCancellationRequested)
{
StopPolling();
- onError("Mobile login request timed out");
+ onError(MobileLoginErrorCode.Timeout);
}
},
TaskScheduler.Default);
@@ -138,7 +151,7 @@ public sealed class MobileLoginUtility : IDisposable
Cleanup();
}
- private async Task PollServerAsync(Func<MobileLoginResult, Task> onSuccess, Action<string> onError)
+ private async Task PollServerAsync(Func<MobileLoginResult, Task> onSuccess, Action<MobileLoginErrorCode> onError)
{
if (string.IsNullOrEmpty(_requestId) || _cancellationTokenSource?.IsCancellationRequested == true)
{
@@ -156,7 +169,7 @@ public sealed class MobileLoginUtility : IDisposable
StopPolling();
_privateKey = null;
_requestId = null;
- onError("Mobile login request expired or not found");
+ onError(MobileLoginErrorCode.Timeout);
return;
}
@@ -201,7 +214,7 @@ public sealed class MobileLoginUtility : IDisposable
StopPolling();
_privateKey = null;
_requestId = null;
- onError(ex.Message);
+ onError(MobileLoginErrorCode.Generic);
}
}
}
diff --git a/apps/server/AliasVault.Client/Resources/MobileLogin.en.resx b/apps/server/AliasVault.Client/Resources/MobileLogin.en.resx
new file mode 100644
index 000000000..04ef1983e
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/MobileLogin.en.resx
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="ErrorTimeout" xml:space="preserve">
+ <value>Mobile login request timed out. Please reload the page and try again.</value>
+ </data>
+</root>
diff --git a/apps/server/AliasVault.Client/Utilities/MobileLoginErrorCode.cs b/apps/server/AliasVault.Client/Utilities/MobileLoginErrorCode.cs
new file mode 100644
index 000000000..3bf0cb50e
--- /dev/null
+++ b/apps/server/AliasVault.Client/Utilities/MobileLoginErrorCode.cs
@@ -0,0 +1,25 @@
+//-----------------------------------------------------------------------
+// <copyright file="MobileLoginErrorCode.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.Utilities;
+
+/// <summary>
+/// Error codes for mobile login operations.
+/// These codes are used to provide translatable error messages to users.
+/// </summary>
+public enum MobileLoginErrorCode
+{
+ /// <summary>
+ /// The mobile login request has timed out after 2 minutes.
+ /// </summary>
+ Timeout,
+
+ /// <summary>
+ /// A generic error occurred during mobile login.
+ /// </summary>
+ Generic,
+}
diff --git a/apps/server/AliasVault.Client/Utilities/MobileLoginException.cs b/apps/server/AliasVault.Client/Utilities/MobileLoginException.cs
new file mode 100644
index 000000000..51e75a6aa
--- /dev/null
+++ b/apps/server/AliasVault.Client/Utilities/MobileLoginException.cs
@@ -0,0 +1,32 @@
+//-----------------------------------------------------------------------
+// <copyright file="MobileLoginException.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.Utilities;
+
+using System;
+
+/// <summary>
+/// Exception thrown during mobile login operations.
+/// Contains a <see cref="MobileLoginErrorCode"/> for translation.
+/// </summary>
+public class MobileLoginException : Exception
+{
+ /// <summary>
+ /// Initializes a new instance of the <see cref="MobileLoginException"/> class.
+ /// </summary>
+ /// <param name="errorCode">The error code.</param>
+ public MobileLoginException(MobileLoginErrorCode errorCode)
+ : base($"Mobile login failed with error code: {errorCode}")
+ {
+ ErrorCode = errorCode;
+ }
+
+ /// <summary>
+ /// Gets the error code.
+ /// </summary>
+ public MobileLoginErrorCode ErrorCode { get; }
+}