Rename.

Author: dkocher

hub/src/main/java/ch/iterate/hub/core/FirstLoginDeviceSetupCallback.java renamed to hub/src/main/java/ch/iterate/hub/core/DeviceSetupCallback.java

@@ -12,7 +12,7 @@
 import ch.iterate.hub.model.AccountKeyAndDeviceName;
 import ch.iterate.hub.workflows.exceptions.AccessException;
 
-public interface FirstLoginDeviceSetupCallback {
+public interface DeviceSetupCallback {
 
     /**
      * Prompt user for device name
@@ -48,7 +48,7 @@ default UserKeys generateUserKeys() {
         return UserKeys.create();
     }
 
-    FirstLoginDeviceSetupCallback disabled = new FirstLoginDeviceSetupCallback() {
+    DeviceSetupCallback disabled = new DeviceSetupCallback() {
         @Override
         public String displayAccountKeyAndAskDeviceName(final Host bookmark, final AccountKeyAndDeviceName accountKeyAndDeviceName) throws AccessException {
             throw new AccessException("Disabled");

hub/src/main/java/ch/iterate/hub/core/FirstLoginDeviceSetupCallbackFactory.java renamed to hub/src/main/java/ch/iterate/hub/core/DeviceSetupCallbackFactory.java

@@ -13,16 +13,16 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
-public class FirstLoginDeviceSetupCallbackFactory extends Factory<FirstLoginDeviceSetupCallback> {
-    private static final Logger log = LogManager.getLogger(FirstLoginDeviceSetupCallbackFactory.class);
+public final class DeviceSetupCallbackFactory extends Factory<DeviceSetupCallback> {
+    private static final Logger log = LogManager.getLogger(DeviceSetupCallbackFactory.class);
 
-    private FirstLoginDeviceSetupCallbackFactory() {
-        super("factory.firstlogindevicesetupcallback.class");
+    private DeviceSetupCallbackFactory() {
+        super("factory.devicesetupcallback.class");
     }
 
-    public FirstLoginDeviceSetupCallback create() {
+    public DeviceSetupCallback create() {
         try {
-            final Constructor<? extends FirstLoginDeviceSetupCallback> constructor
+            final Constructor<? extends DeviceSetupCallback> constructor
                     = ConstructorUtils.getMatchingAccessibleConstructor(clazz);
             if(null == constructor) {
                 log.warn("No default controller in {}", constructor.getClass());
@@ -33,18 +33,18 @@ public FirstLoginDeviceSetupCallback create() {
         }
         catch(InstantiationException | InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
             log.error("Failure loading callback class {}. {}", clazz, e.getMessage());
-            return FirstLoginDeviceSetupCallback.disabled;
+            return DeviceSetupCallback.disabled;
         }
     }
 
-    private static FirstLoginDeviceSetupCallbackFactory singleton;
+    private static DeviceSetupCallbackFactory singleton;
 
     /**
      * @return Firs tLogin Device Setup Callback instance for the current platform.
      */
-    public static synchronized FirstLoginDeviceSetupCallback get() {
+    public static synchronized DeviceSetupCallback get() {
         if(null == singleton) {
-            singleton = new FirstLoginDeviceSetupCallbackFactory();
+            singleton = new DeviceSetupCallbackFactory();
         }
         return singleton.create();
     }

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

@@ -27,7 +27,6 @@
 import ch.cyberduck.core.oauth.OAuth2RequestInterceptor;
 import ch.cyberduck.core.preferences.HostPreferences;
 import ch.cyberduck.core.proxy.ProxyFinder;
-import ch.cyberduck.core.shared.DelegatingSchedulerFeature;
 import ch.cyberduck.core.ssl.X509KeyManager;
 import ch.cyberduck.core.ssl.X509TrustManager;
 import ch.cyberduck.core.threading.CancelCallback;
@@ -45,8 +44,8 @@
 import ch.iterate.hub.client.api.UsersResourceApi;
 import ch.iterate.hub.client.model.ConfigDto;
 import ch.iterate.hub.client.model.UserDto;
-import ch.iterate.hub.core.FirstLoginDeviceSetupCallback;
-import ch.iterate.hub.core.FirstLoginDeviceSetupCallbackFactory;
+import ch.iterate.hub.core.DeviceSetupCallback;
+import ch.iterate.hub.core.DeviceSetupCallbackFactory;
 import ch.iterate.hub.protocols.hub.exceptions.HubExceptionMappingService;
 import ch.iterate.hub.protocols.hub.serializer.HubConfigDtoDeserializer;
 import ch.iterate.hub.workflows.DeviceKeysServiceImpl;
@@ -136,7 +135,7 @@ protected HubApiClient connect(final ProxyFinder proxy, final HostKeyCallback ke
 
     @Override
     public void login(final LoginCallback prompt, final CancelCallback cancel) throws BackgroundException {
-        final FirstLoginDeviceSetupCallback setup = FirstLoginDeviceSetupCallbackFactory.get();
+        final DeviceSetupCallback setup = DeviceSetupCallbackFactory.get();
         final Credentials credentials = authorizationService.validate();
         try {
             // Set username from OAuth ID Token for saving in keychain

hub/src/main/java/ch/iterate/hub/workflows/CachingUserKeysService.java

@@ -8,7 +8,7 @@
 
 import ch.iterate.hub.client.ApiException;
 import ch.iterate.hub.client.model.UserDto;
-import ch.iterate.hub.core.FirstLoginDeviceSetupCallback;
+import ch.iterate.hub.core.DeviceSetupCallback;
 import ch.iterate.hub.crypto.DeviceKeys;
 import ch.iterate.hub.crypto.UserKeys;
 import ch.iterate.hub.workflows.exceptions.AccessException;
@@ -38,7 +38,7 @@ public UserKeys getUserKeys(final Host hub, final UserDto me, final DeviceKeys d
     }
 
     @Override
-    public UserKeys getOrCreateUserKeys(final Host hub, final UserDto me, final DeviceKeys deviceKeyPair, final FirstLoginDeviceSetupCallback prompt) throws ApiException, AccessException, SecurityFailure {
+    public UserKeys getOrCreateUserKeys(final Host hub, final UserDto me, final DeviceKeys deviceKeyPair, final DeviceSetupCallback prompt) throws ApiException, AccessException, SecurityFailure {
         if(userKeys == null) {
             userKeys = proxy.getOrCreateUserKeys(hub, me, deviceKeyPair, prompt);
         }

hub/src/main/java/ch/iterate/hub/workflows/DeviceKeysService.java

@@ -6,7 +6,7 @@
 
 import ch.cyberduck.core.Host;
 
-import ch.iterate.hub.core.FirstLoginDeviceSetupCallback;
+import ch.iterate.hub.core.DeviceSetupCallback;
 import ch.iterate.hub.crypto.DeviceKeys;
 import ch.iterate.hub.workflows.exceptions.AccessException;
 
@@ -20,7 +20,7 @@ public interface DeviceKeysService {
      * @throws AccessException   Failure accessing storage or not found
      * @throws SecurityException Failure decoding device keys retrieved from storage
      */
-    DeviceKeys getOrCreateDeviceKeys(Host hub, FirstLoginDeviceSetupCallback setup) throws AccessException;
+    DeviceKeys getOrCreateDeviceKeys(Host hub, DeviceSetupCallback setup) throws AccessException;
 
     /**
      * Retrieve saved device keys

hub/src/main/java/ch/iterate/hub/workflows/DeviceKeysServiceImpl.java

@@ -18,7 +18,7 @@
 
 import static ch.iterate.hub.crypto.KeyHelper.decodeKeyPair;
 
-import ch.iterate.hub.core.FirstLoginDeviceSetupCallback;
+import ch.iterate.hub.core.DeviceSetupCallback;
 import ch.iterate.hub.crypto.DeviceKeys;
 import ch.iterate.hub.workflows.exceptions.AccessException;
 
@@ -45,7 +45,7 @@ private static String toAccountName(final Host hub) {
     }
 
     @Override
-    public DeviceKeys getOrCreateDeviceKeys(final Host hub, final FirstLoginDeviceSetupCallback setup) throws AccessException {
+    public DeviceKeys getOrCreateDeviceKeys(final Host hub, final DeviceSetupCallback setup) throws AccessException {
         final DeviceKeys deviceKeys = this.getDeviceKeys(hub);
         if(DeviceKeys.validate(deviceKeys)) {
             return deviceKeys;

hub/src/main/java/ch/iterate/hub/workflows/UserKeysService.java

@@ -8,7 +8,7 @@
 
 import ch.iterate.hub.client.ApiException;
 import ch.iterate.hub.client.model.UserDto;
-import ch.iterate.hub.core.FirstLoginDeviceSetupCallback;
+import ch.iterate.hub.core.DeviceSetupCallback;
 import ch.iterate.hub.crypto.DeviceKeys;
 import ch.iterate.hub.crypto.UserKeys;
 import ch.iterate.hub.workflows.exceptions.AccessException;
@@ -32,5 +32,5 @@ public interface UserKeysService {
      * @throws SecurityFailure Failure decoding keys
      * @throws AccessException Failure accessing or saving device keys
      */
-    UserKeys getOrCreateUserKeys(Host hub, UserDto me, DeviceKeys deviceKeyPair, FirstLoginDeviceSetupCallback prompt) throws ApiException, AccessException, SecurityFailure;
+    UserKeys getOrCreateUserKeys(Host hub, UserDto me, DeviceKeys deviceKeyPair, DeviceSetupCallback prompt) throws ApiException, AccessException, SecurityFailure;
 }

hub/src/main/java/ch/iterate/hub/workflows/UserKeysServiceImpl.java

@@ -14,13 +14,16 @@
 import java.text.ParseException;
 import java.util.Base64;
 
+import static ch.iterate.hub.crypto.KeyHelper.getDeviceIdFromDeviceKeyPair;
+import static ch.iterate.hub.workflows.DeviceKeysServiceImpl.COMPUTER_NAME;
+
 import ch.iterate.hub.client.ApiException;
 import ch.iterate.hub.client.api.DeviceResourceApi;
 import ch.iterate.hub.client.api.UsersResourceApi;
 import ch.iterate.hub.client.model.DeviceDto;
 import ch.iterate.hub.client.model.Type1;
 import ch.iterate.hub.client.model.UserDto;
-import ch.iterate.hub.core.FirstLoginDeviceSetupCallback;
+import ch.iterate.hub.core.DeviceSetupCallback;
 import ch.iterate.hub.crypto.DeviceKeys;
 import ch.iterate.hub.crypto.UserKeys;
 import ch.iterate.hub.model.AccountKeyAndDeviceName;
@@ -31,9 +34,6 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.nimbusds.jose.JOSEException;
 
-import static ch.iterate.hub.crypto.KeyHelper.getDeviceIdFromDeviceKeyPair;
-import static ch.iterate.hub.workflows.DeviceKeysServiceImpl.COMPUTER_NAME;
-
 public class UserKeysServiceImpl implements UserKeysService {
     private static final Logger log = LogManager.getLogger(UserKeysServiceImpl.class.getName());
 
@@ -67,7 +67,7 @@ public UserKeys getUserKeys(final Host hub, final UserDto me, final DeviceKeys d
     }
 
     @Override
-    public UserKeys getOrCreateUserKeys(final Host hub, final UserDto me, final DeviceKeys deviceKeyPair, final FirstLoginDeviceSetupCallback prompt) throws ApiException, AccessException, SecurityFailure {
+    public UserKeys getOrCreateUserKeys(final Host hub, final UserDto me, final DeviceKeys deviceKeyPair, final DeviceSetupCallback prompt) throws ApiException, AccessException, SecurityFailure {
         if(UserKeys.validate(me)) {
             try {
                 return this.getUserKeys(hub, me, deviceKeyPair);

hub/src/test/java/ch/iterate/hub/core/util/MockableFirstLoginDeviceSetupCallback.java renamed to hub/src/test/java/ch/iterate/hub/core/util/MockableDeviceSetupCallback.java

@@ -6,16 +6,16 @@
 
 import ch.cyberduck.core.Host;
 
-import ch.iterate.hub.core.FirstLoginDeviceSetupCallback;
+import ch.iterate.hub.core.DeviceSetupCallback;
 import ch.iterate.hub.model.AccountKeyAndDeviceName;
 import ch.iterate.hub.workflows.exceptions.AccessException;
 
-public class MockableFirstLoginDeviceSetupCallback implements FirstLoginDeviceSetupCallback {
-    public static void setProxy(final FirstLoginDeviceSetupCallback proxy) {
-        MockableFirstLoginDeviceSetupCallback.proxy = proxy;
+public class MockableDeviceSetupCallback implements DeviceSetupCallback {
+    public static void setProxy(final DeviceSetupCallback proxy) {
+        MockableDeviceSetupCallback.proxy = proxy;
     }
 
-    private static FirstLoginDeviceSetupCallback proxy = null;
+    private static DeviceSetupCallback proxy = null;
 
     @Override
     public String displayAccountKeyAndAskDeviceName(final Host bookmark, final AccountKeyAndDeviceName accountKeyAndDeviceName) throws AccessException {

hub/src/test/java/ch/iterate/hub/testsetup/AbstractHubTest.java

@@ -39,16 +39,16 @@
 import java.time.format.FormatStyle;
 import java.util.function.Function;
 
-import ch.iterate.hub.core.FirstLoginDeviceSetupCallback;
-import ch.iterate.hub.core.util.MockableFirstLoginDeviceSetupCallback;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import ch.iterate.hub.core.DeviceSetupCallback;
+import ch.iterate.hub.core.util.MockableDeviceSetupCallback;
 import ch.iterate.hub.model.AccountKeyAndDeviceName;
 import ch.iterate.hub.protocols.hub.HubCryptoVault;
 import ch.iterate.hub.protocols.hub.HubProtocol;
 import ch.iterate.hub.protocols.hub.HubSession;
 import ch.iterate.hub.protocols.s3.S3AutoLoadVaultProtocol;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
 @HubIntegrationTest
 public abstract class AbstractHubTest extends VaultTest {
 
@@ -149,7 +149,7 @@ protected void configureLogging(final String level) {
         preferences.setProperty("factory.vault.class", HubCryptoVault.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.firstlogindevicesetupcallback.class", MockableFirstLoginDeviceSetupCallback.class.getName());
+        preferences.setProperty("factory.devicesetupcallback.class", MockableDeviceSetupCallback.class.getName());
 
         preferences.setProperty("oauth.handler.scheme", "katta");
         preferences.setProperty("hub.protocol.scheduler.period", 30);
@@ -177,7 +177,7 @@ protected static HubSession setupConnection(final HubTestConfig.Setup setup) thr
         assertNotNull(ProtocolFactory.get().forName("s3"));
         assertNotNull(ProtocolFactory.get().forName("katta-s3"));
 
-        final FirstLoginDeviceSetupCallback proxy = new FirstLoginDeviceSetupCallback() {
+        final DeviceSetupCallback proxy = new DeviceSetupCallback() {
             @Override
             public String displayAccountKeyAndAskDeviceName(final Host bookmark, final AccountKeyAndDeviceName accountKeyAndDeviceName) {
                 return "firstLoginMockSetup";
@@ -194,7 +194,7 @@ public String generateAccountKey() {
                 return staticSetupCode();
             }
         };
-        MockableFirstLoginDeviceSetupCallback.setProxy(proxy);
+        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());