Skip to content

Commit fdf0146

Browse files
Move shared code to common method
1 parent ce28001 commit fdf0146

1 file changed

Lines changed: 28 additions & 43 deletions

File tree

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

Lines changed: 28 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,6 +1395,32 @@ public Request<CreatedOtpResponse> addOtpAuthenticator(String mfaToken) {
13951395
return request;
13961396
}
13971397

1398+
private BaseRequest<CreatedOobResponse> createBaseOobRequest(String mfaToken, List<String> oobChannels, String phoneNumber) {
1399+
Asserts.assertNotNull(mfaToken, "mfa token");
1400+
Asserts.assertNotNull(oobChannels, "OOB channels");
1401+
1402+
String url = baseUrl
1403+
.newBuilder()
1404+
.addPathSegment("mfa")
1405+
.addPathSegment("associate")
1406+
.build()
1407+
.toString();
1408+
1409+
BaseRequest<CreatedOobResponse> request = new BaseRequest<>(client, null, url, HttpMethod.POST, new TypeReference<CreatedOobResponse>() {
1410+
});
1411+
1412+
request.addParameter("authenticator_types", Collections.singletonList("oob"));
1413+
request.addParameter("oob_channels", oobChannels);
1414+
request.addParameter(KEY_CLIENT_ID, clientId);
1415+
if (phoneNumber != null) {
1416+
request.addParameter("phone_number", phoneNumber);
1417+
}
1418+
addClientAuthentication(request, false);
1419+
request.addHeader("Authorization", "Bearer " + mfaToken);
1420+
1421+
return request;
1422+
}
1423+
13981424
/**
13991425
* Associates or adds a new OOB authenticator for multi-factor authentication (MFA).
14001426
* Confidential clients (Regular Web Apps) <strong>must</strong> have a client secret configured on this {@code AuthAPI} instance.
@@ -1419,28 +1445,7 @@ public Request<CreatedOtpResponse> addOtpAuthenticator(String mfaToken) {
14191445
*/
14201446
@Deprecated
14211447
public Request<CreatedOobResponse> addOobAuthenticator(String mfaToken, List<String> oobChannels, String phoneNumber) {
1422-
Asserts.assertNotNull(mfaToken, "mfa token");
1423-
Asserts.assertNotNull(oobChannels, "OOB channels");
1424-
1425-
String url = baseUrl
1426-
.newBuilder()
1427-
.addPathSegment("mfa")
1428-
.addPathSegment("associate")
1429-
.build()
1430-
.toString();
1431-
1432-
BaseRequest<CreatedOobResponse> request = new BaseRequest<>(client, null, url, HttpMethod.POST, new TypeReference<CreatedOobResponse>() {
1433-
});
1434-
1435-
request.addParameter("authenticator_types", Collections.singletonList("oob"));
1436-
request.addParameter("oob_channels", oobChannels);
1437-
request.addParameter(KEY_CLIENT_ID, clientId);
1438-
if (phoneNumber != null) {
1439-
request.addParameter("phone_number", phoneNumber);
1440-
}
1441-
addClientAuthentication(request, false);
1442-
request.addHeader("Authorization", "Bearer " + mfaToken);
1443-
return request;
1448+
return createBaseOobRequest(mfaToken, oobChannels, phoneNumber);
14441449
}
14451450

14461451
/**
@@ -1466,37 +1471,17 @@ public Request<CreatedOobResponse> addOobAuthenticator(String mfaToken, List<Str
14661471
* @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>
14671472
*/
14681473
public Request<CreatedOobResponse> addOobAuthenticator(String mfaToken, List<String> oobChannels, String phoneNumber, String emailAddress) {
1469-
Asserts.assertNotNull(mfaToken, "mfa token");
1470-
Asserts.assertNotNull(oobChannels, "OOB channels");
14711474
if (oobChannels.contains("sms") || oobChannels.contains("voice")) {
14721475
Asserts.assertNotNull(phoneNumber, "phone number");
14731476
}
14741477
if (oobChannels.contains("email")) {
14751478
Asserts.assertNotNull(emailAddress, "email address");
14761479
}
14771480

1478-
String url = baseUrl
1479-
.newBuilder()
1480-
.addPathSegment("mfa")
1481-
.addPathSegment("associate")
1482-
.build()
1483-
.toString();
1484-
1485-
BaseRequest<CreatedOobResponse> request = new BaseRequest<>(client, null, url, HttpMethod.POST, new TypeReference<CreatedOobResponse>() {
1486-
});
1487-
1488-
request.addParameter("authenticator_types", Collections.singletonList("oob"));
1489-
request.addParameter("oob_channels", oobChannels);
1490-
request.addParameter(KEY_CLIENT_ID, clientId);
1491-
1492-
if (phoneNumber != null) {
1493-
request.addParameter("phone_number", phoneNumber);
1494-
}
1481+
BaseRequest<CreatedOobResponse> request = createBaseOobRequest(mfaToken, oobChannels, phoneNumber);
14951482
if (emailAddress != null) {
14961483
request.addParameter("email", emailAddress);
14971484
}
1498-
addClientAuthentication(request, false);
1499-
request.addHeader("Authorization", "Bearer " + mfaToken);
15001485
return request;
15011486
}
15021487

0 commit comments

Comments
 (0)