Add DatabaseConnectionRequest

For non-authentication related requests

Author: hzalaz

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

@@ -229,7 +229,7 @@ public Request<UserProfile> tokenInfo(String idToken) {
      * @param username of the user and must be non null
      * @return a request to start
      */
-    public ParameterizableRequest<DatabaseUser> createUser(String email, String password, String username) {
+    public DatabaseConnectionRequest<DatabaseUser> createUser(String email, String password, String username) {
         HttpUrl url = HttpUrl.parse(auth0.getDomainUrl()).newBuilder()
                 .addPathSegment(DB_CONNECTIONS_PATH)
                 .addPathSegment(SIGN_UP_PATH)
@@ -242,8 +242,9 @@ public ParameterizableRequest<DatabaseUser> createUser(String email, String pass
                 .setConnection(defaultDbConnection)
                 .setClientId(getClientId())
                 .asDictionary();
-        return factory.POST(url, client, mapper, DatabaseUser.class)
+        final ParameterizableRequest<DatabaseUser> request = factory.POST(url, client, mapper, DatabaseUser.class)
                 .addParameters(parameters);
+        return new DatabaseConnectionRequest(request);
     }
 
     /**
@@ -253,7 +254,7 @@ public ParameterizableRequest<DatabaseUser> createUser(String email, String pass
      * @param password of the user and must be non null
      * @return a request to start
      */
-    public ParameterizableRequest<DatabaseUser> createUser(String email, String password) {
+    public DatabaseConnectionRequest<DatabaseUser> createUser(String email, String password) {
         return createUser(email, password, null);
     }
 
@@ -267,7 +268,7 @@ public ParameterizableRequest<DatabaseUser> createUser(String email, String pass
      * @return a request to configure and start that will yield {@link Credentials}
      */
     public SignUpRequest signUp(String email, String password, String username) {
-        final ParameterizableRequest<DatabaseUser> createUserRequest = createUser(email, password, username);
+        final DatabaseConnectionRequest<DatabaseUser> createUserRequest = createUser(email, password, username);
         final AuthenticationRequest authenticationRequest = login(email, password);
         return new SignUpRequest(createUserRequest, authenticationRequest);
     }
@@ -281,7 +282,7 @@ public SignUpRequest signUp(String email, String password, String username) {
      * @return a request to configure and start that will yield {@link Credentials}
      */
     public SignUpRequest signUp(String email, String password) {
-        ParameterizableRequest<DatabaseUser> createUserRequest = createUser(email, password);
+        DatabaseConnectionRequest<DatabaseUser> createUserRequest = createUser(email, password);
         final AuthenticationRequest authenticationRequest = login(email, password);
         return new SignUpRequest(createUserRequest, authenticationRequest);
     }
@@ -292,7 +293,7 @@ public SignUpRequest signUp(String email, String password) {
      * @param email of the user that changes the password. It's also where the email will be sent with the link to perform the change password.
      * @return a request to configure and start
      */
-    public ChangePasswordRequest requestChangePassword(String email) {
+    public ParameterizableRequest<Void> requestChangePassword(String email) {
         HttpUrl url = HttpUrl.parse(auth0.getDomainUrl()).newBuilder()
                 .addPathSegment(DB_CONNECTIONS_PATH)
                 .addPathSegment(CHANGE_PASSWORD_PATH)
@@ -303,9 +304,8 @@ public ChangePasswordRequest requestChangePassword(String email) {
                 .setClientId(getClientId())
                 .setConnection(defaultDbConnection)
                 .asDictionary();
-        ParameterizableRequest<Void> request = factory.POST(url, client, mapper)
+        return factory.POST(url, client, mapper)
                 .addParameters(parameters);
-        return new ChangePasswordRequest(request);
     }
 
     /**

lib/src/main/java/com/auth0/authentication/ChangePasswordRequest.java

@@ -0,0 +1,79 @@
+package com.auth0.authentication;
+
+import com.auth0.Auth0Exception;
+import com.auth0.callback.BaseCallback;
+import com.auth0.request.ParameterizableRequest;
+
+import java.util.Map;
+
+/**
+ * Request to perform a non-authentication related action
+ * like creating a user or requesting a change password
+ */
+public class DatabaseConnectionRequest<T> {
+
+    private final ParameterizableRequest<T> request;
+
+    public DatabaseConnectionRequest(ParameterizableRequest<T> request) {
+        this.request = request;
+    }
+
+    /**
+     * Add the given parameters to the request
+     * @param parameters to be sent with the request
+     * @return itself
+     */
+    public DatabaseConnectionRequest<T> addParameters(Map<String, Object> parameters) {
+        request.addParameters(parameters);
+        return this;
+    }
+
+    /**
+     * Add a parameter by name to the request
+     * @param name of the parameter
+     * @param value of the parameter
+     * @return itself
+     */
+    public DatabaseConnectionRequest<T> addParameter(String name, Object value) {
+        request.addParameter(name, value);
+        return this;
+    }
+
+    /**
+     * Add a header for the request, e.g. "Authorization"
+     * @param name of the header
+     * @param value of the header
+     * @return itself
+     */
+    public DatabaseConnectionRequest<T> addHeader(String name, String value) {
+        request.addHeader(name, value);
+        return this;
+    }
+
+    /**
+     * Set the Auth0 Database Connection used for this request using its name.
+     * @param connection name
+     * @return itself
+     */
+    public DatabaseConnectionRequest<T> setConnection(String connection) {
+        request.addParameter(ParameterBuilder.CONNECTION_KEY, connection);
+        return this;
+    }
+
+    /**
+     * Executes the request async and returns its results via callback
+     * @param callback called on success or failure of the request
+     */
+    public void start(BaseCallback<T> callback) {
+        request.start(callback);
+    }
+
+    /**
+     * Executes the request synchronously
+     * @return the request result
+     * @throws Auth0Exception if the request failed
+     */
+    public T execute() throws Auth0Exception {
+        return request.execute();
+    }
+}

lib/src/main/java/com/auth0/authentication/DatabaseConnectionRequest.java

@@ -39,10 +39,10 @@
  */
 public class SignUpRequest implements Request<Credentials> {
 
-    private final ParameterizableRequest<DatabaseUser> signUpRequest;
+    private final DatabaseConnectionRequest<DatabaseUser> signUpRequest;
     private final AuthenticationRequest authenticationRequest;
 
-    SignUpRequest(ParameterizableRequest<DatabaseUser> signUpRequest, AuthenticationRequest authenticationRequest) {
+    SignUpRequest(DatabaseConnectionRequest<DatabaseUser> signUpRequest, AuthenticationRequest authenticationRequest) {
         this.signUpRequest = signUpRequest;
         this.authenticationRequest = authenticationRequest;
     }
@@ -83,6 +83,7 @@ public SignUpRequest setScope(String scope) {
      * @return itself
      */
     public SignUpRequest setConnection(String connection) {
+        signUpRequest.setConnection(connection);
         authenticationRequest.setConnection(connection);
         return this;
     }

lib/src/main/java/com/auth0/authentication/SignUpRequest.java

@@ -531,7 +531,6 @@ public void shouldChangePassword() throws Exception {
 
         final MockBaseCallback<Void> callback = new MockBaseCallback<>();
         client.requestChangePassword("support@auth0.com")
-                .setNewPassword("123123123")
                 .start(callback);
 
         final RecordedRequest request = mockAPI.takeRequest();
@@ -540,7 +539,6 @@ public void shouldChangePassword() throws Exception {
         Map<String, String> body = bodyFromRequest(request);
         assertThat(body, hasEntry("email", "support@auth0.com"));
         assertThat(body, not(hasKey("username")));
-        assertThat(body, hasEntry("password", "123123123"));
 
         assertThat(callback, hasNoError());
     }
@@ -550,7 +548,6 @@ public void shouldChangePasswordSync() throws Exception {
         mockAPI.willReturnSuccessfulChangePassword();
 
         client.requestChangePassword("support@auth0.com")
-                .setNewPassword("123123123")
                 .execute();
 
         final RecordedRequest request = mockAPI.takeRequest();
@@ -559,7 +556,6 @@ public void shouldChangePasswordSync() throws Exception {
         Map<String, String> body = bodyFromRequest(request);
         assertThat(body, hasEntry("email", "support@auth0.com"));
         assertThat(body, not(hasKey("username")));
-        assertThat(body, hasEntry("password", "123123123"));
     }
 
     @Test