From 1a1eab4ec02767d8d762cc69eb07427242f63e27 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Mon, 26 Jul 2021 17:18:52 -0400
Subject: [PATCH] Also clear profiles on re-registration.

---
 .../textsecuregcm/storage/AccountsManager.java             | 1 +
 .../textsecuregcm/tests/storage/AccountsManagerTest.java   | 7 ++++++-
 2 files changed, 7 insertions(+), 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
index 180e952e6..251eb96d5 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
@@ -223,6 +223,7 @@ public class AccountsManager {
         if (!originalUuid.equals(actualUuid)) {
           messagesManager.clear(actualUuid);
           keysDynamoDb.delete(actualUuid);
+          profilesManager.deleteAll(actualUuid);
         }
 
         final Tags tags;
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountsManagerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountsManagerTest.java
index cfaf3eec3..3d75ef87c 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountsManagerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountsManagerTest.java
@@ -75,6 +75,7 @@ class AccountsManagerTest {
   private ExperimentEnrollmentManager experimentEnrollmentManager;
   private KeysDynamoDb keys;
   private MessagesManager messagesManager;
+  private ProfilesManager profilesManager;
 
   private RedisAdvancedClusterCommands<String, String> commands;
   private AccountsManager accountsManager;
@@ -97,6 +98,7 @@ class AccountsManagerTest {
     experimentEnrollmentManager = mock(ExperimentEnrollmentManager.class);
     keys = mock(KeysDynamoDb.class);
     messagesManager = mock(MessagesManager.class);
+    profilesManager = mock(ProfilesManager.class);
 
     //noinspection unchecked
     commands = mock(RedisAdvancedClusterCommands.class);
@@ -119,7 +121,7 @@ class AccountsManagerTest {
         keys,
         messagesManager,
         mock(UsernamesManager.class),
-        mock(ProfilesManager.class),
+        profilesManager,
         mock(StoredVerificationCodeManager.class),
         mock(SecureStorageClient.class),
         mock(SecureBackupClient.class),
@@ -545,6 +547,7 @@ class AccountsManagerTest {
     verify(accounts).create(argThat(account -> e164.equals(account.getNumber())));
     verifyNoInteractions(keys);
     verifyNoInteractions(messagesManager);
+    verifyNoInteractions(profilesManager);
   }
 
   @Test
@@ -563,6 +566,7 @@ class AccountsManagerTest {
     verify(accounts).create(argThat(account -> e164.equals(account.getNumber()) && existingUuid.equals(account.getUuid())));
     verify(keys).delete(existingUuid);
     verify(messagesManager).clear(existingUuid);
+    verify(profilesManager).deleteAll(existingUuid);
   }
 
   @Test
@@ -584,6 +588,7 @@ class AccountsManagerTest {
     verify(accounts).create(argThat(account -> e164.equals(account.getNumber()) && recentlyDeletedUuid.equals(account.getUuid())));
     verifyNoInteractions(keys);
     verifyNoInteractions(messagesManager);
+    verifyNoInteractions(profilesManager);
   }
 
   @ParameterizedTest