diff --git a/integration-tests/src/main/java/org/signal/integration/Operations.java b/integration-tests/src/main/java/org/signal/integration/Operations.java index 2eb48fd05..acf60189c 100644 --- a/integration-tests/src/main/java/org/signal/integration/Operations.java +++ b/integration-tests/src/main/java/org/signal/integration/Operations.java @@ -133,6 +133,13 @@ public final class Operations { return user; } + public record PrescribedVerificationNumber(String number, String verificationCode) {} + public static PrescribedVerificationNumber prescribedVerificationNumber() { + return new PrescribedVerificationNumber( + CONFIG.prescribedRegistrationNumber(), + CONFIG.prescribedRegistrationCode()); + } + public static void deleteUser(final TestUser user) { apiDelete("/v1/accounts/me").authorized(user).executeExpectSuccess(); } diff --git a/integration-tests/src/main/java/org/signal/integration/config/Config.java b/integration-tests/src/main/java/org/signal/integration/config/Config.java index 6c7b4a77a..ec02e1cb9 100644 --- a/integration-tests/src/main/java/org/signal/integration/config/Config.java +++ b/integration-tests/src/main/java/org/signal/integration/config/Config.java @@ -10,5 +10,7 @@ import org.whispersystems.textsecuregcm.configuration.DynamoDbClientConfiguratio public record Config(String domain, String rootCert, DynamoDbClientConfiguration dynamoDbClientConfiguration, - DynamoDbTables dynamoDbTables) { + DynamoDbTables dynamoDbTables, + String prescribedRegistrationNumber, + String prescribedRegistrationCode) { } diff --git a/integration-tests/src/test/java/org/signal/integration/RegistrationTest.java b/integration-tests/src/test/java/org/signal/integration/RegistrationTest.java index b27faf800..a5319f7b6 100644 --- a/integration-tests/src/test/java/org/signal/integration/RegistrationTest.java +++ b/integration-tests/src/test/java/org/signal/integration/RegistrationTest.java @@ -19,7 +19,10 @@ public class RegistrationTest { public void testRegistration() throws Exception { final UpdateVerificationSessionRequest originalRequest = new UpdateVerificationSessionRequest( "test", UpdateVerificationSessionRequest.PushTokenType.FCM, null, null, null, null); - final CreateVerificationSessionRequest input = new CreateVerificationSessionRequest("+19995550102", originalRequest); + + final Operations.PrescribedVerificationNumber params = Operations.prescribedVerificationNumber(); + final CreateVerificationSessionRequest input = new CreateVerificationSessionRequest(params.number(), + originalRequest); final VerificationSessionResponse verificationSessionResponse = Operations .apiPost("/v1/verification/session", input) @@ -46,7 +49,8 @@ public class RegistrationTest { .executeExpectSuccess(VerificationSessionResponse.class); // verify code - final SubmitVerificationCodeRequest submitVerificationCodeRequest = new SubmitVerificationCodeRequest("265402"); + final SubmitVerificationCodeRequest submitVerificationCodeRequest = new SubmitVerificationCodeRequest( + params.verificationCode()); final VerificationSessionResponse codeVerified = Operations .apiPut("/v1/verification/session/%s/code".formatted(sessionId), submitVerificationCodeRequest) .executeExpectSuccess(VerificationSessionResponse.class);