Consolidate to a single method

Author: JoaoSouMoreira

src/main/java/com/auth0/client/auth/AuthAPI.java

@@ -1396,7 +1396,7 @@ public Request<CreatedOtpResponse> addOtpAuthenticator(String mfaToken) {
     }
 
     /**
-     * Associates or adds a new phone based OOB authenticator for multi-factor authentication (MFA).
+     * Associates or adds a new OOB authenticator for multi-factor authentication (MFA).
      * Confidential clients (Regular Web Apps) <strong>must</strong> have a client secret configured on this {@code AuthAPI} instance.
      * <pre>
      * {@code
@@ -1413,12 +1413,19 @@ public Request<CreatedOtpResponse> addOtpAuthenticator(String mfaToken) {
      * @param mfaToken The token received from mfa_required error. Must not be null.
      * @param oobChannels The type of OOB channels supported by the client. Must not be null.
      * @param phoneNumber The phone number for "sms" or "voice" channels. May be null if not using "sms" or "voice".
+     * @param emailAddress The  email address for "email" channel. May be null if not using "email".
      * @return a Request to execute.
      * @see <a href="https://auth0.com/docs/secure/multi-factor-authentication/authenticate-using-ropg-flow-with-mfa/enroll-challenge-sms-voice-authenticators#enroll-with-sms-or-voice">Enroll with SMS or voice</a>
      */
