Improve loginExists to see, whether a login with a different or none password exists

Author: purejava

src/main/java/org/purejava/KeepassProxyAccess.java

@@ -246,7 +246,7 @@ public Map<String, Object> getLogins(String url, String submitUrl, boolean httpA
     }
 
     /**
-     * Checks, if a password is stored in the KeePassXC databases. This method calls
+     * Checks, whether a login exists and a given password is stored in the KeePassXC databases. This method calls
      * {@link org.purejava.KeepassProxyAccess#getLogins(String, String, boolean, List) getLogins} to search
      * the KeePassXC databases.
      * @see org.purejava.KeepassProxyAccess#getLogins(String, String, boolean, List)
@@ -256,19 +256,19 @@ public Map<String, Object> getLogins(String url, String submitUrl, boolean httpA
      * @param httpAuth  Include database entries into search that are restricted to HTTP Basic Auth.
      * @param list      Id / key combinations identifying and granting access to KeePassXC databases.
      * @param password  Password to check.
-     * @return True, if the password was found in a KeePassXC database, false otherwise.
+     * @return ValidLogin The object describes whether a valid login exists for the given URL and whether the given password matches too.
      */
-    public boolean loginExists(String url, String submitUrl, boolean httpAuth, List<Map<String, String>> list, String password) {
+    public ValidLogin loginExists(String url, String submitUrl, boolean httpAuth, List<Map<String, String>> list, String password) {
         var response = getLogins(url, submitUrl, httpAuth, list);
         if (response.isEmpty()) {
-            return false;
+            return new ValidLogin(false, null);
         }
         var array = (ArrayList<Object>) response.get("entries");
         for (Object o : array) {
             var credentials = (HashMap<String, Object>) o;
-            if (credentials.get("password").equals(password)) return true;
+            if (credentials.get("password").equals(password)) return new ValidLogin(true, credentials.get("uuid").toString());
         }
-        return false;
+        return new ValidLogin(true, null);
     }
 
     /**

src/main/java/org/purejava/ValidLogin.java

@@ -0,0 +1,31 @@
+package org.purejava;
+
+import java.util.List;
+
+/**
+ * This holds the result of a call to {@link org.purejava.KeepassProxyAccess#loginExists(String, String, boolean, List, String)}
+ * @see org.purejava.KeepassProxyAccess#loginExists(String, String, boolean, List, String)
+ */
+public class ValidLogin {
+    private boolean found;
+    private String uuid;
+
+    /**
+     * Does a valid login exist for the given URL? And does the given password match too?
+     * @param found True, if an entry was found in the KeePassXC database for the given URL.
+     * @param uuid  If found is true, this contains either the uuid, in case the given password matches
+     *              the password already stored in the entry or null in case the given password does not match.
+     */
+    public ValidLogin(boolean found, String uuid) {
+        this.found = found;
+        this.uuid = uuid;
+    }
+
+    public boolean isFound() {
+        return found;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+}