Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-21 01:38:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Work through the full list of supported locales when choosing a language for voice verification.

Browse Source
This commit is contained in:
Jon Chambers
2021-03-10 18:13:39 -05:00
committed by Jon Chambers
parent ca2f7d2eed
commit 0bc1369e04
7 changed files with 97 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java
View File

@@ -15,6 +15,7 @@ import io.dropwizard.auth.Auth;
import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -248,11 +249,15 @@ public class AccountController {
} else if (transport.equals("sms")) {
smsSender.deliverSmsVerification(number, client, verificationCode.getVerificationCodeDisplay());
} else if (transport.equals("voice")) {
final Optional<Locale> maybeLocale = acceptLanguage.map(Locale.LanguageRange::parse)
.flatMap(ranges -> ranges.stream().findFirst())
.map(range -> Locale.forLanguageTag(range.getRange()));
final List<Locale.LanguageRange> languageRanges;
smsSender.deliverVoxVerification(number, verificationCode.getVerificationCode(), maybeLocale);
try {
languageRanges = acceptLanguage.map(Locale.LanguageRange::parse).orElse(Collections.emptyList());
} catch (final IllegalArgumentException e) {
return Response.status(400).build();
}
smsSender.deliverVoxVerification(number, verificationCode.getVerificationCode(), languageRanges);
}
metricRegistry.meter(name(AccountController.class, "create", Util.getCountryCode(number))).mark();

15
service/src/main/java/org/whispersystems/textsecuregcm/controllers/VoiceVerificationController.java
View File

@@ -13,6 +13,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.util.List;
import java.util.Optional;
import java.util.Set;
@@ -59,19 +60,23 @@ public class VoiceVerificationController {
@POST
@Path("/description/{code}")
@Produces(MediaType.APPLICATION_XML)
public Response getDescription(@PathParam("code") String code, @QueryParam("l") String locale) {
public Response getDescription(@PathParam("code") String code, @QueryParam("l") List<String> locales) {
code = code.replaceAll("[^0-9]", "");
if (code.length() != 6) {
return Response.status(400).build();
}
if (locale != null && supportedLocales.contains(locale)) {
return getLocalizedDescription(code, locale);
for (final String locale : locales) {
if (locale != null && supportedLocales.contains(locale)) {
return getLocalizedDescription(code, locale);
}
}
if (locale != null && locale.split("-").length >= 1 && supportedLocales.contains(locale.split("-")[0])) {
return getLocalizedDescription(code, locale.split("-")[0]);
for (final String locale : locales) {
if (locale != null && locale.split("-").length >= 1 && supportedLocales.contains(locale.split("-")[0])) {
return getLocalizedDescription(code, locale.split("-")[0]);
}
}
return getLocalizedDescription(code, "en-US");

6
service/src/main/java/org/whispersystems/textsecuregcm/sms/SmsSender.java
View File

@@ -5,7 +5,9 @@
package org.whispersystems.textsecuregcm.sms;
import java.util.List;
import java.util.Locale;
import java.util.Locale.LanguageRange;
import java.util.Optional;
@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
@@ -25,7 +27,7 @@ public class SmsSender {
twilioSender.deliverSmsVerification(destination, clientType, verificationCode);
}
public void deliverVoxVerification(String destination, String verificationCode, Optional<Locale> maybeLocale) {
twilioSender.deliverVoxVerification(destination, verificationCode, maybeLocale);
public void deliverVoxVerification(String destination, String verificationCode, List<LanguageRange> languageRanges) {
twilioSender.deliverVoxVerification(destination, verificationCode, languageRanges);
}
}

26
service/src/main/java/org/whispersystems/textsecuregcm/sms/TwilioSmsSender.java
View File

@@ -23,11 +23,13 @@ import java.time.Duration;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Locale.LanguageRange;
import java.util.Map;
import java.util.Optional;
import java.util.Random;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
import java.util.stream.Collectors;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.apache.commons.lang3.StringUtils;
@@ -144,19 +146,23 @@ public class TwilioSmsSender {
}
}
public CompletableFuture<Boolean> deliverVoxVerification(String destination, String verificationCode, Optional<Locale> maybeLocale) {
public CompletableFuture<Boolean> deliverVoxVerification(String destination, String verificationCode, List<LanguageRange> languageRanges) {
String url = "https://" + localDomain + "/v1/voice/description/" + verificationCode;
if (maybeLocale.isPresent()) {
final String localeString = maybeLocale.map(locale -> {
if (StringUtils.isNotBlank(locale.getCountry())) {
return locale.getLanguage().toLowerCase() + "-" + locale.getCountry().toUpperCase();
} else {
return locale.getLanguage().toLowerCase();
}
}).get();
final String languageQueryParams = languageRanges.stream()
.map(range -> Locale.forLanguageTag(range.getRange()))
.map(locale -> {
if (StringUtils.isNotBlank(locale.getCountry())) {
return locale.getLanguage().toLowerCase() + "-" + locale.getCountry().toUpperCase();
} else {
return locale.getLanguage().toLowerCase();
}
})
.map(languageTag -> "l=" + languageTag)
.collect(Collectors.joining("&"));
url += "?l=" + localeString;
if (StringUtils.isNotBlank(languageQueryParams)) {
url += "?" + languageQueryParams;
}
Map<String, String> requestParameters = new HashMap<>();