Remove obsolete "recaptcha"

This commit is contained in:
Chris Eager 2024-06-24 10:28:33 -05:00 committed by Chris Eager
parent 4aadabfac0
commit 1134df88e2
3 changed files with 3 additions and 4 deletions

View File

@ -11,8 +11,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
@JsonSubTypes({ @JsonSubTypes({
@JsonSubTypes.Type(value = AnswerPushChallengeRequest.class, name = "rateLimitPushChallenge"), @JsonSubTypes.Type(value = AnswerPushChallengeRequest.class, name = "rateLimitPushChallenge"),
@JsonSubTypes.Type(value = AnswerCaptchaChallengeRequest.class, name = "captcha"), @JsonSubTypes.Type(value = AnswerCaptchaChallengeRequest.class, name = "captcha")
@JsonSubTypes.Type(value = AnswerCaptchaChallengeRequest.class, name = "recaptcha")
}) })
public abstract class AnswerChallengeRequest { public abstract class AnswerChallengeRequest {
} }

View File

@ -13,7 +13,7 @@ public class RateLimitChallengeOptionManager {
private final RateLimiters rateLimiters; 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 static final String OPTION_PUSH_CHALLENGE = "pushChallenge";
public RateLimitChallengeOptionManager(final RateLimiters rateLimiters) { public RateLimitChallengeOptionManager(final RateLimiters rateLimiters) {

View File

@ -18,7 +18,7 @@ import org.whispersystems.textsecuregcm.util.SystemMapper;
class AnswerChallengeRequestTest { class AnswerChallengeRequestTest {
@ParameterizedTest @ParameterizedTest
@ValueSource(strings = {"captcha", "recaptcha"}) @ValueSource(strings = {"captcha"})
void parse(final String type) throws JsonProcessingException { void parse(final String type) throws JsonProcessingException {
{ {
final String pushChallengeJson = """ final String pushChallengeJson = """