Stop sending presentation in responses

This is no longer needed now that clients aren't reading the field.
signalapp · Mar 15, 2024 · 2ae6d9b · 2ae6d9b
1 parent f2d8bd2
commit 2ae6d9b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/src/main/java/org/signal/storageservice/groups/GroupValidator.java b/src/main/java/org/signal/storageservice/groups/GroupValidator.java
@@ -270,8 +270,6 @@ public List<ModifyMemberProfileKeyAction> validateModifyMemberProfileKeys(GroupU
       return ModifyMemberProfileKeyAction.newBuilder()
           .setUserId(ByteString.copyFrom(presentation.getUuidCiphertext().serialize()))
           .setProfileKey(ByteString.copyFrom(presentation.getProfileKeyCiphertext().serialize()))
-          .setPresentation(ByteString.copyFrom(presentation.getStructurallyValidV1PresentationBytes()))
-          // TODO: some time after clients stop reading the presentation, stop setting it here
           .build();
     }).collect(Collectors.toList());
     if (CollectionUtil.containsDuplicates(validatedActions.stream().map(ModifyMemberProfileKeyAction::getUserId))) {
@@ -289,8 +287,6 @@ public List<PromoteMemberPendingProfileKeyAction> validatePromoteMembersPendingP
       return PromoteMemberPendingProfileKeyAction.newBuilder()
           .setUserId(ByteString.copyFrom(presentation.getUuidCiphertext().serialize()))
           .setProfileKey(ByteString.copyFrom(presentation.getProfileKeyCiphertext().serialize()))
-          .setPresentation(ByteString.copyFrom(presentation.getStructurallyValidV1PresentationBytes()))
-          // TODO: some time after clients stop reading the presentation, stop setting it here
           .build();
     }).collect(Collectors.toList());
     if (CollectionUtil.containsDuplicates(validatedActions.stream().map(PromoteMemberPendingProfileKeyAction::getUserId))) {

diff --git a/src/test/java/org/signal/storageservice/controllers/GroupsControllerTest.java b/src/test/java/org/signal/storageservice/controllers/GroupsControllerTest.java
@@ -2213,7 +2213,7 @@ void testModifyMemberPresentation(final Instant issueTime, final Instant lastVal
     expectedGroupChangeResponseBuilder.getModifyMemberProfileKeysBuilder(0)
         .setUserId(ByteString.copyFrom(validUserTwoPresentationUpdate.getUuidCiphertext().serialize()))
         .setProfileKey(ByteString.copyFrom(validUserTwoPresentationUpdate.getProfileKeyCiphertext().serialize()))
-        .setPresentation(ByteString.copyFrom(validUserTwoPresentationUpdate.getStructurallyValidV1PresentationBytes()));
+        .clearPresentation();
 
     clock.pin(issueTime);
     Response response = resources.getJerseyTest()

diff --git a/src/test/java/org/signal/storageservice/controllers/GroupsV1ControllerTest.java b/src/test/java/org/signal/storageservice/controllers/GroupsV1ControllerTest.java
@@ -2082,7 +2082,7 @@ void testModifyMemberPresentation() throws Exception {
     expectedGroupChangeResponseBuilder.getModifyMemberProfileKeysBuilder(0)
         .setUserId(ByteString.copyFrom(validUserTwoPresentationUpdate.getUuidCiphertext().serialize()))
         .setProfileKey(ByteString.copyFrom(validUserTwoPresentationUpdate.getProfileKeyCiphertext().serialize()))
-        .setPresentation(ByteString.copyFrom(validUserTwoPresentationUpdate.getStructurallyValidV1PresentationBytes()));
+        .clearPresentation();
 
     Response response = resources.getJerseyTest()
                                  .target("/v1/groups/")