From 2ae6d9b838a295c9bb90601dc0816632479073fc Mon Sep 17 00:00:00 2001 From: Alex Konradi Date: Wed, 6 Mar 2024 13:21:55 -0500 Subject: [PATCH] Stop sending presentation in responses This is no longer needed now that clients aren't reading the field. --- .../java/org/signal/storageservice/groups/GroupValidator.java | 4 ---- .../storageservice/controllers/GroupsControllerTest.java | 2 +- .../storageservice/controllers/GroupsV1ControllerTest.java | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/signal/storageservice/groups/GroupValidator.java b/src/main/java/org/signal/storageservice/groups/GroupValidator.java index 2cb964d..897e623 100644 --- 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 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 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 index 5f865db..b2342b8 100644 --- 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 index 847eb04..c07aa61 100644 --- 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/")