Bulk User Import API

src/main/java/com/google/firebase/auth/hash/Md5.java

@@ -20,17 +20,17 @@
  * Represents the MD5 password hashing algorithm. Can be used as an instance of
  * {@link com.google.firebase.auth.UserImportHash} when importing users.
  */
-public class Md5 extends BasicHash {
+public class Md5 extends RepeatableHash {
 
   private Md5(Builder builder) {
-    super("MD5", builder);
+    super("MD5", 0, 120000, builder);
   }
 
   public static Builder builder() {
     return new Builder();
   }
 
-  public static class Builder extends BasicHash.Builder<Builder, Md5> {
+  public static class Builder extends RepeatableHash.Builder<Builder, Md5> {
 
     private Builder() {}
 

src/main/java/com/google/firebase/auth/hash/Pbkdf2Sha256.java

@@ -20,17 +20,17 @@
  * Represents the PBKDF2 SHA256 password hashing algorithm. Can be used as an instance of
  * {@link com.google.firebase.auth.UserImportHash} when importing users.
  */
-public class Pbkdf2Sha256 extends BasicHash {
+public class Pbkdf2Sha256 extends RepeatableHash {
 
   private Pbkdf2Sha256(Builder builder) {
-    super("PBKDF2_SHA256", builder);
+    super("PBKDF2_SHA256", 0, 120000, builder);
   }
 
   public static Builder builder() {
     return new Builder();
   }
 
-  public static class Builder extends BasicHash.Builder<Builder, Pbkdf2Sha256> {
+  public static class Builder extends RepeatableHash.Builder<Builder, Pbkdf2Sha256> {
 
     private Builder() {}
 

src/main/java/com/google/firebase/auth/hash/PbkdfSha1.java

@@ -20,17 +20,17 @@
  * Represents the PBKDF SHA1 password hashing algorithm. Can be used as an instance of
  * {@link com.google.firebase.auth.UserImportHash} when importing users.
  */
-public class PbkdfSha1 extends BasicHash {
+public class PbkdfSha1 extends RepeatableHash {
 
   private PbkdfSha1(Builder builder) {
-    super("PBKDF_SHA1", builder);
+    super("PBKDF_SHA1", 0, 120000, builder);
   }
 
   public static Builder builder() {
     return new Builder();
   }
 
-  public static class Builder extends BasicHash.Builder<Builder, PbkdfSha1> {
+  public static class Builder extends RepeatableHash.Builder<Builder, PbkdfSha1> {
 
     private Builder() {}
 

src/main/java/com/google/firebase/auth/hash/BasicHash.java → src/main/java/com/google/firebase/auth/hash/RepeatableHash.java

@@ -22,19 +22,19 @@
 import com.google.firebase.auth.UserImportHash;
 import java.util.Map;
 
-abstract class BasicHash extends UserImportHash {
+abstract class RepeatableHash extends UserImportHash {
 
   private final int rounds;
 
-  BasicHash(String name, Builder builder) {
+  RepeatableHash(String name, int min, int max, Builder builder) {
     super(name);
-    checkArgument(builder.rounds >= 0 && builder.rounds <= 120000,
-        "Rounds value must be between 0 and 120000 (inclusive).");
+    checkArgument(builder.rounds >= min && builder.rounds <= max,
+        "Rounds value must be between %s and %s (inclusive).", min, max);
     this.rounds = builder.rounds;
   }
 
   @Override
-  protected final Map<String, Object> getOptions() {
+  protected Map<String, Object> getOptions() {
     return ImmutableMap.<String, Object>of("rounds", rounds);
   }
 

src/main/java/com/google/firebase/auth/hash/Scrypt.java

@@ -20,7 +20,6 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.BaseEncoding;
-import com.google.firebase.auth.UserImportHash;
 import java.util.Map;
 
 /**
@@ -29,18 +28,16 @@
  * Firebase Auth. See {@link StandardScrypt} for the standard Scrypt algorithm. Can be used as an
  * instance of {@link com.google.firebase.auth.UserImportHash} when importing users.
  */
-public final class Scrypt extends UserImportHash {
+public final class Scrypt extends RepeatableHash {
 
   private final String key;
   private final String saltSeparator;
-  private final int rounds;
   private final int memoryCost;
 
   private Scrypt(Builder builder) {
-    super("SCRYPT");
+    super("SCRYPT",0, 8, builder);
     checkArgument(builder.key != null && builder.key.length > 0,
         "A non-empty key is required for Scrypt");
-    checkArgument(builder.rounds > 0 && builder.rounds <= 8, "rounds must be between 1 and 8");
     checkArgument(builder.memoryCost > 0 && builder.memoryCost <= 14,
         "memoryCost must be between 1 and 14");
     this.key = BaseEncoding.base64Url().encode(builder.key);
@@ -49,29 +46,27 @@ private Scrypt(Builder builder) {
     } else {
       this.saltSeparator = BaseEncoding.base64Url().encode(new byte[0]);
     }
-    this.rounds = builder.rounds;
     this.memoryCost = builder.memoryCost;
   }
 
   @Override
   protected Map<String, Object> getOptions() {
-    return ImmutableMap.<String, Object>of(
-        "signerKey", key,
-        "rounds", rounds,
-        "memoryCost", memoryCost,
-        "saltSeparator", saltSeparator
-    );
+    return ImmutableMap.<String, Object>builder()
+        .putAll(super.getOptions())
+        .put("signerKey", key)
+        .put("memoryCost", memoryCost)
+        .put("saltSeparator", saltSeparator)
+        .build();
   }
 
   public static Builder builder() {
     return new Builder();
   }
 
-  public static class Builder {
+  public static class Builder extends RepeatableHash.Builder<Builder, Scrypt> {
 
     private byte[] key;
     private byte[] saltSeparator;
-    private int rounds;
     private int memoryCost;
 
     private Builder() {}
@@ -98,17 +93,6 @@ public Builder setSaltSeparator(byte[] saltSeparator) {
       return this;
     }
 
-    /**
-     * Sets the number of rounds. Required field.
-     *
-     * @param rounds an integer between 1 and 8 (inclusive).
-     * @return this builder.
-     */
-    public Builder setRounds(int rounds) {
-      this.rounds = rounds;
-      return this;
-    }
-
     /**
      * Sets the memory cost. Required field.
      *
@@ -120,6 +104,11 @@ public Builder setMemoryCost(int memoryCost) {
       return this;
     }
 
+    @Override
+    protected Builder getInstance() {
+      return this;
+    }
+
     public Scrypt build() {
       return new Scrypt(this);
     }

src/main/java/com/google/firebase/auth/hash/Sha1.java

@@ -20,17 +20,17 @@
  * Represents the SHA1 password hashing algorithm. Can be used as an instance of
  * {@link com.google.firebase.auth.UserImportHash} when importing users.
  */
-public class Sha1 extends BasicHash {
+public class Sha1 extends RepeatableHash {
 
   private Sha1(Builder builder) {
-    super("SHA1", builder);
+    super("SHA1", 0, 120000, builder);
   }
 
   public static Builder builder() {
     return new Builder();
   }
 
-  public static class Builder extends BasicHash.Builder<Builder, Sha1> {
+  public static class Builder extends RepeatableHash.Builder<Builder, Sha1> {
 
     private Builder() {}
 

src/main/java/com/google/firebase/auth/hash/Sha256.java

@@ -20,17 +20,17 @@
  * Represents the SHA256 password hashing algorithm. Can be used as an instance of
  * {@link com.google.firebase.auth.UserImportHash} when importing users.
  */
-public class Sha256 extends BasicHash {
+public class Sha256 extends RepeatableHash {
 
   private Sha256(Builder builder) {
-    super("SHA256", builder);
+    super("SHA256", 0, 120000, builder);
   }
 
   public static Builder builder() {
     return new Builder();
   }
 
-  public static class Builder extends BasicHash.Builder<Builder, Sha256> {
+  public static class Builder extends RepeatableHash.Builder<Builder, Sha256> {
 
     private Builder() {}
 

src/main/java/com/google/firebase/auth/hash/Sha512.java

@@ -20,17 +20,17 @@
  * Represents the SHA512 password hashing algorithm. Can be used as an instance of
  * {@link com.google.firebase.auth.UserImportHash} when importing users.
  */
-public class Sha512 extends BasicHash {
+public class Sha512 extends RepeatableHash {
 
   private Sha512(Builder builder) {
-    super("SHA512", builder);
+    super("SHA512", 0, 120000, builder);
   }
 
   public static Builder builder() {
     return new Builder();
   }
 
-  public static class Builder extends BasicHash.Builder<Builder, Sha512> {
+  public static class Builder extends RepeatableHash.Builder<Builder, Sha512> {
 
     private Builder() {}
 

src/test/java/com/google/firebase/auth/hash/InvalidHashTest.java

@@ -47,8 +47,8 @@ public void testInvalidHmac() {
   }
 
   @Test
-  public void testInvalidBasic() {
-    List<BasicHash.Builder> builders = ImmutableList.<BasicHash.Builder>builder()
+  public void testInvalidRepeatableHash() {
+    List<RepeatableHash.Builder> builders = ImmutableList.<RepeatableHash.Builder>builder()
         .add(Sha512.builder().setRounds(-1))
         .add(Sha256.builder().setRounds(-1))
         .add(Sha1.builder().setRounds(-1))
@@ -62,7 +62,7 @@ public void testInvalidBasic() {
         .add(Pbkdf2Sha256.builder().setRounds(120001))
         .add(PbkdfSha1.builder().setRounds(120001))
         .build();
-    for (BasicHash.Builder builder : builders) {
+    for (RepeatableHash.Builder builder : builders) {
       try {
         builder.build();
         fail("No error thrown for invalid rounds");
@@ -84,6 +84,11 @@ public void testInvalidScrypt() {
             .setSaltSeparator(SALT_SEPARATOR)
             .setRounds(9)
             .setMemoryCost(14),
+        Scrypt.builder() // invalid rounds (< 0)
+            .setKey(SIGNER_KEY)
+            .setSaltSeparator(SALT_SEPARATOR)
+            .setRounds(-1)
+            .setMemoryCost(14),
         Scrypt.builder() // invalid memory cost (> 15)
             .setKey(SIGNER_KEY)
             .setSaltSeparator(SALT_SEPARATOR)