Sync creds: remap SHARED_SECRET_SIPPED to SHARED_SECRET for server #202

Author: greenrobot-team

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

@@ -37,6 +37,9 @@ public static SyncBuilder client(BoxStore boxStore, String url, SyncCredentials
      * Start building a sync server. Requires the BoxStore the server should use,
      * the URL and port the server should bind to and authenticator credentials to authenticate clients.
      * Additional authenticator credentials can be supplied using the builder.
+     * <p>
+     * For the embedded server, currently only {@link SyncCredentials#sharedSecret} and {@link SyncCredentials#none}
+     * are supported.
      */
     public static SyncServerBuilder server(BoxStore boxStore, String url, SyncCredentials authenticatorCredentials) {
         return new SyncServerBuilder(boxStore, url, authenticatorCredentials);

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

@@ -64,6 +64,10 @@ public enum CredentialsType {
         this.type = type;
     }
 
+    public CredentialsType getType() {
+        return type;
+    }
+
     public long getTypeId() {
         return type.id;
     }

objectbox-java/src/main/java/io/objectbox/sync/server/SyncServerBuilder.java

@@ -46,6 +46,9 @@ public SyncServerBuilder certificatePath(String certificatePath) {
 
     /**
      * Adds additional authenticator credentials to authenticate clients with.
+     * <p>
+     * For the embedded server, currently only {@link SyncCredentials#sharedSecret} and {@link SyncCredentials#none}
+     * are supported.
      */
     public SyncServerBuilder authenticatorCredentials(SyncCredentials authenticatorCredentials) {
         checkNotNull(authenticatorCredentials, "Authenticator credentials must not be null.");

objectbox-java/src/main/java/io/objectbox/sync/server/SyncServerImpl.java

@@ -4,6 +4,7 @@
 
 import io.objectbox.annotation.apihint.Internal;
 import io.objectbox.sync.SyncCredentials;
+import io.objectbox.sync.SyncCredentials.CredentialsType;
 import io.objectbox.sync.SyncCredentialsToken;
 import io.objectbox.sync.listener.SyncChangeListener;
 
@@ -31,8 +32,16 @@ public class SyncServerImpl implements SyncServer {
         this.handle = handle;
 
         for (SyncCredentials credentials : builder.credentials) {
+            if (!(credentials instanceof SyncCredentialsToken)) {
+                throw new IllegalArgumentException("Sync credentials of type " + credentials.getType() + " are not supported");
+            }
             SyncCredentialsToken credentialsInternal = (SyncCredentialsToken) credentials;
-            nativeSetAuthenticator(handle, credentialsInternal.getTypeId(), credentialsInternal.getTokenBytes());
+            // The core API used by nativeSetAuthenticator only supports the NONE and SHARED_SECRET types
+            // (however, protocol v3 versions do also add SHARED_SECRET_SIPPED if SHARED_SECRET is given).
+            final CredentialsType type = credentialsInternal.getType() == CredentialsType.SHARED_SECRET_SIPPED
+                    ? CredentialsType.SHARED_SECRET
+                    : credentialsInternal.getType();
+            nativeSetAuthenticator(handle, type.id, credentialsInternal.getTokenBytes());
             credentialsInternal.clear(); // Clear immediately, not needed anymore.
         }