bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-11 22:13:32 +00:00
Code Issues Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Bernd Schoolmann
2026-01-07 13:46:33 +01:00
parent 34058b4486
commit 00e1f40fba
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libs/state/src/state-migrations/migrations/75-remove-user-encrypted-private-key.ts
View File

@@ -1,7 +1,11 @@
import { KeyDefinitionLike, MigrationHelper } from "../migration-helper";
import { IRREVERSIBLE, Migrator } from "../migrator";
import { SignedPublicKey,
WrappedAccountCryptographicState, EncString, SignedSecurityState } from "@bitwarden/sdk-internal";
import {
SignedPublicKey,
WrappedAccountCryptographicState,
EncString,
SignedSecurityState,
} from "@bitwarden/sdk-internal";
type ExpectedAccountType = NonNullable<unknown>;
@@ -41,12 +45,14 @@ export const accountCryptographicState: KeyDefinitionLike = {
};
export class RemoveUserEncryptedPrivateKey extends Migrator<74, 75> {
async migrate(helper: MigrationHelper): Promise<void> {
const accounts = await helper.getAccounts<ExpectedAccountType>();
for (const { userId } of accounts) {
// Check if account cryptographic state already exists
const existingAccountCryptoState = await helper.getFromUser(userId, accountCryptographicState);
const existingAccountCryptoState = await helper.getFromUser(
userId,
accountCryptographicState,
);
// Gather all individual cryptographic key state parts
const privateKey = await helper.getFromUser(userId, userEncryptedPrivateKey);
@@ -58,10 +64,20 @@ export class RemoveUserEncryptedPrivateKey extends Migrator<74, 75> {
if (!existingAccountCryptoState) {
// Build the new account cryptographic state object
let newAccountCryptographicState: WrappedAccountCryptographicState;
if (privateKey != null && signingKey == null && signedPubKey == null && accountSecurity == null) {
if (
privateKey != null &&
signingKey == null &&
signedPubKey == null &&
accountSecurity == null
) {
newAccountCryptographicState = { V1: { private_key: privateKey as EncString } };
await helper.setToUser(userId, accountCryptographicState, newAccountCryptographicState);
} else if (privateKey != null && signingKey != null && signedPubKey != null && accountSecurity != null) {
} else if (
privateKey != null &&
signingKey != null &&
signedPubKey != null &&
accountSecurity != null
) {
newAccountCryptographicState = {
V2: {
private_key: privateKey as EncString,
@@ -72,7 +88,9 @@ export class RemoveUserEncryptedPrivateKey extends Migrator<74, 75> {
};
await helper.setToUser(userId, accountCryptographicState, newAccountCryptographicState);
} else {
helper.logService.warning(`Incomplete cryptographic state for user ${userId}, skipping migration of account cryptographic state.`);
helper.logService.warning(
`Incomplete cryptographic state for user ${userId}, skipping migration of account cryptographic state.`,
);
}
}