don't store pseudo-urls for passkey entries. Search RelyingParty field instead of URL.

Author: PhilippC

src/Kp2aBusinessLogic/SearchDbHelper.cs

@@ -119,6 +119,28 @@ private static String ExtractHost(String url)
       return UrlUtil.GetHost(url.Trim());
     }
 
+    /// <summary>
+    /// Returns all entries whose <c>KPEX_PASSKEY_RELYING_PARTY</c> extra field exactly matches
+    /// <paramref name="relyingParty"/> (case-insensitive).
+    /// </summary>
+    public PwGroup SearchForRelyingParty(Database database, string relyingParty)
+    {
+      string strGroupName = _app.GetResourceString(UiStringKey.search_results);
+      PwGroup pgResults = new PwGroup(true, true, strGroupName, PwIcon.EMailSearch) { IsVirtual = true };
+
+      foreach (PwEntry entry in database.EntriesById.Values)
+      {
+        if (!entry.GetSearchingEnabled())
+          continue;
+        var storedRp = entry.Strings.ReadSafe("KPEX_PASSKEY_RELYING_PARTY");
+        // Log every entry that has the field so mismatches are visible in logcat
+        if (string.Equals(storedRp, relyingParty, StringComparison.OrdinalIgnoreCase))
+          pgResults.AddEntry(entry, false);
+      }
+
+      return pgResults;
+    }
+
     public PwGroup SearchForHost(Database database, String url, bool allowSubdomains)
     {
       String host = ExtractHost(url);

src/Kp2aBusinessLogic/database/Database.cs

@@ -224,6 +224,15 @@ public PwGroup SearchForHost(String url, bool allowSubdomains)
 
     }
 
+    /// <summary>
+    /// Returns all entries whose <c>KPEX_PASSKEY_RELYING_PARTY</c> extra field
+    /// exactly matches <paramref name="relyingParty"/> (case-insensitive).
+    /// </summary>
+    public PwGroup SearchForRelyingParty(string relyingParty)
+    {
+      return SearchHelper.SearchForRelyingParty(this, relyingParty);
+    }
+
 
     public void SaveData(IFileStorage fileStorage)
     {

src/Kp2aPasskey.Core/PasskeyStorage.cs

@@ -56,7 +56,7 @@ public static JSONObject CreatePasskeyFieldsJson(string relyingParty, string use
       var passkeyFieldsJson = new JSONObject();
       passkeyFieldsJson.Put(PwDefs.TitleField, $"Passkey for {relyingParty}");
       passkeyFieldsJson.Put(PwDefs.UserNameField, username);
-      passkeyFieldsJson.Put(PwDefs.UrlField, $"passkey:{relyingParty}");
+      passkeyFieldsJson.Put(PwDefs.UrlField, relyingParty);
 
       // Add passkey extra fields
       passkeyFieldsJson.Put(PasskeyStorage.FIELD_USERNAME, passkey.Username);

src/keepass2android-app/services/Kp2aCredentialProvider/GetCredentialHelper.cs

@@ -111,9 +111,16 @@ public static void AddMatchingPasskeyEntries(
         var relyingPartyId = requestOptions.RpId;
         var allowCredentials = requestOptions.AllowCredentials;
 
-        var query = $"passkey:{relyingPartyId}";
-        var searchResults = ShareUrlResults.GetSearchResultsForUrl(query);
-        var foundEntries = searchResults?.Entries.ToList() ?? new List<PwEntry>();
+        // Search directly by the KPEX_PASSKEY_RELYING_PARTY extra field — no pseudo-URL needed.
+        var foundEntries = new List<PwEntry>();
+        foreach (var db in App.Kp2a.OpenDatabases)
+        {
+          var results = db.SearchForRelyingParty(relyingPartyId);
+          if (results?.Entries != null)
+          {
+            foundEntries.AddRange(results.Entries);
+          }
+        }
 
         // Filter by allowCredentials if specified
         if (allowCredentials.Count > 0)
@@ -213,10 +220,13 @@ List<PublicKeyCredentialDescriptor> allowCredentials
       foreach (var entry in entries)
       {
         var passkey = Kp2aPasskey.Core.PasskeyStorage.RetrievePasskey(entry);
-        if (passkey != null && allowedCredentialIds.Contains(passkey.CredentialId))
+        if (passkey == null)
         {
-          filtered.Add(entry);
+          continue;
         }
+        bool match = allowedCredentialIds.Contains(passkey.CredentialId);
+        if (match)
+          filtered.Add(entry);
       }
 
       return filtered;