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

Fix bug in ignoring svr errors in account deletion flow

This commit is contained in:
Katherine 2024-09-13 12:28:31 -04:00 committed by GitHub
parent f60c9f2a15
commit d6e03f50b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -989,14 +989,14 @@ public class AccountsManager {
device.getId()))) device.getId())))
.toList(); .toList();
CompletableFuture<Void> deleteBackupFuture = secureValueRecovery2Client.deleteBackups(account.getUuid()) CompletableFuture<Void> deleteBackupFuture = secureValueRecovery2Client.deleteBackups(account.getUuid())
.exceptionally(exception -> { .exceptionally(ExceptionUtils.exceptionallyHandler(SecureValueRecoveryException.class, exception -> {
final List<String> svrStatusCodesToIgnore = dynamicConfigurationManager.getConfiguration().getSvrStatusCodesToIgnoreForAccountDeletion(); final List<String> svrStatusCodesToIgnore = dynamicConfigurationManager.getConfiguration().getSvrStatusCodesToIgnoreForAccountDeletion();
if (exception instanceof SecureValueRecoveryException e && svrStatusCodesToIgnore.contains(e.getStatusCode())) { if (svrStatusCodesToIgnore.contains(exception.getStatusCode())) {
logger.warn("Failed to delete backup for account: " + account.getUuid(), exception); logger.warn("Failed to delete backup for account: " + account.getUuid(), exception);
return null; return null;
} }
throw new CompletionException(exception); throw new CompletionException(exception);
}); }));
return CompletableFuture.allOf( return CompletableFuture.allOf(
secureStorageClient.deleteStoredData(account.getUuid()), secureStorageClient.deleteStoredData(account.getUuid()),