Clear Redis cache entries strictly after removing accounts from DynamoDB

signalapp · Dec 21, 2023 · 5d6bea5 · 5d6bea5
1 parent 057d1f0
commit 5d6bea5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
@@ -1017,7 +1017,8 @@ private CompletableFuture<Void> delete(final Account account) {
             messagesManager.clear(account.getPhoneNumberIdentifier()),
             profilesManager.deleteAll(account.getUuid()),
             registrationRecoveryPasswordsManager.removeForNumber(account.getNumber()))
-        .thenCompose(ignored -> CompletableFuture.allOf(accounts.delete(account.getUuid(), additionalWriteItems), redisDeleteAsync(account)))
+        .thenCompose(ignored -> accounts.delete(account.getUuid(), additionalWriteItems))
+        .thenCompose(ignored -> redisDeleteAsync(account))
         .thenRun(() -> RedisOperation.unchecked(() ->
             account.getDevices().forEach(device ->
                 clientPresenceManager.disconnectPresence(account.getUuid(), device.getId()))));