Remove duplicate code for matching URLs using old LoginSearchType param

kee-org · Jun 3, 2020 · 976a0bb · 976a0bb
1 parent 58a71b8
commit 976a0bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/KeePassRPC/DataExchangeModel.cs b/KeePassRPC/DataExchangeModel.cs
@@ -77,7 +77,9 @@ public Configuration(string[] MRUList, bool autoCommit)
         }
     }
 
+    // This is no longer used but remains in the DTO spec for backwards compatibility
     public enum LoginSearchType { LSTall, LSTnoForms, LSTnoRealms }
+
     public enum FormFieldType { FFTradio, FFTusername, FFTtext, FFTpassword, FFTselect, FFTcheckbox } // ..., HTML 5, etc.
     // FFTusername is special type because bultin FF supports with only username and password
 

diff --git a/KeePassRPC/KeePassRPCService.cs b/KeePassRPC/KeePassRPCService.cs
@@ -1927,9 +1927,7 @@ public Entry[] FindLogins(string[] unsanitisedURLs, string actionURL,
                                     }
                                 }
 
-                        // Check for matching URLs for the page containing the form
-                        if (!entryIsAMatch && lst != LoginSearchType.LSTnoForms
-                                && (string.IsNullOrEmpty(username) || username == entryUserName))
+                        if (!entryIsAMatch && (string.IsNullOrEmpty(username) || username == entryUserName))
                         {
                             foreach (string URL in URLs)
                             {
@@ -1941,20 +1939,6 @@ public Entry[] FindLogins(string[] unsanitisedURLs, string actionURL,
                             }
                         }
 
-                        // Check for matching URLs for the HTTP Auth containing the form
-                        if (!entryIsAMatch && lst != LoginSearchType.LSTnoRealms
-                                && (string.IsNullOrEmpty(username) || username == entryUserName))
-
-                        {
-                            foreach (string URL in URLs)
-                            {
-                                var mam = pwe.GetMatchAccuracyMethod(URLHostnameAndPorts[URL], dbConf);
-                                int accuracy = BestMatchAccuracyForAnyURL(pwe, conf, URL, URLHostnameAndPorts[URL], mam);
-                                if (accuracy > bestMatchAccuracy)
-                                    bestMatchAccuracy = accuracy;
-                            }
-                        }
-
                         if (bestMatchAccuracy == MatchAccuracy.Best
                             || (!requireFullURLMatches && bestMatchAccuracy > MatchAccuracy.None))
                             entryIsAMatch = true;