Skip to content

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

Show username or email in passkey creation wizard in Android (#2379)

Leendert de Borstc64b38433425
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/PasskeySelectionFragment.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/PasskeySelectionFragment.kt
index 941a818e2..57518448d 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/PasskeySelectionFragment.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/PasskeySelectionFragment.kt
@@ -63,10 +63,7 @@ class PasskeySelectionFragment : Fragment() {
val subtitleView = itemView.findViewById<TextView>(R.id.passkeySubtitle)
displayNameView.text = itemInfo.serviceName ?: viewModel.rpId
- val subtitle = buildString {
- itemInfo.username?.let { append(it) }
- }
- subtitleView.text = subtitle.ifEmpty { itemInfo.url ?: viewModel.rpId }
+ subtitleView.text = itemInfo.accountLabel ?: itemInfo.url ?: viewModel.rpId
itemView.setOnClickListener {
viewModel.onMergeSelected(itemInfo)
@@ -91,8 +88,8 @@ class PasskeySelectionFragment : Fragment() {
displayNameView.text = passkeyInfo.passkey.displayName
val subtitle = buildString {
- passkeyInfo.username?.let { append(it) }
- if (passkeyInfo.username != null && passkeyInfo.serviceName != null) {
+ passkeyInfo.accountLabel?.let { append(it) }
+ if (passkeyInfo.accountLabel != null && passkeyInfo.serviceName != null) {
append(" • ")
}
passkeyInfo.serviceName?.let { append(it) }
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/queries/PasskeyQueries.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/queries/PasskeyQueries.kt
index 322d5b064..1e44415c3 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/queries/PasskeyQueries.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/queries/PasskeyQueries.kt
@@ -67,12 +67,16 @@ object PasskeyQueries {
SELECT p.Id, p.ItemId, p.RpId, p.UserHandle, p.PublicKey, p.PrivateKey, p.PrfKey,
p.DisplayName, p.CreatedAt, p.UpdatedAt, p.IsDeleted,
i.Name,
- fv_username.Value as Username
+ fv_username.Value as Username,
+ fv_email.Value as Email
FROM Passkeys p
INNER JOIN Items i ON p.ItemId = i.Id
LEFT JOIN FieldValues fv_username ON fv_username.ItemId = i.Id
AND fv_username.FieldKey = ?
AND fv_username.IsDeleted = 0
+ LEFT JOIN FieldValues fv_email ON fv_email.ItemId = i.Id
+ AND fv_email.FieldKey = ?
+ AND fv_email.IsDeleted = 0
WHERE p.RpId = ? AND p.IsDeleted = 0 AND i.IsDeleted = 0 AND i.DeletedAt IS NULL
ORDER BY p.CreatedAt DESC
""".trimIndent()
@@ -85,6 +89,7 @@ object PasskeyQueries {
SELECT i.Id, i.Name, i.CreatedAt, i.UpdatedAt,
GROUP_CONCAT(DISTINCT fv_url.Value) as Urls,
fv_username.Value as Username,
+ fv_email.Value as Email,
fv_password.Value as Password
FROM Items i
LEFT JOIN FieldValues fv_url ON fv_url.ItemId = i.Id
@@ -93,6 +98,9 @@ object PasskeyQueries {
LEFT JOIN FieldValues fv_username ON fv_username.ItemId = i.Id
AND fv_username.FieldKey = ?
AND fv_username.IsDeleted = 0
+ LEFT JOIN FieldValues fv_email ON fv_email.ItemId = i.Id
+ AND fv_email.FieldKey = ?
+ AND fv_email.IsDeleted = 0
LEFT JOIN FieldValues fv_password ON fv_password.ItemId = i.Id
AND fv_password.FieldKey = ?
AND fv_password.IsDeleted = 0
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/repositories/PasskeyRepository.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/repositories/PasskeyRepository.kt
index 8ecf97361..ab94f3e09 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/repositories/PasskeyRepository.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/repositories/PasskeyRepository.kt
@@ -358,13 +358,17 @@ class PasskeyRepository(database: VaultDatabase) : BaseRepository(database) {
val db = database.dbConnection ?: return emptyList()
val results = mutableListOf<PasskeyWithCredentialInfo>()
- val cursor = db.query(PasskeyQueries.GET_WITH_CREDENTIAL_INFO, arrayOf(FieldKey.LOGIN_USERNAME, rpId))
+ val cursor = db.query(
+ PasskeyQueries.GET_WITH_CREDENTIAL_INFO,
+ arrayOf(FieldKey.LOGIN_USERNAME, FieldKey.LOGIN_EMAIL, rpId),
+ )
cursor.use {
while (it.moveToNext()) {
val passkey = parsePasskeyFromCursor(it) ?: continue
val itemName = if (!it.isNull(11)) it.getString(11) else null
val itemUsername = if (!it.isNull(12)) it.getString(12) else null
+ val itemEmail = if (!it.isNull(13)) it.getString(13) else null
// Filter by username or userId if provided
var matches = true
@@ -381,6 +385,7 @@ class PasskeyRepository(database: VaultDatabase) : BaseRepository(database) {
passkey = passkey,
serviceName = itemName,
username = itemUsername,
+ email = itemEmail,
),
)
}
@@ -402,7 +407,7 @@ class PasskeyRepository(database: VaultDatabase) : BaseRepository(database) {
val results = mutableListOf<ItemWithCredentialInfo>()
val cursor = db.query(
PasskeyQueries.GET_ALL_ITEMS_WITHOUT_PASSKEY,
- arrayOf(FieldKey.LOGIN_URL, FieldKey.LOGIN_USERNAME, FieldKey.LOGIN_PASSWORD),
+ arrayOf(FieldKey.LOGIN_URL, FieldKey.LOGIN_USERNAME, FieldKey.LOGIN_EMAIL, FieldKey.LOGIN_PASSWORD),
)
cursor.use {
@@ -413,7 +418,8 @@ class PasskeyRepository(database: VaultDatabase) : BaseRepository(database) {
val itemUpdatedAt = if (!it.isNull(3)) it.getString(3) else null
val urlsString = if (!it.isNull(4)) it.getString(4) else null
val itemUsername = if (!it.isNull(5)) it.getString(5) else null
- val hasPassword = !it.isNull(6) && it.getString(6).isNotEmpty()
+ val itemEmail = if (!it.isNull(6)) it.getString(6) else null
+ val hasPassword = !it.isNull(7) && it.getString(7).isNotEmpty()
try {
val itemId = UUID.fromString(itemIdString)
@@ -428,6 +434,7 @@ class PasskeyRepository(database: VaultDatabase) : BaseRepository(database) {
url = urls.firstOrNull(),
urls = urls,
username = itemUsername,
+ email = itemEmail,
hasPassword = hasPassword,
createdAt = createdAt,
updatedAt = updatedAt,
@@ -713,12 +720,18 @@ class PasskeyRepository(database: VaultDatabase) : BaseRepository(database) {
* @property passkey The passkey.
* @property serviceName The service name from the item.
* @property username The username from the item.
+ * @property email The email from the item, used as display fallback when there is no username.
*/
data class PasskeyWithCredentialInfo(
val passkey: Passkey,
val serviceName: String?,
val username: String?,
-)
+ val email: String? = null,
+) {
+ /** The account identifier to display: the username, or the email when no username is set. */
+ val accountLabel: String?
+ get() = username?.takeIf { it.isNotBlank() } ?: email?.takeIf { it.isNotBlank() }
+}
/**
* Data class to hold passkey with its associated item.
@@ -740,6 +753,7 @@ data class PasskeyWithItem(
* @property url The login URL (first URL for backwards compatibility).
* @property urls All login URLs associated with this item.
* @property username The username from field values.
+ * @property email The email from field values, used as display fallback when there is no username.
* @property hasPassword Whether the item has a password.
* @property createdAt When the item was created.
* @property updatedAt When the item was last updated.
@@ -750,7 +764,12 @@ data class ItemWithCredentialInfo(
val url: String?,
val urls: List<String> = url?.let { listOf(it) } ?: emptyList(),
val username: String?,
+ val email: String? = null,
val hasPassword: Boolean,
val createdAt: Date,
val updatedAt: Date,
-)
+) {
+ /** The account identifier to display: the username, or the email when no username is set. */
+ val accountLabel: String?
+ get() = username?.takeIf { it.isNotBlank() } ?: email?.takeIf { it.isNotBlank() }
+}
diff --git a/apps/mobile-app/ios/Autofill/CredentialProviderViewController+Passkey.swift b/apps/mobile-app/ios/Autofill/CredentialProviderViewController+Passkey.swift
index 8c8fb660f..d46940653 100644
--- a/apps/mobile-app/ios/Autofill/CredentialProviderViewController+Passkey.swift
+++ b/apps/mobile-app/ios/Autofill/CredentialProviderViewController+Passkey.swift
@@ -269,6 +269,7 @@ extension CredentialProviderViewController: PasskeyProviderDelegate {
displayName: result.passkey.displayName,
serviceName: result.serviceName,
username: result.username,
+ email: result.email,
rpId: result.passkey.rpId,
userId: result.passkey.userHandle
)
@@ -290,6 +291,7 @@ extension CredentialProviderViewController: PasskeyProviderDelegate {
serviceName: item.serviceName,
url: item.url,
username: item.username,
+ email: item.email,
hasPassword: item.hasPassword,
createdAt: item.createdAt,
updatedAt: item.updatedAt