Move validation function.

Author: dkocher

hub/src/main/java/ch/iterate/hub/crypto/UserKeys.java

@@ -15,14 +15,13 @@
 import java.util.Base64;
 import java.util.Objects;
 
-import ch.iterate.hub.client.model.UserDto;
+import static ch.iterate.hub.crypto.KeyHelper.decodeKeyPair;
+import static ch.iterate.hub.crypto.UserKeyPayload.createFromPayload;
+
 import ch.iterate.hub.crypto.uvf.UvfAccessTokenPayload;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.nimbusds.jose.JOSEException;
 
-import static ch.iterate.hub.crypto.KeyHelper.decodeKeyPair;
-import static ch.iterate.hub.crypto.UserKeyPayload.createFromPayload;
-
 /**
  * Represents Cryptomator Hub <a href="https://docs.cryptomator.org/en/latest/security/hub/#user-key-pair>User Keys</a>.
  * Counterpart of <a href="https://github.com/cryptomator/hub/blob/develop/frontend/src/common/crypto.ts"><code>UserKeys</code></a>.
@@ -86,10 +85,6 @@ public static UserKeys create() {
         return new UserKeys(P384KeyPair.generate(), P384KeyPair.generate());
     }
 
-    public static boolean validate(final UserDto me) {
-        return me.getEcdhPublicKey() != null && me.getPrivateKey() != null;
-    }
-
     private UserKeyPayload prepareForEncryption() {
         return new UserKeyPayload(Base64.getEncoder().encodeToString(ecdhKeyPair().getPrivate().getEncoded()), Base64.getEncoder().encodeToString(ecdsaKeyPair().getPrivate().getEncoded()));
     }

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

@@ -68,7 +68,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 DeviceSetupCallback prompt) throws ApiException, AccessException, SecurityFailure {
-        if(UserKeys.validate(me)) {
+        if(validate(me)) {
             try {
                 return this.getUserKeys(hub, me, deviceKeyPair);
             }
@@ -83,7 +83,7 @@ public UserKeys getOrCreateUserKeys(final Host hub, final UserDto me, final Devi
                 }
             }
         }
-        else if(UserKeys.validate(me)) {
+        else if(validate(me)) {
             // No device keys
             log.info("Setting up new device w/ Account Key for existing user keys.");
             return this.recover(me, deviceKeyPair, prompt.askForAccountKeyAndDeviceName(hub, COMPUTER_NAME));
@@ -143,4 +143,8 @@ private UserKeys uploadDeviceKeys(final String deviceName, final UserKeys userKe
         }
         return userKeys;
     }
+
+    private static boolean validate(final UserDto me) {
+        return me.getEcdhPublicKey() != null && me.getPrivateKey() != null;
+    }
 }