Sync creds: add user and password #202

Also move type up to super class.

Author: greenrobot-team

objectbox-java/src/main/java/io/objectbox/sync/SyncClientImpl.java

@@ -167,9 +167,17 @@ public void setSyncListener(@Nullable SyncListener listener) {
 
     @Override
     public void setLoginCredentials(SyncCredentials credentials) {
-        SyncCredentialsToken credentialsInternal = (SyncCredentialsToken) credentials;
-        nativeSetLoginInfo(getHandle(), credentialsInternal.getTypeId(), credentialsInternal.getTokenBytes());
-        credentialsInternal.clear(); // Clear immediately, not needed anymore.
+        if (credentials instanceof SyncCredentialsToken) {
+            SyncCredentialsToken credToken = (SyncCredentialsToken) credentials;
+            nativeSetLoginInfo(getHandle(), credToken.getTypeId(), credToken.getTokenBytes());
+            credToken.clear(); // Clear immediately, not needed anymore.
+        } else if (credentials instanceof SyncCredentialsUserPassword) {
+            SyncCredentialsUserPassword credUserPassword = (SyncCredentialsUserPassword) credentials;
+            nativeSetLoginInfoUserPassword(getHandle(), credUserPassword.getTypeId(), credUserPassword.getUsername(),
+                    credUserPassword.getPassword());
+        } else {
+            throw new IllegalArgumentException("credentials is not a supported type");
+        }
     }
 
     @Override
@@ -296,6 +304,8 @@ public ObjectsMessageBuilder startObjectsMessage(long flags, @Nullable String to
 
     private native void nativeSetLoginInfo(long handle, long credentialsType, @Nullable byte[] credentials);
 
+    private native void nativeSetLoginInfoUserPassword(long handle, long credentialsType, String username, String password);
+
     private native void nativeSetListener(long handle, @Nullable InternalSyncClientListener listener);
 
     private native void nativeSetSyncChangesListener(long handle, @Nullable SyncChangeListener advancedListener);

objectbox-java/src/main/java/io/objectbox/sync/SyncCredentials.java

@@ -7,6 +7,8 @@
 @SuppressWarnings("unused")
 public class SyncCredentials {
 
+    private final CredentialsType type;
+
     /**
      * Authenticate with a shared secret. This could be a passphrase, big number or randomly chosen bytes.
      * The string is expected to use UTF-8 characters.
@@ -30,6 +32,10 @@ public static SyncCredentials google(String idToken) {
         return new SyncCredentialsToken(CredentialsType.GOOGLE, idToken);
     }
 
+    public static SyncCredentials userAndPassword(String user, String password) {
+        return new SyncCredentialsUserPassword(user, password);
+    }
+
     /**
      * No authentication, unsecured. Use only for development and testing purposes.
      */
@@ -54,7 +60,12 @@ public enum CredentialsType {
         }
     }
 
-    SyncCredentials() {
+    SyncCredentials(CredentialsType type) {
+        this.type = type;
+    }
+
+    public long getTypeId() {
+        return type.id;
     }
 
 }

objectbox-java/src/main/java/io/objectbox/sync/SyncCredentialsToken.java

@@ -11,14 +11,13 @@
  * Internal credentials implementation. Use {@link SyncCredentials} to build credentials.
  */
 @Internal
-public class SyncCredentialsToken extends SyncCredentials {
+public final class SyncCredentialsToken extends SyncCredentials {
 
-    private final CredentialsType type;
     @Nullable private byte[] token;
     private volatile boolean cleared;
 
     SyncCredentialsToken(CredentialsType type) {
-        this.type = type;
+        super(type);
         this.token = null;
     }
 
@@ -34,10 +33,6 @@ public class SyncCredentialsToken extends SyncCredentials {
         this(type, asUtf8Bytes(token));
     }
 
-    public long getTypeId() {
-        return type.id;
-    }
-
     @Nullable
     public byte[] getTokenBytes() {
         if (cleared) {

objectbox-java/src/main/java/io/objectbox/sync/SyncCredentialsUserPassword.java

@@ -0,0 +1,28 @@
+package io.objectbox.sync;
+
+import io.objectbox.annotation.apihint.Internal;
+
+/**
+ * Internal credentials implementation for user and password authentication.
+ * Use {@link SyncCredentials} to build credentials.
+ */
+@Internal
+public final class SyncCredentialsUserPassword extends SyncCredentials {
+
+    private final String username;
+    private final String password;
+
+    SyncCredentialsUserPassword(String username, String password) {
+        super(CredentialsType.USER_PASSWORD);
+        this.username = username;
+        this.password = password;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+}