Skip to content

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

Refactor MobileLogin models to use class structure instead of record for readability (#1347)

Leendert de Borst4d74504882b1
diff --git a/apps/browser-extension/src/utils/dist/shared/models/webapi/index.d.ts b/apps/browser-extension/src/utils/dist/shared/models/webapi/index.d.ts
index dfaf25875..af8a6cbfd 100644
--- a/apps/browser-extension/src/utils/dist/shared/models/webapi/index.d.ts
+++ b/apps/browser-extension/src/utils/dist/shared/models/webapi/index.d.ts
@@ -406,7 +406,6 @@ type MobileLoginInitiateResponse = {
type MobileLoginSubmitRequest = {
requestId: string;
encryptedDecryptionKey: string;
- username: string;
};
/**
* Mobile login poll response type.
diff --git a/apps/mobile-app/utils/dist/shared/models/webapi/index.d.ts b/apps/mobile-app/utils/dist/shared/models/webapi/index.d.ts
index dfaf25875..af8a6cbfd 100644
--- a/apps/mobile-app/utils/dist/shared/models/webapi/index.d.ts
+++ b/apps/mobile-app/utils/dist/shared/models/webapi/index.d.ts
@@ -406,7 +406,6 @@ type MobileLoginInitiateResponse = {
type MobileLoginSubmitRequest = {
requestId: string;
encryptedDecryptionKey: string;
- username: string;
};
/**
* Mobile login poll response type.
diff --git a/apps/server/AliasVault.Api/Controllers/AuthController.cs b/apps/server/AliasVault.Api/Controllers/AuthController.cs
index aebc17099..51243c096 100644
--- a/apps/server/AliasVault.Api/Controllers/AuthController.cs
+++ b/apps/server/AliasVault.Api/Controllers/AuthController.cs
@@ -566,7 +566,10 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserM
context.MobileLoginRequests.Add(loginRequest);
await context.SaveChangesAsync();
- return Ok(new MobileLoginInitiateResponse(requestId));
+ return Ok(new MobileLoginInitiateResponse
+ {
+ RequestId = requestId,
+ });
}
/// <summary>
@@ -591,7 +594,15 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserM
// If not fulfilled, return pending status
if (loginRequest.FulfilledAt == null)
{
- return Ok(new MobileLoginPollResponse(false, null, null, null, null, null));
+ return Ok(new MobileLoginPollResponse
+ {
+ Fulfilled = false,
+ EncryptedSymmetricKey = null,
+ EncryptedToken = null,
+ EncryptedRefreshToken = null,
+ EncryptedDecryptionKey = null,
+ EncryptedUsername = null,
+ });
}
// Check if already retrieved (one-time use protection)
@@ -650,13 +661,15 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserM
// Return response with encrypted symmetric key and encrypted fields
// Client will decrypt username to call /login endpoint for salt and encryption settings
- return Ok(new MobileLoginPollResponse(
- true,
- encryptedSymmetricKey,
- encryptedToken,
- encryptedRefreshToken,
- encryptedDecryptionKey,
- encryptedUsername));
+ return Ok(new MobileLoginPollResponse
+ {
+ Fulfilled = true,
+ EncryptedSymmetricKey = encryptedSymmetricKey,
+ EncryptedToken = encryptedToken,
+ EncryptedRefreshToken = encryptedRefreshToken,
+ EncryptedDecryptionKey = encryptedDecryptionKey,
+ EncryptedUsername = encryptedUsername,
+ });
}
/// <summary>
diff --git a/apps/server/AliasVault.Client/Auth/Services/MobileLoginUtility.cs b/apps/server/AliasVault.Client/Auth/Services/MobileLoginUtility.cs
index ba6a77a97..eca095023 100644
--- a/apps/server/AliasVault.Client/Auth/Services/MobileLoginUtility.cs
+++ b/apps/server/AliasVault.Client/Auth/Services/MobileLoginUtility.cs
@@ -55,7 +55,10 @@ public sealed class MobileLoginUtility : IDisposable
_privateKey = keyPair.PrivateKey;
// Send public key to server
- var request = new MobileLoginInitiateRequest(keyPair.PublicKey);
+ var request = new MobileLoginInitiateRequest
+ {
+ ClientPublicKey = keyPair.PublicKey,
+ };
var response = await _httpClient.PostAsJsonAsync("v1/Auth/mobile-login/initiate", request);
if (!response.IsSuccessStatusCode)
diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginInitiateRequest.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginInitiateRequest.cs
index 2d65e4dd0..f08cedb6f 100644
--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginInitiateRequest.cs
+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginInitiateRequest.cs
@@ -10,5 +10,10 @@ namespace AliasVault.Shared.Models.WebApi.Auth;
/// <summary>
/// Request model for initiating a mobile login request.
/// </summary>
-/// <param name="ClientPublicKey">The public key from the client (base64 encoded).</param>
-public record MobileLoginInitiateRequest(string ClientPublicKey);
+public class MobileLoginInitiateRequest
+{
+ /// <summary>
+ /// Gets or sets the public key from the client (base64 encoded).
+ /// </summary>
+ public required string ClientPublicKey { get; set; }
+}
diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginInitiateResponse.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginInitiateResponse.cs
index a0e2ecba5..59a02e534 100644
--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginInitiateResponse.cs
+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginInitiateResponse.cs
@@ -10,5 +10,10 @@ namespace AliasVault.Shared.Models.WebApi.Auth;
/// <summary>
/// Response model for mobile login initiate request.
/// </summary>
-/// <param name="RequestId">The unique identifier for this login request.</param>
-public record MobileLoginInitiateResponse(string RequestId);
+public class MobileLoginInitiateResponse
+{
+ /// <summary>
+ /// Gets or sets the unique identifier for this login request.
+ /// </summary>
+ public required string RequestId { get; set; }
+}
diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginPollResponse.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginPollResponse.cs
index 91104cc48..ec09c1e52 100644
--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginPollResponse.cs
+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginPollResponse.cs
@@ -12,16 +12,37 @@ namespace AliasVault.Shared.Models.WebApi.Auth;
/// All sensitive data is encrypted with AES-256, and the AES key is encrypted with client's RSA public key.
/// Client decrypts username to call /login endpoint for salt and encryption settings.
/// </summary>
-/// <param name="Fulfilled">Whether the request has been fulfilled by the mobile app.</param>
-/// <param name="EncryptedSymmetricKey">The AES symmetric key encrypted with client's RSA public key (base64 encoded). Used to decrypt all encrypted fields. Null if not fulfilled.</param>
-/// <param name="EncryptedToken">The JWT token encrypted with AES symmetric key (base64 encoded). Null if not fulfilled.</param>
-/// <param name="EncryptedRefreshToken">The refresh token encrypted with AES symmetric key (base64 encoded). Null if not fulfilled.</param>
-/// <param name="EncryptedDecryptionKey">The vault decryption key encrypted with client's RSA public key (base64 encoded). Null if not fulfilled.</param>
-/// <param name="EncryptedUsername">The username encrypted with AES symmetric key (base64 encoded). Retrieved from User via UserId FK. Null if not fulfilled.</param>
-public record MobileLoginPollResponse(
- bool Fulfilled,
- string? EncryptedSymmetricKey,
- string? EncryptedToken,
- string? EncryptedRefreshToken,
- string? EncryptedDecryptionKey,
- string? EncryptedUsername);
+public class MobileLoginPollResponse
+{
+ /// <summary>
+ /// Gets or sets a value indicating whether the request has been fulfilled by the mobile app.
+ /// </summary>
+ public required bool Fulfilled { get; set; }
+
+ /// <summary>
+ /// Gets or sets the AES symmetric key encrypted with client's RSA public key (base64 encoded).
+ /// Used to decrypt all encrypted fields. Null if not fulfilled.
+ /// </summary>
+ public string? EncryptedSymmetricKey { get; set; }
+
+ /// <summary>
+ /// Gets or sets the JWT token encrypted with AES symmetric key (base64 encoded). Null if not fulfilled.
+ /// </summary>
+ public string? EncryptedToken { get; set; }
+
+ /// <summary>
+ /// Gets or sets the refresh token encrypted with AES symmetric key (base64 encoded). Null if not fulfilled.
+ /// </summary>
+ public string? EncryptedRefreshToken { get; set; }
+
+ /// <summary>
+ /// Gets or sets the vault decryption key encrypted with client's RSA public key (base64 encoded). Null if not fulfilled.
+ /// </summary>
+ public string? EncryptedDecryptionKey { get; set; }
+
+ /// <summary>
+ /// Gets or sets the username encrypted with AES symmetric key (base64 encoded).
+ /// Retrieved from User via UserId FK. Null if not fulfilled.
+ /// </summary>
+ public string? EncryptedUsername { get; set; }
+}
diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginSubmitRequest.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginSubmitRequest.cs
index c0e3faf39..da5c87b8b 100644
--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginSubmitRequest.cs
+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginSubmitRequest.cs
@@ -10,6 +10,15 @@ namespace AliasVault.Shared.Models.WebApi.Auth;
/// <summary>
/// Request model for submitting mobile login response from mobile app.
/// </summary>
-/// <param name="RequestId">The unique identifier for this login request.</param>
-/// <param name="EncryptedDecryptionKey">The encrypted decryption key (base64 encoded).</param>
-public record MobileLoginSubmitRequest(string RequestId, string EncryptedDecryptionKey);
+public class MobileLoginSubmitRequest
+{
+ /// <summary>
+ /// Gets or sets the unique identifier for this login request.
+ /// </summary>
+ public required string RequestId { get; set; }
+
+ /// <summary>
+ /// Gets or sets the encrypted decryption key (base64 encoded).
+ /// </summary>
+ public required string EncryptedDecryptionKey { get; set; }
+}
diff --git a/shared/models/src/webapi/MobileLogin.ts b/shared/models/src/webapi/MobileLogin.ts
index 3b514d407..a0c0c0b11 100644
--- a/shared/models/src/webapi/MobileLogin.ts
+++ b/shared/models/src/webapi/MobileLogin.ts
@@ -18,7 +18,6 @@ export type MobileLoginInitiateResponse = {
export type MobileLoginSubmitRequest = {
requestId: string;
encryptedDecryptionKey: string;
- username: string;
}
/**