Merge branch 'develop' into main

purejava · Oct 10, 2021 · 418c777 · 418c777
2 parents 740e5a0 + 98aa350
commit 418c777
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -49,11 +49,11 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- runtime dependencies -->
-    <api.version>1.0.0-rc1</api.version>
-    <keepassxc-proxy.version>0.0.5</keepassxc-proxy.version>
-    <guava.version>30.0-jre</guava.version>
-    <slf4j.version>1.7.30</slf4j.version>
-    <junit.version>5.7.0</junit.version>
+    <api.version>1.0.0</api.version>
+    <keepassxc-proxy.version>0.0.6</keepassxc-proxy.version>
+    <guava.version>31.0.1-jre</guava.version>
+    <slf4j.version>1.7.32</slf4j.version>
+    <junit.version>5.8.1</junit.version>
   </properties>
 
   <dependencies>

diff --git a/src/main/java/org/purejava/integrations/keychain/KeePassXCAccess.java b/src/main/java/org/purejava/integrations/keychain/KeePassXCAccess.java
@@ -63,10 +63,11 @@ public void storePassphrase(String vault, CharSequence password) throws Keychain
 		ensureAssociation();
 		var urlVault = URL_SCHEME + vault;
 		var group = proxy.createNewGroup(APP_NAME); // Store passphrase in group APP_NAME
-		if (proxy.loginExists(urlVault, null, false, List.of(proxy.exportConnection()), password.toString())) {
+		var login = proxy.loginExists(urlVault, null, false, List.of(proxy.exportConnection()), password.toString());
+		if (login.isFound() && null != login.getUuid() && !login.getUuid().isBlank()) {
 			return;
 		}
-		if (!proxy.setLogin(urlVault, null, null, "Vault", password.toString(), APP_NAME, group.get("uuid"), null)) {
+		if (!proxy.setLogin(urlVault, null, null, "Vault", password.toString(), APP_NAME, group.get("uuid"), login.getUuid())) {
 			throw new KeychainAccessException("Storing of the password failed");
 		} else {
 			LOG.info("Password successfully stored for vault " + urlVault.substring(URL_SCHEME.length()));