1
0
mirror of https://github.com/bitwarden/browser.git synced 2024-09-23 03:22:50 +02:00

[PM-10914] add option to delete all folders if migration fails (#10983)

* add option to delete all folders if migration fails

* update text and flow to reattempt migration

* clear encrypted folders as well on delete all

* Update messaging
This commit is contained in:
Jake Fink 2024-09-12 13:47:35 -04:00 committed by GitHub
parent 3be5c4800b
commit 07d2e36496
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 33 additions and 3 deletions

View File

@ -7,9 +7,9 @@ import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.se
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
import { ToastService } from "@bitwarden/components"; import { DialogService, ToastService } from "@bitwarden/components";
import { SharedModule } from "../../shared"; import { SharedModule } from "../../shared";
import { UserKeyRotationModule } from "../key-rotation/user-key-rotation.module"; import { UserKeyRotationModule } from "../key-rotation/user-key-rotation.module";
@ -31,12 +31,13 @@ export class MigrateFromLegacyEncryptionComponent {
private accountService: AccountService, private accountService: AccountService,
private keyRotationService: UserKeyRotationService, private keyRotationService: UserKeyRotationService,
private i18nService: I18nService, private i18nService: I18nService,
private platformUtilsService: PlatformUtilsService,
private cryptoService: CryptoService, private cryptoService: CryptoService,
private messagingService: MessagingService, private messagingService: MessagingService,
private logService: LogService, private logService: LogService,
private syncService: SyncService, private syncService: SyncService,
private toastService: ToastService, private toastService: ToastService,
private dialogService: DialogService,
private folderApiService: FolderApiServiceAbstraction,
) {} ) {}
submit = async () => { submit = async () => {
@ -69,6 +70,23 @@ export class MigrateFromLegacyEncryptionComponent {
}); });
this.messagingService.send("logout"); this.messagingService.send("logout");
} catch (e) { } catch (e) {
// If the error is due to missing folders, we can delete all folders and try again
if (e.message === "All existing folders must be included in the rotation.") {
const deleteFolders = await this.dialogService.openSimpleDialog({
type: "warning",
title: { key: "encryptionKeyUpdateCannotProceed" },
content: { key: "keyUpdateFoldersFailed" },
acceptButtonText: { key: "ok" },
cancelButtonText: { key: "cancel" },
});
if (deleteFolders) {
await this.folderApiService.deleteAll();
await this.syncService.fullSync(true, true);
await this.submit();
return;
}
}
this.logService.error(e); this.logService.error(e);
throw e; throw e;
} }

View File

@ -3894,6 +3894,12 @@
} }
} }
}, },
"encryptionKeyUpdateCannotProceed": {
"message": "Encryption key update cannot proceed"
},
"keyUpdateFoldersFailed": {
"message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
},
"keyUpdated": { "keyUpdated": {
"message": "Key updated" "message": "Key updated"
}, },

View File

@ -5,4 +5,5 @@ export class FolderApiServiceAbstraction {
save: (folder: Folder) => Promise<any>; save: (folder: Folder) => Promise<any>;
delete: (id: string) => Promise<any>; delete: (id: string) => Promise<any>;
get: (id: string) => Promise<FolderResponse>; get: (id: string) => Promise<FolderResponse>;
deleteAll: () => Promise<void>;
} }

View File

@ -32,6 +32,11 @@ export class FolderApiService implements FolderApiServiceAbstraction {
await this.folderService.delete(id); await this.folderService.delete(id);
} }
async deleteAll(): Promise<void> {
await this.apiService.send("DELETE", "/folders/all", null, true, false);
await this.folderService.clear();
}
async get(id: string): Promise<FolderResponse> { async get(id: string): Promise<FolderResponse> {
const r = await this.apiService.send("GET", "/folders/" + id, null, true, true); const r = await this.apiService.send("GET", "/folders/" + id, null, true, true);
return new FolderResponse(r); return new FolderResponse(r);