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

Adding Signal SMS verification strings.

Browse Source 
- Changes the voice verification string.
- Keeps the TextSecure SMS String for matching in Signal for Android.
- Changes TextSecure to Signal for iOS, adding tap to verify link.
- Added test for iOS query parameter.
This commit is contained in:
Frederic Jacobs
2015-11-29 16:50:11 +01:00
committed by Moxie Marlinspike
parent 85509c6d8b
commit b31a88043e
7 changed files with 53 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/test/java/org/whispersystems/textsecuregcm/tests/controllers/AccountControllerTest.java
View File

@@ -82,7 +82,21 @@ public class AccountControllerTest {
assertThat(response.getStatus()).isEqualTo(200);
verify(smsSender).deliverSmsVerification(eq(SENDER), anyString());
verify(smsSender).deliverSmsVerification(eq(SENDER), isNull(String.class), anyString());
}
@Test
public void testSendiOSCode() throws Exception {
Response response =
resources.getJerseyTest()
.target(String.format("/v1/accounts/sms/code/%s", SENDER))
.queryParam("client", "ios")
.request()
.get();
assertThat(response.getStatus()).isEqualTo(200);
verify(smsSender).deliverSmsVerification(eq(SENDER), eq("ios"), anyString());
}
@Test

8
src/test/java/org/whispersystems/textsecuregcm/tests/sms/DeliveryPreferenceTest.java
View File

@@ -21,16 +21,16 @@ public class DeliveryPreferenceTest extends TestCase {
public void testInternationalPreferenceOff() throws IOException, TwilioRestException {
SmsSender smsSender = new SmsSender(twilioSender, Optional.of(nexmoSender), false);
smsSender.deliverSmsVerification("+441112223333", "123-456");
verify(nexmoSender).deliverSmsVerification("+441112223333", "123-456");
smsSender.deliverSmsVerification("+441112223333", null, "123-456");
verify(nexmoSender).deliverSmsVerification("+441112223333", null, "123-456");
verifyNoMoreInteractions(twilioSender);
}
public void testInternationalPreferenceOn() throws IOException, TwilioRestException {
SmsSender smsSender = new SmsSender(twilioSender, Optional.of(nexmoSender), true);
smsSender.deliverSmsVerification("+441112223333", "123-456");
verify(twilioSender).deliverSmsVerification("+441112223333", "123-456");
smsSender.deliverSmsVerification("+441112223333", null, "123-456");
verify(twilioSender).deliverSmsVerification("+441112223333", null, "123-456");
verifyNoMoreInteractions(nexmoSender);
}
}

8
src/test/java/org/whispersystems/textsecuregcm/tests/sms/TwilioFallbackTest.java
View File

@@ -19,16 +19,16 @@ public class TwilioFallbackTest extends TestCase {
@Override
protected void setUp() throws IOException, TwilioRestException {
doThrow(new TwilioRestException("foo", 404)).when(twilioSender).deliverSmsVerification(anyString(), anyString());
doThrow(new TwilioRestException("foo", 404)).when(twilioSender).deliverSmsVerification(anyString(), anyString(), anyString());
doThrow(new TwilioRestException("bar", 405)).when(twilioSender).deliverVoxVerification(anyString(), anyString());
}
public void testNexmoSmsFallback() throws IOException, TwilioRestException {
SmsSender smsSender = new SmsSender(twilioSender, Optional.of(nexmoSender), true);
smsSender.deliverSmsVerification("+442223334444", "123-456");
smsSender.deliverSmsVerification("+442223334444", null, "123-456");
verify(nexmoSender).deliverSmsVerification("+442223334444", "123-456");
verify(twilioSender).deliverSmsVerification("+442223334444", "123-456");
verify(nexmoSender).deliverSmsVerification("+442223334444", null, "123-456");
verify(twilioSender).deliverSmsVerification("+442223334444", null, "123-456");
}
public void testNexmoVoxFallback() throws IOException, TwilioRestException {