Handle entry with null as non-existent (#25)

* dont send username on signUp if not required

* make ParameterBuilder ignore null parameter values

* reformat condition check

Author: lbalmaceda

auth0/src/main/java/com/auth0/authentication/AuthenticationAPIClient.java

@@ -297,7 +297,7 @@ public DatabaseConnectionRequest<DatabaseUser> createUser(String email, String p
                 .addPathSegment(SIGN_UP_PATH)
                 .build();
 
-        Map<String, Object> parameters = ParameterBuilder.newBuilder()
+        final Map<String, Object> parameters = ParameterBuilder.newBuilder()
                 .set(USERNAME_KEY, username)
                 .set(EMAIL_KEY, email)
                 .set(PASSWORD_KEY, password)

auth0/src/main/java/com/auth0/authentication/ParameterBuilder.java

@@ -145,23 +145,31 @@ public ParameterBuilder setSend(PasswordlessType passwordlessType) {
      * Sets a parameter
      *
      * @param key   parameter name
-     * @param value parameter value
+     * @param value parameter value. A null value will remove the key if present.
      * @return itself
      */
     public ParameterBuilder set(String key, Object value) {
-        this.parameters.put(key, value);
+        if (value == null) {
+            this.parameters.remove(key);
+        } else {
+            this.parameters.put(key, value);
+        }
         return this;
     }
 
     /**
      * Adds all parameter from a map
      *
-     * @param parameters map with parameters to add
+     * @param parameters map with parameters to add. Null values will be skipped.
      * @return itself
      */
     public ParameterBuilder addAll(Map<String, Object> parameters) {
         if (parameters != null) {
-            this.parameters.putAll(parameters);
+            for (String k : parameters.keySet()) {
+                if (parameters.get(k) != null) {
+                    this.parameters.put(k, parameters.get(k));
+                }
+            }
         }
         return this;
     }

auth0/src/test/java/com/auth0/authentication/AuthenticationAPIClientTest.java

@@ -323,7 +323,7 @@ public void shouldCreateUserWithoutUsername() throws Exception {
 
         Map<String, String> body = bodyFromRequest(request);
         assertThat(body, hasEntry("email", SUPPORT_AUTH0_COM));
-        assertThat(body, not(hasEntry("username", SUPPORT)));
+        assertThat(body, not(hasKey("username")));
         assertThat(body, hasEntry("password", PASSWORD));
 
         assertThat(callback, hasPayloadOfType(DatabaseUser.class));
@@ -342,7 +342,44 @@ public void shouldCreateUserWithoutUsernameSync() throws Exception {
 
         Map<String, String> body = bodyFromRequest(request);
         assertThat(body, hasEntry("email", SUPPORT_AUTH0_COM));
-        assertThat(body, hasEntry("username", null));
+        assertThat(body, not(hasKey("username")));
+        assertThat(body, hasEntry("password", PASSWORD));
+
+        assertThat(user, is(notNullValue()));
+    }
+
+    @Test
+    public void shouldNotSendNullUsernameOnSignUp() throws Exception {
+        mockAPI.willReturnSuccessfulSignUp();
+
+        final MockBaseCallback<DatabaseUser> callback = new MockBaseCallback<>();
+        client.createUser(SUPPORT_AUTH0_COM, PASSWORD, null)
+                .start(callback);
+
+        final RecordedRequest request = mockAPI.takeRequest();
+        assertThat(request.getPath(), equalTo("/dbconnections/signup"));
+
+        Map<String, String> body = bodyFromRequest(request);
+        assertThat(body, hasEntry("email", SUPPORT_AUTH0_COM));
+        assertThat(body, not(hasKey("username")));
+        assertThat(body, hasEntry("password", PASSWORD));
+
+        assertThat(callback, hasPayloadOfType(DatabaseUser.class));
+    }
+
+    @Test
+    public void shouldNotSendNullUsernameOnSignUpSync() throws Exception {
+        mockAPI.willReturnSuccessfulSignUp();
+
+        final DatabaseUser user = client.createUser(SUPPORT_AUTH0_COM, PASSWORD, null)
+                .execute();
+
+        final RecordedRequest request = mockAPI.takeRequest();
+        assertThat(request.getPath(), equalTo("/dbconnections/signup"));
+
+        Map<String, String> body = bodyFromRequest(request);
+        assertThat(body, hasEntry("email", SUPPORT_AUTH0_COM));
+        assertThat(body, not(hasKey("username")));
         assertThat(body, hasEntry("password", PASSWORD));
 
         assertThat(user, is(notNullValue()));
@@ -487,7 +524,7 @@ public void shouldSignUpUserWithoutUsername() throws Exception {
 
         Map<String, String> body = bodyFromRequest(request);
         assertThat(body, hasEntry("email", SUPPORT_AUTH0_COM));
-        assertThat(body, not(hasEntry("username", SUPPORT)));
+        assertThat(body, not(hasKey("username")));
         assertThat(body, hasEntry("password", PASSWORD));
         assertThat(body, hasEntry("connection", USERNAME_PASSWORD_AUTHENTICATION));
 
@@ -509,7 +546,7 @@ public void shouldSignUpUserWithoutUsernameSync() throws Exception {
 
         Map<String, String> body = bodyFromRequest(request);
         assertThat(body, hasEntry("email", SUPPORT_AUTH0_COM));
-        assertThat(body, hasEntry("username", null));
+        assertThat(body, not(hasKey("username")));
         assertThat(body, hasEntry("password", PASSWORD));
         assertThat(body, hasEntry("connection", USERNAME_PASSWORD_AUTHENTICATION));
 

auth0/src/test/java/com/auth0/authentication/ParameterBuilderTest.java

@@ -118,13 +118,27 @@ public void shouldAddArbitraryEntry() throws Exception {
         assertThat(builder.set("key", "value").asDictionary(), hasEntry("key", "value"));
     }
 
+    @Test
+    public void shouldNotAddNullEntry() throws Exception {
+        assertThat(builder.set("key", null).asDictionary(), not(hasEntry("key", null)));
+    }
+
     @Test
     public void shouldAddAllFromDictionary() throws Exception {
         Map<String, Object> parameters = new HashMap<>();
         parameters.put("key", "value");
         assertThat(builder.addAll(parameters).asDictionary(), hasEntry("key", "value"));
     }
 
+    @Test
+    public void shouldSkipNullValuesOnAddAllFromDictionary() throws Exception {
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("key", "value");
+        parameters.put("null", null);
+        assertThat(builder.addAll(parameters).asDictionary(), hasEntry("key", "value"));
+        assertThat(builder.addAll(parameters).asDictionary(), not(hasEntry("null", null)));
+    }
+
     @Test
     public void shouldDoNothingWhenAddingNullParameters() throws Exception {
         assertThat(builder.addAll(null).asDictionary(), hasEntry("scope", ParameterBuilder.SCOPE_OPENID));