Merge pull request #50 from shift7-ch/feature/rename-device-keys-service

Rename DeviceKeysService.

Author: dkocher

hub/src/main/java/ch/iterate/hub/workflows/FirstLoginDeviceSetupService.java renamed to hub/src/main/java/ch/iterate/hub/workflows/DeviceKeysService.java

@@ -16,12 +16,10 @@
 import java.security.spec.InvalidKeySpecException;
 import java.util.Base64;
 
-import ch.iterate.hub.client.model.UserDto;
-
 import static ch.iterate.hub.crypto.KeyHelper.decodeKeyPair;
 
-public class FirstLoginDeviceSetupService {
-    private static final Logger log = LogManager.getLogger(FirstLoginDeviceSetupService.class.getName());
+public class DeviceKeysService {
+    private static final Logger log = LogManager.getLogger(DeviceKeysService.class.getName());
 
     public static final String KEYCHAIN_PUBLIC_DEVICE_KEY_ACCOUNT_NAME = "Cipherduck Public Device Key";
     public static final String KEYCHAIN_PRIVATE_DEVICE_KEY_ACCOUNT_NAME = "Cipherduck Private Device Key";
@@ -59,8 +57,4 @@ public static void storeDeviceKeysInPasswordStore(final ECKeyPair deviceKeys, fi
     public static boolean validateDeviceKeys(final ECKeyPair deviceKeyPairFromKeychain) {
         return deviceKeyPairFromKeychain != null;
     }
-
-    public static boolean validateUserKeys(final UserDto me) {
-        return me.getEcdhPublicKey() != null && me.getPrivateKey() != null;
-    }
 }

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

@@ -37,7 +37,7 @@
 
 import static ch.iterate.hub.crypto.KeyHelper.getDeviceIdFromDeviceKeyPair;
 import static ch.iterate.hub.protocols.s3.CipherduckHostCustomProperties.HUB_UUID;
-import static ch.iterate.hub.workflows.FirstLoginDeviceSetupService.*;
+import static ch.iterate.hub.workflows.DeviceKeysService.*;
 
 public class UserKeysServiceImpl implements UserKeysService {
     private static final Logger log = LogManager.getLogger(UserKeysServiceImpl.class.getName());
@@ -185,4 +185,8 @@ private void uploadDeviceKeys(final String deviceName, final UserKeys userKeys,
                 .type(Type1.DESKTOP)
                 .creationTime(new DateTime()));
     }
+
+    private boolean validateUserKeys(final UserDto me) {
+        return me.getEcdhPublicKey() != null && me.getPrivateKey() != null;
+    }
 }