MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add `@E164` to `ChangeNumberRequest`

This commit is contained in:
Chris Eager 2024-11-22 15:00:59 -06:00 committed by Chris Eager
parent 1c3cf39b8a
commit cba56f3263
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/main/java/org/whispersystems/textsecuregcm/entities/ChangeNumberRequest.java
View File

@ -20,6 +20,7 @@ import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import org.signal.libsignal.protocol.IdentityKey; import org.signal.libsignal.protocol.IdentityKey;
import org.whispersystems.textsecuregcm.util.ByteArrayAdapter; import org.whispersystems.textsecuregcm.util.ByteArrayAdapter;
import org.whispersystems.textsecuregcm.util.E164;
import org.whispersystems.textsecuregcm.util.IdentityKeyAdapter; import org.whispersystems.textsecuregcm.util.IdentityKeyAdapter;
import org.whispersystems.textsecuregcm.util.RegistrationIdValidator; import org.whispersystems.textsecuregcm.util.RegistrationIdValidator;
@ -34,6 +35,7 @@ public record ChangeNumberRequest(
Must not be combined with `sessionId`.""") Must not be combined with `sessionId`.""")
@JsonDeserialize(using = ByteArrayAdapter.Deserializing.class) byte[] recoveryPassword, @JsonDeserialize(using = ByteArrayAdapter.Deserializing.class) byte[] recoveryPassword,
@E164
@Schema(description="the new phone number for this account") @Schema(description="the new phone number for this account")
@NotBlank String number, @NotBlank String number,

18
service/src/test/java/org/whispersystems/textsecuregcm/controllers/AccountControllerV2Test.java
View File

@ -217,6 +217,24 @@ class AccountControllerV2Test {
assertEquals(AuthHelper.VALID_PNI, accountIdentityResponse.pni()); assertEquals(AuthHelper.VALID_PNI, accountIdentityResponse.pni());
} }
@Test
void changeNumberNonNormalizedNumber() throws Exception {
try (Response response = resources.getJerseyTest()
.target("/v2/accounts/number")
.request()
.header(HttpHeaders.AUTHORIZATION,
AuthHelper.getAuthHeader(AuthHelper.VALID_UUID, AuthHelper.VALID_PASSWORD))
.put(Entity.entity(
// +4407700900111 is a valid number but not normalized - it has an optional '0' after the country code
new ChangeNumberRequest(encodeSessionId("session"), null, "+4407700900111", null,
new IdentityKey(Curve.generateKeyPair().getPublicKey()),
Collections.emptyList(),
Collections.emptyMap(), null, Collections.emptyMap()),
MediaType.APPLICATION_JSON_TYPE))) {
assertEquals(422, response.getStatus());
}
}
@Test @Test
void unprocessableRequestJson() { void unprocessableRequestJson() {
final Invocation.Builder request = resources.getJerseyTest() final Invocation.Builder request = resources.getJerseyTest()