-    public Request<CreatedOobResponse> addPhoneOobAuthenticator(String mfaToken, List<String> oobChannels, String phoneNumber) {
+    public Request<CreatedOobResponse> addOobAuthenticator(String mfaToken, List<String> oobChannels, String phoneNumber, String emailAddress) {
         Asserts.assertNotNull(mfaToken, "mfa token");
         Asserts.assertNotNull(oobChannels, "OOB channels");
+        if (oobChannels.contains("sms") || oobChannels.contains("voice")) {
+            Asserts.assertNotNull(phoneNumber, "phone number");
+        }
+        if (oobChannels.contains("email")) {
+            Asserts.assertNotNull(emailAddress, "email address");
+        }
 
         String url = baseUrl
             .newBuilder()
@@ -1433,57 +1440,18 @@ public Request<CreatedOobResponse> addPhoneOobAuthenticator(String mfaToken, Lis
         request.addParameter("authenticator_types", Collections.singletonList("oob"));
         request.addParameter("oob_channels", oobChannels);
         request.addParameter(KEY_CLIENT_ID, clientId);
+
         if (phoneNumber != null) {
             request.addParameter("phone_number", phoneNumber);
         }
+        if (emailAddress != null) {
+            request.addParameter("email", emailAddress);
+        }
         addClientAuthentication(request, false);
         request.addHeader("Authorization", "Bearer " + mfaToken);
         return request;
     }
 
-    /**
-     * Associates or adds a new email based OOB authenticator for multi-factor authentication (MFA).
-     * Confidential clients (Regular Web Apps) <strong>must</strong> have a client secret configured on this {@code AuthAPI} instance.
-     * <pre>
-     * {@code
-     * try {
-     *      CreatedOobResponse result = authAPI.addOobAuthenticator("the-mfa-token", "email-address")
-     *          .execute()
-     *          .getBody();
-     * } catch (Auth0Exception e) {
-     *      //Something happened
-     * }
-     * }
-     * </pre>
-     *
-     * @param mfaToken The token received from mfa_required error. Must not be null.
-     * @param emailAddress The email address for "email" channel.
-     * @return a Request to execute.
-     * @see <a href="https://auth0.com/docs/secure/multi-factor-authentication/authenticate-using-ropg-flow-with-mfa/enroll-and-challenge-email-authenticators#enroll-with-email">Enroll with email</a>
-     */
-    public Request<CreatedOobResponse> addEmailOobAuthenticator(String mfaToken, String emailAddress) {
-        Asserts.assertNotNull(mfaToken, "mfa token");
-
-        String url = baseUrl
-            .newBuilder()
-            .addPathSegment("mfa")
-            .addPathSegment("associate")
-            .build()
-            .toString();
-
-        BaseRequest<CreatedOobResponse> request = new BaseRequest<>(client, null, url, HttpMethod.POST, new TypeReference<CreatedOobResponse>() {
-        });
-
-        request.addParameter("authenticator_types", Collections.singletonList("oob"));
-        request.addParameter("oob_channels",  Collections.singletonList("email"));
-        request.addParameter(KEY_CLIENT_ID, clientId);
-        request.addParameter("email", emailAddress);
-        addClientAuthentication(request, false);
-        request.addHeader("Authorization", "Bearer " + mfaToken);
-        return request;
-    }
-
-
     /**
      * Returns a list of authenticators associated with your application.
      * <pre>

src/test/java/com/auth0/client/auth/AuthAPITest.java

@@ -1542,53 +1542,36 @@ public void addOtpAuthenticatorRequest() throws Exception {
     }
 
     @Test
-    public void addPhoneOobAuthenticatorThrowsWhenTokenNull() {
+    public void addOobAuthenticatorThrowsWhenTokenNull() {
         verifyThrows(IllegalArgumentException.class,
-            () -> api.addPhoneOobAuthenticator(null, Collections.singletonList("otp"), null),
+            () -> api.addOobAuthenticator(null, Collections.singletonList("otp"), null, null),
             "'mfa token' cannot be null!");
     }
 
     @Test
-    public void addPhoneOobAuthenticatorThrowsWhenChannelsNull() {
+    public void addOobAuthenticatorThrowsWhenChannelsNull() {
         verifyThrows(IllegalArgumentException.class,
-            () -> api.addPhoneOobAuthenticator("mfaToken", null, null),
+            () -> api.addOobAuthenticator("mfaToken", null, null, null),
             "'OOB channels' cannot be null!");
     }
 
     @Test
-    public void addOobAuthenticatorRequest() throws Exception {
-        Request<CreatedOobResponse> request = api.addPhoneOobAuthenticator("mfaToken", Collections.singletonList("sms"), "phone-number");
-
-        server.jsonResponse(AUTH_OOB_AUTHENTICATOR_RESPONSE, 200);
-        CreatedOobResponse response = request.execute().getBody();
-        RecordedRequest recordedRequest = server.takeRequest();
-
-        assertThat(recordedRequest, hasMethodAndPath(HttpMethod.POST, "/mfa/associate"));
-        assertThat(recordedRequest, hasHeader("Content-Type", "application/json"));
-
-        Map<String, Object> body = bodyFromRequest(recordedRequest);
-        assertThat(body, hasEntry("authenticator_types", Collections.singletonList("oob")));
-        assertThat(body, hasEntry("oob_channels", Collections.singletonList("sms")));
-        assertThat(body, hasEntry("phone_number", "phone-number"));
-
-        assertThat(response, is(notNullValue()));
-        assertThat(response.getAuthenticatorType(), not(emptyOrNullString()));
-        assertThat(response.getOobChannel(), not(emptyOrNullString()));
-        assertThat(response.getOobCode(), not(emptyOrNullString()));
-        assertThat(response.getBarcodeUri(), not(emptyOrNullString()));
-        assertThat(response.getRecoveryCodes(), notNullValue());
+    public void addOobAuthenticatorThrowsWhenPhoneNumberNull() {
+        verifyThrows(IllegalArgumentException.class,
+            () -> api.addOobAuthenticator("mfaToken", Collections.singletonList("sms"), null, null),
+            "'phone number' cannot be null!");
     }
 
     @Test
-    public void addEmailOobAuthenticatorThrowsWhenTokenNull() {
+    public void addOobAuthenticatorThrowsWhenEmailNull() {
         verifyThrows(IllegalArgumentException.class,
-            () -> api.addEmailOobAuthenticator(null, null),
-            "'mfa token' cannot be null!");
+            () -> api.addOobAuthenticator("mfaToken", Collections.singletonList("email"), null, null),
+            "'email address' cannot be null!");
     }
 
     @Test
-    public void addEmailOobAuthenticatorRequest() throws Exception {
-        Request<CreatedOobResponse> request = api.addEmailOobAuthenticator("mfaToken", "email-address");
+    public void addOobAuthenticatorRequest() throws Exception {
+        Request<CreatedOobResponse> request = api.addOobAuthenticator("mfaToken", Arrays.asList("sms", "email"), "phone-number", "email-address");
 
         server.jsonResponse(AUTH_OOB_AUTHENTICATOR_RESPONSE, 200);
         CreatedOobResponse response = request.execute().getBody();
@@ -1599,7 +1582,8 @@ public void addEmailOobAuthenticatorRequest() throws Exception {
 
         Map<String, Object> body = bodyFromRequest(recordedRequest);
         assertThat(body, hasEntry("authenticator_types", Collections.singletonList("oob")));
-        assertThat(body, hasEntry("oob_channels", Collections.singletonList("email")));
+        assertThat(body, hasEntry("oob_channels", Arrays.asList("sms", "email")));
+        assertThat(body, hasEntry("phone_number", "phone-number"));
         assertThat(body, hasEntry("email", "email-address"));
 
         assertThat(response, is(notNullValue()));