Prepare correct input for publicKey

Author: purejava

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

@@ -655,7 +655,7 @@ public JSONObject requestAutotype(String url) throws IOException, KeepassProxyAc
 
     }
 
-    public JSONObject passkeysRegister(String publicKey, String origin, List<Map<String, String>> list) throws IOException, KeepassProxyAccessException {
+    public JSONObject passkeysRegister(JSONObject publicKey, String origin, List<Map<String, String>> list) throws IOException, KeepassProxyAccessException {
         var array = new JSONArray();
         // Syntax check for list
         for (Map<String, String> m : list) {
@@ -669,7 +669,7 @@ public JSONObject passkeysRegister(String publicKey, String origin, List<Map<Str
         // Send passkeys-register request
         var nonce = sendEncryptedMessage(Map.of(
                 "action", "passkeys-register",
-                "publicKey", ensureNotNull(publicKey),
+                "publicKey", publicKey,
                 "origin", ensureNotNull(origin),
                 "keys", array
         ));

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

@@ -424,12 +424,12 @@ public boolean requestAutotype(String url) {
         }
     }
 
-    public String passkeysRegister(String publicKey, String origin, List<Map<String, String>> list) {
+    public String passkeysRegister(JSONObject publicKey, String origin, List<Map<String, String>> list) {
         try {
             var response = connection.passkeysRegister(publicKey, origin, list);
             if (response.has("response") && response.has("success") && response.getString("success").equals("true")) {
                 try {
-                    var errorCode = response.getJSONObject("response").getString("errorCode");
+                    var errorCode = response.getJSONObject("response").getInt("errorCode");
                     throw new KeepassProxyAccessException("ErrorCode: " + errorCode);
 
                 } catch (JSONException e) {

src/test/java/org/purejava/UnlockedDatabaseTest.java

@@ -1,5 +1,6 @@
 package org.purejava;
 
+import org.json.JSONObject;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
@@ -50,7 +51,9 @@ public void shouldHaveNoErrors() throws InterruptedException {
         assertTrue(kpa.requestAutotype("https://github.com"));
         LOG.info("Please allow to delete entry");
         assertTrue(kpa.deleteEntry("2aafee1a89fd435c8bad7df12bbaaa3e"));
-        LOG.info(kpa.passkeysRegister("publicKey", "https://www.passkeys.io", l));
+        String publicKey = "{\"attestation\":\"direct\",\"authenticatorSelection\":{\"requireResidentKey\":true,\"residentKey\":\"required\",\"userVerification\":\"preferred\"},\"challenge\":\"AICQS3rj6P-dIDb5if3OCte-Y7CEs_BEnpTgoasQRXg\",\"excludeCredentials\":[],\"extensions\":{\"credProps\":true},\"pubKeyCredParams\":[{\"alg\":-7,\"type\":\"public-key\"},{\"alg\":-257,\"type\":\"public-key\"}],\"rp\":{\"id\":\"passkey.org\",\"name\":\"Yubico Demo\"},\"timeout\":90000,\"user\":{\"displayName\":\"purejava\",\"id\":\"DEMO__9fX19ERU1P\",\"name\":\"purejava\"}}";
+        JSONObject p = new JSONObject(publicKey);
+        LOG.info(kpa.passkeysRegister(p, "https://passkey.org", l));
         LOG.info("Please deny to save changes");
         assertTrue(kpa.lockDatabase());
         assertTrue(kpa.shutdown());