Review.

Author: ylangisc

core/pom.xml

@@ -23,6 +23,10 @@
     <artifactId>core</artifactId>
     <packaging>jar</packaging>
 
+    <properties>
+        <nimbus-jose.version>10.5</nimbus-jose.version>
+    </properties>
+
     <build>
         <plugins>
             <plugin>
@@ -144,6 +148,11 @@
             <artifactId>auto-service-annotations</artifactId>
             <version>1.1.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.nimbusds</groupId>
+            <artifactId>nimbus-jose-jwt</artifactId>
+            <version>${nimbus-jose.version}</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/uvf/JWKCallback.java renamed to core/src/main/java/ch/cyberduck/core/vault/JWKCallback.java

@@ -1,4 +1,4 @@
-package ch.cyberduck.core.cryptomator.impl.uvf;
+package ch.cyberduck.core.vault;
 
 /*
  * Copyright (c) 2002-2025 iterate GmbH. All rights reserved.
@@ -20,17 +20,10 @@
 import ch.cyberduck.core.PasswordCallback;
 import ch.cyberduck.core.exception.LoginCanceledException;
 
-public class JWKCallback implements PasswordCallback {
+public interface JWKCallback extends PasswordCallback {
 
     @Override
-    public void close(final String input) {
-
-    }
-
-    @Override
-    public JWKCredentials prompt(final Host bookmark, final String title, final String reason, final LoginOptions options) throws LoginCanceledException {
-        return null;
-    }
+    JWKCredentials prompt(Host bookmark, String title, String reason, LoginOptions options) throws LoginCanceledException;
 
     static JWKCallback cast(PasswordCallback callback) {
         if(callback instanceof JWKCallback) {

cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/uvf/JWKCredentials.java renamed to core/src/main/java/ch/cyberduck/core/vault/JWKCredentials.java

@@ -1,4 +1,4 @@
-package ch.cyberduck.core.cryptomator.impl.uvf;
+package ch.cyberduck.core.vault;
 
 /*
  * Copyright (c) 2002-2025 iterate GmbH. All rights reserved.
@@ -15,20 +15,18 @@
  * GNU General Public License for more details.
  */
 
-import ch.cyberduck.core.vault.VaultCredentials;
-
 import com.nimbusds.jose.jwk.JWK;
 
 public class JWKCredentials extends VaultCredentials {
 
-    private final JWK keyset;
+    private final JWK key;
 
-    public JWKCredentials(final JWK keyset) {
+    public JWKCredentials(final JWK key) {
         super(null);
-        this.keyset = keyset;
+        this.key = key;
     }
 
-    public JWK getKeyset() {
-        return keyset;
+    public JWK getKey() {
+        return key;
     }
 }

core/src/main/java/ch/cyberduck/core/vault/VaultMetadataProvider.java

@@ -16,8 +16,5 @@
  */
 
 public interface VaultMetadataProvider {
-
-    //Map<Path, byte[]> metadataFiles() throws BackgroundException;
-
-    //String dirPath();
+    // Marker interface
 }

cryptomator/pom.xml

@@ -26,7 +26,6 @@
 
     <properties>
         <cryptolib.version>2.3.0.uvfdraft-SNAPSHOT</cryptolib.version>
-        <nimbus-jose.version>10.5</nimbus-jose.version>
     </properties>
 
     <dependencies>
@@ -47,11 +46,6 @@
             <artifactId>cryptolib</artifactId>
             <version>${cryptolib.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.nimbusds</groupId>
-            <artifactId>nimbus-jose-jwt</artifactId>
-            <version>${nimbus-jose.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>

cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/uvf/CryptoVault.java

@@ -37,6 +37,7 @@
 import ch.cyberduck.core.features.Write;
 import ch.cyberduck.core.preferences.PreferencesFactory;
 import ch.cyberduck.core.transfer.TransferStatus;
+import ch.cyberduck.core.vault.JWKCallback;
 import ch.cyberduck.core.vault.VaultException;
 import ch.cyberduck.core.vault.VaultMetadata;
 import ch.cyberduck.core.vault.VaultMetadataProvider;
@@ -134,7 +135,7 @@ public CryptoVault load(final Session<?> session, final PasswordCallback callbac
         final JWEObjectJSON jweObject;
         try {
             jweObject = JWEObjectJSON.parse(new String(metadataProvider.getMetadata(), StandardCharsets.US_ASCII));
-            jweObject.decrypt(new MultiDecrypter(jwk.prompt(session.getHost(), StringUtils.EMPTY, StringUtils.EMPTY, new LoginOptions()).getKeyset()));
+            jweObject.decrypt(new MultiDecrypter(jwk.prompt(session.getHost(), StringUtils.EMPTY, StringUtils.EMPTY, new LoginOptions()).getKey()));
         }
         catch(ParseException | JOSEException e) {
             throw new VaultException("Failure retrieving key material", e);