Skip to content

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

Update passkey query lookup ordering (#2159)

Leendert de Borstab1ec0c33d2b
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 d95b02a76..da2691be2 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
@@ -36,10 +36,12 @@ object PasskeyQueries {
/**
* Get a passkey by its ID (which is also the WebAuthn credential ID), only while its item is live.
+ * Searches every manifest deterministically.
*/
const val GET_BY_ID = """
$BASE_SELECT_WITH_ITEM
WHERE p.Id = ? AND p.IsDeleted = 0 AND i.IsDeleted = 0 AND i.DeletedAt IS NULL
+ ORDER BY p.CreatedAt DESC, p.ManifestId
LIMIT 1
"""
@@ -58,7 +60,7 @@ object PasskeyQueries {
const val GET_BY_RP_ID = """
$BASE_SELECT_WITH_ITEM
WHERE p.RpId = ? AND p.IsDeleted = 0 AND i.IsDeleted = 0 AND i.DeletedAt IS NULL
- ORDER BY p.CreatedAt DESC
+ ORDER BY p.CreatedAt DESC, p.ManifestId
"""
/**
@@ -67,7 +69,7 @@ object PasskeyQueries {
const val GET_ALL_WITH_ITEMS = """
$BASE_SELECT_WITH_ITEM
WHERE p.IsDeleted = 0 AND i.IsDeleted = 0 AND i.DeletedAt IS NULL
- ORDER BY p.CreatedAt DESC
+ ORDER BY p.CreatedAt DESC, p.ManifestId
"""
/**
diff --git a/apps/mobile-app/ios/VaultStoreKit/Database/Queries/PasskeyQueries.swift b/apps/mobile-app/ios/VaultStoreKit/Database/Queries/PasskeyQueries.swift
index e719e41ff..16de67caf 100644
--- a/apps/mobile-app/ios/VaultStoreKit/Database/Queries/PasskeyQueries.swift
+++ b/apps/mobile-app/ios/VaultStoreKit/Database/Queries/PasskeyQueries.swift
@@ -34,10 +34,12 @@ public struct PasskeyQueries {
INNER JOIN Items i ON p.ItemId = i.Id AND i.ManifestId = p.ManifestId AND i.IsDeleted = 0 AND i.DeletedAt IS NULL
"""
- /// Get a passkey by its ID (credential ID).
+ /// Get a passkey by its ID (credential ID) across every manifest deterministically.
public static let getById = """
\(baseSelectWithItemCheck)
WHERE p.Id = ? AND p.IsDeleted = 0
+ ORDER BY p.CreatedAt DESC, p.ManifestId
+ LIMIT 1
"""
/// Get one passkey inside one manifest, bound as [passkeyId, manifestId].
@@ -57,7 +59,7 @@ public struct PasskeyQueries {
public static let getByRpId = """
\(baseSelectWithItemCheck)
WHERE p.RpId = ? AND p.IsDeleted = 0
- ORDER BY p.CreatedAt DESC
+ ORDER BY p.CreatedAt DESC, p.ManifestId
"""
/// Get passkeys with item info for a specific rpId.
@@ -70,7 +72,7 @@ public struct PasskeyQueries {
FROM Passkeys p
INNER JOIN Items i ON p.ItemId = i.Id AND i.ManifestId = p.ManifestId
WHERE p.RpId = ? AND p.IsDeleted = 0 AND i.IsDeleted = 0 AND i.DeletedAt IS NULL
- ORDER BY p.CreatedAt DESC
+ ORDER BY p.CreatedAt DESC, p.ManifestId
"""
/// Insert a new passkey, stamped with the manifest of the item it hangs off (bound third, after the item id).
diff --git a/core/client/src/database/queries/PasskeyQueries.ts b/core/client/src/database/queries/PasskeyQueries.ts
index bcd4e6ca9..9ad9e8214 100644
--- a/core/client/src/database/queries/PasskeyQueries.ts
+++ b/core/client/src/database/queries/PasskeyQueries.ts
@@ -30,7 +30,7 @@ export class PasskeyQueries {
INNER JOIN Items i ON p.ItemId = i.Id AND i.ManifestId = p.ManifestId
WHERE p.RpId = ? AND p.IsDeleted = 0
AND i.IsDeleted = 0 AND i.DeletedAt IS NULL
- ORDER BY p.CreatedAt DESC`;
+ ORDER BY p.CreatedAt DESC, p.ManifestId`;
/**
* Get passkey by ID with item information.