Use existing methods in integrations-api for association

Author: purejava

pom.xml

@@ -49,7 +49,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- runtime dependencies -->
-    <api.version>0.2.1-SNAPSHOT</api.version>
+    <api.version>1.0.0-beta3</api.version>
     <keepassxc-proxy.version>0.0.3</keepassxc-proxy.version>
     <guava.version>30.0-jre</guava.version>
     <slf4j.version>1.7.30</slf4j.version>

src/main/java/org/purejava/integrations/keychain/KeePassXCAccess.java

@@ -28,9 +28,13 @@ public KeePassXCAccess() {
 	@Override
 	public boolean isLocked() { return proxy.getDatabasehash().isEmpty(); }
 
-	private boolean needsAssociation() { return !proxy.connectionAvailable(); }
-
-	private boolean associate() { return proxy.associate(); }
+	private void ensureAssociation() throws KeychainAccessException {
+		if (!proxy.connectionAvailable()) { // Proxy needs association
+			if (!proxy.associate()) {
+				throw new KeychainAccessException("Association with KeePassXC database failed");
+			}
+		}
+	}
 
 	public String unlock() { return proxy.getDatabasehash(true); }
 
@@ -40,6 +44,7 @@ public void storePassphrase(String vault, CharSequence password) throws Keychain
 		if (isLocked()) {
 			throw new KeychainAccessException("Failed to store password. KeePassXC database is locked. Needs to be unlocked first");
 		}
+		ensureAssociation();
 		if (!proxy.loginExists(vault, null, false, List.of(proxy.exportConnection()), password.toString())
 		&& !proxy.setLogin(vault, null, null, "Vault", password.toString(), "default", "default", "default")) {
 			throw new KeychainAccessException("Storing of the password failed");
@@ -51,6 +56,7 @@ public char[] loadPassphrase(String vault) throws KeychainAccessException {
 		if (isLocked()) {
 			throw new KeychainAccessException("Failed to load password. KeePassXC database is locked. Needs to be unlocked first");
 		}
+		ensureAssociation();
 		vault = URL_SCHEME + vault;
 		var answer = proxy.getLogins(vault, null, false, List.of(proxy.exportConnection()));
 		if (answer.isEmpty() || null == answer.get("entries")) {