diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/AnswerChallengeRequest.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/AnswerChallengeRequest.java index 34314f285..475a8aed6 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/AnswerChallengeRequest.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/AnswerChallengeRequest.java @@ -11,8 +11,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") @JsonSubTypes({ @JsonSubTypes.Type(value = AnswerPushChallengeRequest.class, name = "rateLimitPushChallenge"), - @JsonSubTypes.Type(value = AnswerCaptchaChallengeRequest.class, name = "captcha"), - @JsonSubTypes.Type(value = AnswerCaptchaChallengeRequest.class, name = "recaptcha") + @JsonSubTypes.Type(value = AnswerCaptchaChallengeRequest.class, name = "captcha") }) public abstract class AnswerChallengeRequest { } diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/limits/RateLimitChallengeOptionManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/limits/RateLimitChallengeOptionManager.java index b7582ed96..d3586a560 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/limits/RateLimitChallengeOptionManager.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/limits/RateLimitChallengeOptionManager.java @@ -13,7 +13,7 @@ public class RateLimitChallengeOptionManager { private final RateLimiters rateLimiters; - public static final String OPTION_CAPTCHA = "recaptcha"; + public static final String OPTION_CAPTCHA = "captcha"; public static final String OPTION_PUSH_CHALLENGE = "pushChallenge"; public RateLimitChallengeOptionManager(final RateLimiters rateLimiters) { diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/entities/AnswerChallengeRequestTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/entities/AnswerChallengeRequestTest.java index b411a3f99..331731400 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/entities/AnswerChallengeRequestTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/entities/AnswerChallengeRequestTest.java @@ -18,7 +18,7 @@ import org.whispersystems.textsecuregcm.util.SystemMapper; class AnswerChallengeRequestTest { @ParameterizedTest - @ValueSource(strings = {"captcha", "recaptcha"}) + @ValueSource(strings = {"captcha"}) void parse(final String type) throws JsonProcessingException { { final String pushChallengeJson = """