mirror/aliasvault
1
0
Fork 0
mirror of https://github.com/aliasvault/aliasvault.git synced 2026-05-11 08:48:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor (#1347)

Browse Source
This commit is contained in:
Leendert de Borst
2025-11-19 12:02:46 +01:00
parent 07b6097d31
commit 76b829eb3d
5 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultStore.kt
View File

@@ -624,24 +624,16 @@ class VaultStore(
/**
* Authenticate the user using biometric authentication only.
* Note: This method only handles biometric authentication. If PIN is enabled,
* this will return false and the caller should use showPinUnlock instead.
* Note: This method only handles biometric authentication.
* Returns true if authentication succeeded, false otherwise.
*
* @param title The title for authentication. Optional, defaults to "Unlock Vault".
* @param subtitle The subtitle for authentication. Optional, defaults to title or "Unlock Vault".
* @return True if biometric authentication succeeded, false if PIN is enabled or authentication failed.
* @return True if biometric authentication succeeded, false if authentication failed.
*/
suspend fun authenticateUser(title: String?, subtitle: String?): Boolean {
suspend fun issueBiometricAuthentication(title: String?): Boolean {
// Use title if provided, otherwise default
val authReason = title?.takeIf { it.isNotEmpty() } ?: "Unlock Vault"
// Check if PIN is enabled - if so, return false (caller should use PIN UI)
if (isPinEnabled()) {
Log.d("VaultStore", "PIN authentication is enabled, returning false")
return false
}
// Check if biometric authentication is enabled
val authMethods = auth.getAuthMethods()
val isBiometricEnabled = authMethods.contains("faceid")

2
apps/mobile-app/ios/NativeVaultManager/VaultManager.swift
View File

@@ -975,7 +975,7 @@ public class VaultManager: NSObject {
}
} else {
// Use biometric authentication
let authenticated = vaultStore.authenticateUser(title: title, subtitle: subtitle)
let authenticated = vaultStore.issueBiometricAuthentication(title: title)
resolve(authenticated)
}
}

12
apps/mobile-app/ios/VaultStoreKit/VaultStore+Auth.swift
View File

@@ -43,21 +43,13 @@ extension VaultStore {
}
/// Authenticate the user using biometric authentication only
/// Note: This method only handles biometric authentication. If PIN is enabled,
/// this will return false and the caller should use showPinUnlock instead.
/// Note: This method only handles biometric authentication.
/// Returns true if authentication succeeded, false otherwise
/// - Parameter title: The title for authentication. Optional, defaults to "Unlock Vault" context.
/// - Parameter subtitle: The subtitle for authentication. Optional, defaults to title or "Unlock Vault" context.
public func authenticateUser(title: String?, subtitle: String?) -> Bool {
public func issueBiometricAuthentication(title: String?) -> Bool {
// Use title if provided, otherwise default
let authReason = (title?.isEmpty == false) ? title! : "Unlock Vault"
// Check if PIN is enabled - if so, return false (caller should use PIN UI)
if isPinEnabled() {
print("PIN authentication is enabled, returning false")
return false
}
// Check if biometric authentication is enabled
guard self.enabledAuthMethods.contains(.faceID) else {
print("No authentication method enabled")

2
apps/server/Tests/AliasVault.E2ETests/Tests/Admin/PasswordLockoutTests.cs
View File

@@ -32,7 +32,7 @@ public class PasswordLockoutTests : AdminPlaywrightTest
{
await Page.Locator("input[id='username']").FillAsync(TestUserUsername);
await Page.Locator("input[id='password']").FillAsync("wrongpassword");
var submitButton = Page.Locator("#login-button");
var submitButton = Page.GetByRole(AriaRole.Button, new() { Name = "Login" });
await submitButton.ClickAsync();
// Wait for the text "Error: Invalid login attempt." to appear if we expect not to be locked out yet..

2
apps/server/Tests/AliasVault.E2ETests/Tests/Admin/TwoFactorAuthLockoutTests.cs
View File

@@ -62,7 +62,7 @@ public class TwoFactorAuthLockoutTests : AdminPlaywrightTest
{ "password", TestUserPassword },
});
submitButton = Page.Locator("#login-button");
submitButton = Page.GetByRole(AriaRole.Button, new() { Name = "Login" });
await submitButton.ClickAsync();
// Wait for 2FA page.