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

Also clear profiles on re-registration.

This commit is contained in:
Jon Chambers 2021-07-26 17:18:52 -04:00 committed by Jon Chambers
parent 3a966ef345
commit 1a1eab4ec0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
View File

@ -223,6 +223,7 @@ public class AccountsManager {
if (!originalUuid.equals(actualUuid)) { if (!originalUuid.equals(actualUuid)) {
messagesManager.clear(actualUuid); messagesManager.clear(actualUuid);
keysDynamoDb.delete(actualUuid); keysDynamoDb.delete(actualUuid);
profilesManager.deleteAll(actualUuid);
} }
final Tags tags; final Tags tags;

7
service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountsManagerTest.java
View File

@ -75,6 +75,7 @@ class AccountsManagerTest {
private ExperimentEnrollmentManager experimentEnrollmentManager; private ExperimentEnrollmentManager experimentEnrollmentManager;
private KeysDynamoDb keys; private KeysDynamoDb keys;
private MessagesManager messagesManager; private MessagesManager messagesManager;
private ProfilesManager profilesManager;
private RedisAdvancedClusterCommands<String, String> commands; private RedisAdvancedClusterCommands<String, String> commands;
private AccountsManager accountsManager; private AccountsManager accountsManager;
@ -97,6 +98,7 @@ class AccountsManagerTest {
experimentEnrollmentManager = mock(ExperimentEnrollmentManager.class); experimentEnrollmentManager = mock(ExperimentEnrollmentManager.class);
keys = mock(KeysDynamoDb.class); keys = mock(KeysDynamoDb.class);
messagesManager = mock(MessagesManager.class); messagesManager = mock(MessagesManager.class);
profilesManager = mock(ProfilesManager.class);
//noinspection unchecked //noinspection unchecked
commands = mock(RedisAdvancedClusterCommands.class); commands = mock(RedisAdvancedClusterCommands.class);
@ -119,7 +121,7 @@ class AccountsManagerTest {
keys, keys,
messagesManager, messagesManager,
mock(UsernamesManager.class), mock(UsernamesManager.class),
mock(ProfilesManager.class), profilesManager,
mock(StoredVerificationCodeManager.class), mock(StoredVerificationCodeManager.class),
mock(SecureStorageClient.class), mock(SecureStorageClient.class),
mock(SecureBackupClient.class), mock(SecureBackupClient.class),
@ -545,6 +547,7 @@ class AccountsManagerTest {
verify(accounts).create(argThat(account -> e164.equals(account.getNumber()))); verify(accounts).create(argThat(account -> e164.equals(account.getNumber())));
verifyNoInteractions(keys); verifyNoInteractions(keys);
verifyNoInteractions(messagesManager); verifyNoInteractions(messagesManager);
verifyNoInteractions(profilesManager);
} }
@Test @Test
@ -563,6 +566,7 @@ class AccountsManagerTest {
verify(accounts).create(argThat(account -> e164.equals(account.getNumber()) && existingUuid.equals(account.getUuid()))); verify(accounts).create(argThat(account -> e164.equals(account.getNumber()) && existingUuid.equals(account.getUuid())));
verify(keys).delete(existingUuid); verify(keys).delete(existingUuid);
verify(messagesManager).clear(existingUuid); verify(messagesManager).clear(existingUuid);
verify(profilesManager).deleteAll(existingUuid);
} }
@Test @Test
@ -584,6 +588,7 @@ class AccountsManagerTest {
verify(accounts).create(argThat(account -> e164.equals(account.getNumber()) && recentlyDeletedUuid.equals(account.getUuid()))); verify(accounts).create(argThat(account -> e164.equals(account.getNumber()) && recentlyDeletedUuid.equals(account.getUuid())));
verifyNoInteractions(keys); verifyNoInteractions(keys);
verifyNoInteractions(messagesManager); verifyNoInteractions(messagesManager);
verifyNoInteractions(profilesManager);
} }
@ParameterizedTest @ParameterizedTest