Lookup device setup prompt from login feature.

Author: dkocher

hub/src/main/java/cloud/katta/core/DeviceSetupCallbackFactory.java

@@ -45,7 +45,6 @@
 import cloud.katta.client.model.ConfigDto;
 import cloud.katta.client.model.UserDto;
 import cloud.katta.core.DeviceSetupCallback;
-import cloud.katta.core.DeviceSetupCallbackFactory;
 import cloud.katta.crypto.UserKeys;
 import cloud.katta.protocols.hub.exceptions.HubExceptionMappingService;
 import cloud.katta.protocols.hub.serializer.HubConfigDtoDeserializer;
@@ -143,7 +142,8 @@ protected HubApiClient connect(final ProxyFinder proxy, final HostKeyCallback ke
 
     @Override
     public void login(final LoginCallback prompt, final CancelCallback cancel) throws BackgroundException {
-        final DeviceSetupCallback setup = DeviceSetupCallbackFactory.get();
+        final DeviceSetupCallback setup = prompt.getFeature(DeviceSetupCallback.class);
+        log.debug("Configured with setup prompt {}", setup);
         final Credentials credentials = authorizationService.validate();
         try {
             // Set username from OAuth ID Token for saving in keychain

hub/src/main/java/cloud/katta/protocols/hub/HubSession.java

@@ -14,7 +14,6 @@
 import ch.cyberduck.core.vault.VaultRegistryFactory;
 import ch.cyberduck.test.VaultTest;
 
-import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Named;
 import org.junit.jupiter.params.provider.Arguments;
@@ -28,7 +27,6 @@
 import java.util.function.Function;
 
 import cloud.katta.core.DeviceSetupCallback;
-import cloud.katta.core.util.MockableDeviceSetupCallback;
 import cloud.katta.model.AccountKeyAndDeviceName;
 import cloud.katta.protocols.hub.HubProtocol;
 import cloud.katta.protocols.hub.HubSession;
@@ -152,7 +150,6 @@ protected void configureLogging(final String level) {
         preferences.setProperty("factory.vault.class", HubUVFVault.class.getName());
         preferences.setProperty("factory.supportdirectoryfinder.class", ch.cyberduck.core.preferences.TemporarySupportDirectoryFinder.class.getName());
         preferences.setProperty("factory.passwordstore.class", UnsecureHostPasswordStore.class.getName());
-        preferences.setProperty("factory.devicesetupcallback.class", MockableDeviceSetupCallback.class.getName());
         preferences.setProperty("factory.vaultregistry.class", HubVaultRegistry.class.getName());
 
         preferences.setProperty("oauth.handler.scheme", "katta");
@@ -191,19 +188,29 @@ protected static HubSession setupConnection(final HubTestConfig.Setup setup) thr
         assertTrue(factory.forName("s3").isEnabled());
         assertTrue(factory.forType(Protocol.Type.s3).isEnabled());
 
-        final DeviceSetupCallback proxy = deviceSetupCallback(setup);
-        MockableDeviceSetupCallback.setProxy(proxy);
-
         final Host hub = new HostParser(factory).get(setup.hubURL).withCredentials(new Credentials(setup.userConfig.username, setup.userConfig.password));
         final HubSession session = (HubSession) SessionFactory.create(hub, new DefaultX509TrustManager(), new DefaultX509KeyManager())
                 .withRegistry(VaultRegistryFactory.get(new DisabledPasswordCallback()));
-        final LoginConnectionService login = new LoginConnectionService(new DisabledLoginCallback(), new DisabledHostKeyCallback(),
+        final LoginConnectionService login = new LoginConnectionService(loginCallback(setup), new DisabledHostKeyCallback(),
                 PasswordStoreFactory.get(), new DisabledProgressListener());
         login.check(session, new DisabledCancelCallback());
         return session;
     }
 
-    protected static @NotNull DeviceSetupCallback deviceSetupCallback(HubTestConfig.Setup setup) {
+    protected static LoginCallback loginCallback(HubTestConfig.Setup setup) {
+        return new DisabledLoginCallback() {
+            @SuppressWarnings("unchecked")
+            @Override
+            public <T> T getFeature(final Class<T> type) {
+                if(DeviceSetupCallback.class == type) {
+                    return (T) deviceSetupCallback(setup);
+                }
+                return null;
+            }
+        };
+    }
+
+    protected static DeviceSetupCallback deviceSetupCallback(HubTestConfig.Setup setup) {
         return new DeviceSetupCallback() {
             @Override
             public AccountKeyAndDeviceName displayAccountKeyAndAskDeviceName(final Host bookmark, final AccountKeyAndDeviceName accountKeyAndDeviceName) {

hub/src/test/java/cloud/katta/core/util/MockableDeviceSetupCallback.java

@@ -22,7 +22,8 @@
         </dependency>
         <dependency>
             <groupId>ch.cyberduck</groupId>
-            <artifactId>binding</artifactId>
+            <artifactId>osx</artifactId>
+            <version>${cyberduck.version}</version>
         </dependency>
     </dependencies>
 </project>

hub/src/test/java/cloud/katta/testsetup/AbstractHubTest.java

@@ -9,6 +9,7 @@
 import ch.cyberduck.binding.application.SheetCallback;
 import ch.cyberduck.core.Host;
 import ch.cyberduck.core.exception.ConnectionCanceledException;
+import ch.cyberduck.ui.cocoa.callback.PromptLoginCallback;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -17,12 +18,13 @@
 import cloud.katta.model.AccountKeyAndDeviceName;
 import cloud.katta.workflows.exceptions.AccessException;
 
-public class PromptDeviceSetupCallback implements DeviceSetupCallback {
+public class PromptDeviceSetupCallback extends PromptLoginCallback implements DeviceSetupCallback {
     private static final Logger log = LogManager.getLogger(PromptDeviceSetupCallback.class.getName());
 
     private final ProxyController controller;
 
     public PromptDeviceSetupCallback(final ProxyController controller) {
+        super(controller);
         this.controller = controller;
     }
 
@@ -54,4 +56,13 @@ public AccountKeyAndDeviceName askForAccountKeyAndDeviceName(final Host bookmark
         }
         return accountKeyAndDeviceName;
     }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> T getFeature(final Class<T> type) {
+        if(type == DeviceSetupCallback.class) {
+            return (T) this;
+        }
+        return null;
+    }
 }