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

Convert `AccountIdentityResponse` to a record

This commit is contained in:
Jon Chambers 2023-01-11 17:14:53 -05:00 committed by Jon Chambers
parent b4a143b9de
commit 5a89e66fc0
2 changed files with 16 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
service/src/main/java/org/whispersystems/textsecuregcm/entities/AccountIdentityResponse.java
View File

@ -5,56 +5,12 @@
package org.whispersystems.textsecuregcm.entities; package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import javax.annotation.Nullable;
import java.util.UUID; import java.util.UUID;
import javax.annotation.Nullable;
public class AccountIdentityResponse { public record AccountIdentityResponse(UUID uuid,
String number,
private final UUID uuid; UUID pni,
private final String number; @Nullable String username,
private final UUID pni; boolean storageCapable) {
@Nullable
private final String username;
private final boolean storageCapable;
@JsonCreator
public AccountIdentityResponse(
@JsonProperty("uuid") final UUID uuid,
@JsonProperty("number") final String number,
@JsonProperty("pni") final UUID pni,
@JsonProperty("username") @Nullable final String username,
@JsonProperty("storageCapable") final boolean storageCapable) {
this.uuid = uuid;
this.number = number;
this.pni = pni;
this.username = username;
this.storageCapable = storageCapable;
}
public UUID getUuid() {
return uuid;
}
public String getNumber() {
return number;
}
public UUID getPni() {
return pni;
}
@Nullable
public String getUsername() {
return username;
}
public boolean isStorageCapable() {
return storageCapable;
}
} }

20
service/src/test/java/org/whispersystems/textsecuregcm/controllers/AccountControllerTest.java
View File

@ -1002,7 +1002,7 @@ class AccountControllerTest {
.put(Entity.entity(new AccountAttributes(false, 3333, null, Hex.toStringCondensed(registration_lock_key), true, null), .put(Entity.entity(new AccountAttributes(false, 3333, null, Hex.toStringCondensed(registration_lock_key), true, null),
MediaType.APPLICATION_JSON_TYPE), AccountIdentityResponse.class); MediaType.APPLICATION_JSON_TYPE), AccountIdentityResponse.class);
assertThat(result.getUuid()).isNotNull(); assertThat(result.uuid()).isNotNull();
verify(pinLimiter).validate(eq(SENDER_REG_LOCK)); verify(pinLimiter).validate(eq(SENDER_REG_LOCK));
} }
@ -1026,7 +1026,7 @@ class AccountControllerTest {
.put(Entity.entity(new AccountAttributes(false, 3333, null, Hex.toStringCondensed(registration_lock_key), true, null), .put(Entity.entity(new AccountAttributes(false, 3333, null, Hex.toStringCondensed(registration_lock_key), true, null),
MediaType.APPLICATION_JSON_TYPE), AccountIdentityResponse.class); MediaType.APPLICATION_JSON_TYPE), AccountIdentityResponse.class);
assertThat(result.getUuid()).isNotNull(); assertThat(result.uuid()).isNotNull();
verify(pinLimiter).validate(eq(SENDER_REG_LOCK)); verify(pinLimiter).validate(eq(SENDER_REG_LOCK));
@ -1059,7 +1059,7 @@ class AccountControllerTest {
.put(Entity.entity(new AccountAttributes(false, 3333, null, null, true, null), .put(Entity.entity(new AccountAttributes(false, 3333, null, null, true, null),
MediaType.APPLICATION_JSON_TYPE), AccountIdentityResponse.class); MediaType.APPLICATION_JSON_TYPE), AccountIdentityResponse.class);
assertThat(result.getUuid()).isNotNull(); assertThat(result.uuid()).isNotNull();
verifyNoInteractions(pinLimiter); verifyNoInteractions(pinLimiter);
} finally { } finally {
@ -1225,9 +1225,9 @@ class AccountControllerTest {
verify(changeNumberManager).changeNumber(eq(AuthHelper.VALID_ACCOUNT), eq(number), any(), any(), any(), any()); verify(changeNumberManager).changeNumber(eq(AuthHelper.VALID_ACCOUNT), eq(number), any(), any(), any(), any());
assertThat(accountIdentityResponse.getUuid()).isEqualTo(AuthHelper.VALID_UUID); assertThat(accountIdentityResponse.uuid()).isEqualTo(AuthHelper.VALID_UUID);
assertThat(accountIdentityResponse.getNumber()).isEqualTo(number); assertThat(accountIdentityResponse.number()).isEqualTo(number);
assertThat(accountIdentityResponse.getPni()).isNotEqualTo(AuthHelper.VALID_PNI); assertThat(accountIdentityResponse.pni()).isNotEqualTo(AuthHelper.VALID_PNI);
} }
@Test @Test
@ -1526,9 +1526,9 @@ class AccountControllerTest {
verify(changeNumberManager).changeNumber(eq(AuthHelper.VALID_ACCOUNT), eq(number), any(), any(), any(), any()); verify(changeNumberManager).changeNumber(eq(AuthHelper.VALID_ACCOUNT), eq(number), any(), any(), any(), any());
assertThat(accountIdentityResponse.getUuid()).isEqualTo(AuthHelper.VALID_UUID); assertThat(accountIdentityResponse.uuid()).isEqualTo(AuthHelper.VALID_UUID);
assertThat(accountIdentityResponse.getNumber()).isEqualTo(number); assertThat(accountIdentityResponse.number()).isEqualTo(number);
assertThat(accountIdentityResponse.getPni()).isNotEqualTo(AuthHelper.VALID_PNI); assertThat(accountIdentityResponse.pni()).isNotEqualTo(AuthHelper.VALID_PNI);
} }
@Test @Test
@ -1634,7 +1634,7 @@ class AccountControllerTest {
.header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_UUID, AuthHelper.VALID_PASSWORD)) .header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_UUID, AuthHelper.VALID_PASSWORD))
.get(AccountIdentityResponse.class); .get(AccountIdentityResponse.class);
assertThat(response.getUuid()).isEqualTo(AuthHelper.VALID_UUID); assertThat(response.uuid()).isEqualTo(AuthHelper.VALID_UUID);
} }
@Test @Test