Extract field.

Author: dkocher

hub/src/main/java/ch/iterate/hub/protocols/hub/HubSession.java

@@ -7,9 +7,11 @@
 import ch.cyberduck.core.Credentials;
 import ch.cyberduck.core.Host;
 import ch.cyberduck.core.HostKeyCallback;
+import ch.cyberduck.core.HostPasswordStore;
 import ch.cyberduck.core.ListService;
 import ch.cyberduck.core.LocaleFactory;
 import ch.cyberduck.core.LoginCallback;
+import ch.cyberduck.core.PasswordStoreFactory;
 import ch.cyberduck.core.Profile;
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.exception.ConnectionCanceledException;
@@ -61,14 +63,16 @@ public class HubSession extends HttpSession<HubApiClient> {
      */
     public static final String HUB_UUID = "hub.uuid";
 
+    private final HostPasswordStore keychain = PasswordStoreFactory.get();
+
     /**
      * Read storage configurations from API
      */
     private final Scheduler<?> profiles = new HubStorageProfileSyncSchedulerService(this);
     /**
      * Read available vaults from API
      */
-    private final Scheduler<?> vaults = new HubStorageVaultSyncSchedulerService(this);
+    private final Scheduler<?> vaults = new HubStorageVaultSyncSchedulerService(this, keychain);
     /**
      * Periodically grant vault access to users
      */

hub/src/main/java/ch/iterate/hub/protocols/hub/HubStorageVaultSyncSchedulerService.java

@@ -47,14 +47,24 @@ public class HubStorageVaultSyncSchedulerService extends OneTimeSchedulerFeature
 
     private final HubSession session;
     private final AbstractHostCollection bookmarks;
+    private final HostPasswordStore keychain;
 
     public HubStorageVaultSyncSchedulerService(final HubSession session) {
         this(session, BookmarkCollection.defaultCollection());
     }
 
     public HubStorageVaultSyncSchedulerService(final HubSession session, final AbstractHostCollection bookmarks) {
+        this(session, bookmarks, PasswordStoreFactory.get());
+    }
+
+    public HubStorageVaultSyncSchedulerService(final HubSession session, final HostPasswordStore keychain) {
+        this(session, BookmarkCollection.defaultCollection(), keychain);
+    }
+
+    public HubStorageVaultSyncSchedulerService(final HubSession session, final AbstractHostCollection bookmarks, final HostPasswordStore keychain) {
         this.session = session;
         this.bookmarks = bookmarks;
+        this.keychain = keychain;
     }
 
     @Override
@@ -86,7 +96,6 @@ public List<VaultDto> operate(final PasswordCallback callback) throws Background
                         final Host bookmark = toBookmark(session.getHost(), vaultId, vaultMetadata);
                         if(bookmark.getCredentials().isPasswordAuthentication()) {
                             log.warn("Save static access tokens for {} in keychain", vaultDto);
-                            final HostPasswordStore keychain = PasswordStoreFactory.get();
                             keychain.save(bookmark);
                             bookmark.getCredentials().reset();
                         }