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

Remove usernames from profile responses

This commit is contained in:
Jon Chambers 2021-12-07 15:37:52 -05:00 committed by Jon Chambers
parent 66845d7080
commit e611a70ba4
3 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java
View File

@ -346,7 +346,6 @@ public class ProfileController {
getAcceptableLanguagesForRequest(containerRequestContext), getAcceptableLanguagesForRequest(containerRequestContext),
account.getBadges(), account.getBadges(),
isSelf), isSelf),
isSelf ? account.getUsername().orElse(null) : null,
account.getUuid()); account.getUuid());
} }

11
service/src/main/java/org/whispersystems/textsecuregcm/entities/BaseProfileResponse.java
View File

@ -5,9 +5,7 @@
package org.whispersystems.textsecuregcm.entities; package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import javax.annotation.Nullable;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
@ -28,9 +26,6 @@ public class BaseProfileResponse {
@JsonProperty @JsonProperty
private List<Badge> badges; private List<Badge> badges;
@JsonProperty
private String username;
@JsonProperty @JsonProperty
private UUID uuid; private UUID uuid;
@ -42,7 +37,6 @@ public class BaseProfileResponse {
final boolean unrestrictedUnidentifiedAccess, final boolean unrestrictedUnidentifiedAccess,
final UserCapabilities capabilities, final UserCapabilities capabilities,
final List<Badge> badges, final List<Badge> badges,
@Nullable final String username,
final UUID uuid) { final UUID uuid) {
this.identityKey = identityKey; this.identityKey = identityKey;
@ -50,7 +44,6 @@ public class BaseProfileResponse {
this.unrestrictedUnidentifiedAccess = unrestrictedUnidentifiedAccess; this.unrestrictedUnidentifiedAccess = unrestrictedUnidentifiedAccess;
this.capabilities = capabilities; this.capabilities = capabilities;
this.badges = badges; this.badges = badges;
this.username = username;
this.uuid = uuid; this.uuid = uuid;
} }
@ -74,10 +67,6 @@ public class BaseProfileResponse {
return badges; return badges;
} }
public String getUsername() {
return username;
}
public UUID getUuid() { public UUID getUuid() {
return uuid; return uuid;
} }

3
service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/ProfileControllerTest.java
View File

@ -219,7 +219,6 @@ class ProfileControllerTest {
.get(BaseProfileResponse.class); .get(BaseProfileResponse.class);
assertThat(profile.getIdentityKey()).isEqualTo("bar"); assertThat(profile.getIdentityKey()).isEqualTo("bar");
assertThat(profile.getUsername()).isNull();
assertThat(profile.getBadges()).hasSize(1).element(0).has(new Condition<>( assertThat(profile.getBadges()).hasSize(1).element(0).has(new Condition<>(
badge -> "Test Badge".equals(badge.getName()), "has badge with expected name")); badge -> "Test Badge".equals(badge.getName()), "has badge with expected name"));
@ -236,7 +235,6 @@ class ProfileControllerTest {
.get(BaseProfileResponse.class); .get(BaseProfileResponse.class);
assertThat(profile.getIdentityKey()).isEqualTo("bar"); assertThat(profile.getIdentityKey()).isEqualTo("bar");
assertThat(profile.getUsername()).isNull();
assertThat(profile.getUuid()).isEqualTo(AuthHelper.VALID_UUID_TWO); assertThat(profile.getUuid()).isEqualTo(AuthHelper.VALID_UUID_TWO);
assertThat(profile.getBadges()).hasSize(1).element(0).has(new Condition<>( assertThat(profile.getBadges()).hasSize(1).element(0).has(new Condition<>(
badge -> "Test Badge".equals(badge.getName()), "has badge with expected name")); badge -> "Test Badge".equals(badge.getName()), "has badge with expected name"));
@ -550,7 +548,6 @@ class ProfileControllerTest {
assertThat(profile.getAvatar()).isEqualTo("profiles/validavatar"); assertThat(profile.getAvatar()).isEqualTo("profiles/validavatar");
assertThat(profile.getBaseProfileResponse().getCapabilities().isGv2()).isFalse(); assertThat(profile.getBaseProfileResponse().getCapabilities().isGv2()).isFalse();
assertThat(profile.getBaseProfileResponse().getCapabilities().isGv1Migration()).isFalse(); assertThat(profile.getBaseProfileResponse().getCapabilities().isGv1Migration()).isFalse();
assertThat(profile.getBaseProfileResponse().getUsername()).isNull();
assertThat(profile.getBaseProfileResponse().getUuid()).isEqualTo(AuthHelper.VALID_UUID_TWO); assertThat(profile.getBaseProfileResponse().getUuid()).isEqualTo(AuthHelper.VALID_UUID_TWO);
assertThat(profile.getBaseProfileResponse().getBadges()).hasSize(1).element(0).has(new Condition<>( assertThat(profile.getBaseProfileResponse().getBadges()).hasSize(1).element(0).has(new Condition<>(
badge -> "Test Badge".equals(badge.getName()), "has badge with expected name")); badge -> "Test Badge".equals(badge.getName()), "has badge with expected name"));