Merge branch 'develop' into main

Author: purejava

README.md

@@ -15,7 +15,7 @@ Add `keepassxc-proxy-access` as a dependency to your project.
 <dependency>
     <groupId>org.purejava</groupId>
     <artifactId>keepassxc-proxy-access</artifactId>
-    <version>0.0.4</version>
+    <version>0.0.5</version>
 </dependency>
 ```
 

keepassxc-proxy-access.svg

@@ -6,7 +6,7 @@
 
     <groupId>org.purejava</groupId>
     <artifactId>keepassxc-proxy-access</artifactId>
-    <version>0.0.4</version>
+    <version>0.0.5</version>
     <packaging>jar</packaging>
 
     <name>keepassxc-proxy-access</name>
@@ -274,4 +274,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>

pom.xml

@@ -451,6 +451,23 @@ public JSONObject getTotp(String uuid) throws IOException, KeepassProxyAccessExc
 
     }
 
+    /**
+     * Request to delete an entry, identified by its uuid.
+     *
+     * @param uuid The uuid of the entry.
+     * @return An object that contains the key "success" with the value "true" in case the request was successful.
+     * @throws IOException                 The request to delete the entry failed due to technical reasons.
+     * @throws KeepassProxyAccessException The entry could not be deleted.
+     */
+    public JSONObject deleteEntry(String uuid) throws IOException, KeepassProxyAccessException {
+        // Send delete-entry request
+        sendEncryptedMessage(Map.of(
+                "action", "delete-entry",
+                "uuid", ensureNotNull(uuid)
+        ));
+        return getEncryptedResponseAndDecrypt("delete-entry");
+    }
+
     /**
      * Get a String representation of the JSON object.
      *

src/main/java/org/keepassxc/Connection.java

@@ -330,7 +330,7 @@ public String generatePassword() {
     /**
      * Request for locking the database from client.
      *
-     * @return True, if the database could not locked, false if something went wrong.
+     * @return True, if the database could be locked, false if something went wrong.
      */
     public boolean lockDatabase() {
         try {
@@ -376,6 +376,22 @@ public String getTotp(String uuid) {
         }
     }
 
+    /**
+     * Request to delete an entry, identified by its uuid.
+     *
+     * @param uuid The uuid of the entry.
+     * @return True, in case the entry could be deleted, false otherwise.
+     */
+    public boolean deleteEntry(String uuid) {
+        try {
+            var response = connection.deleteEntry(uuid);
+            return response.has("success") && response.getString("success").equals("true");
+        } catch (IOException | IllegalStateException | KeepassProxyAccessException | JSONException e) {
+            log.info(e.toString(), e.getCause());
+            return false;
+        }
+    }
+
     /**
      * Extract the groupUuid for the newly created group.
      * Note: in case a group with the following path was created: level1/level2, only level2 gets returned as name.

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

@@ -40,6 +40,8 @@ public void shouldHaveNoErrors() {
         log.info("Please allow to create new group");
         assertEquals(kpa.createNewGroup("Testgroup").get("name"), "Testgroup");
         assertTrue(null != kpa.getTotp("2aafee1a89fd435c8bad7df12bbaaa3e") && !kpa.getTotp("2aafee1a89fd435c8bad7df12bbaaa3e").isEmpty());
+        log.info("Please allow to delete entry");
+        assertTrue(kpa.deleteEntry("2aafee1a89fd435c8bad7df12bbaaa3e"));
         log.info("Please deny to save changes");
         assertTrue(kpa.lockDatabase());
     }