mirror of
https://github.com/bitwarden/browser.git
synced 2024-11-04 09:01:01 +01:00
df9e6e21c9
* Clean up dangling behaviorSubject
* Handle null in utils
* fix null check
* Await promises, even in async functions
* Add to/fromJSON methods to State and Accounts
This is needed since all storage in manifest v3 is key-value-pair-based
and session storage of most data is actually serialized into an
encrypted string.
* Simplify AccountKeys json parsing
* Fix account key (de)serialization
* Remove unused DecodedToken state
* Correct filename typo
* Simplify keys `toJSON` tests
* Explain AccountKeys `toJSON` return type
* Remove unnecessary `any`s
* Remove unique ArrayBuffer serialization
* Initialize items in MemoryStorageService
* Revert "Fix account key (de)serialization"
This reverts commit b1dffb5c2c
, which was breaking serializations
* Move fromJSON to owning object
* Add DeepJsonify type
* Use Records for storage
* Add new Account Settings to serialized data
* Fix failing serialization tests
* Extract complex type conversion to helper methods
* Remove unnecessary decorator
* Return null from json deserializers
* Remove unnecessary decorators
* Remove obsolete test
* Use type-fest `Jsonify` formatting rules for external library
* Update jsonify comment
Co-authored-by: @eliykat
* Remove erroneous comment
* Fix unintended deep-jsonify changes
* Fix prettierignore
* Fix formatting of deep-jsonify.ts
Co-authored-by: Thomas Rittson <trittson@bitwarden.com>
Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
147 lines
4.4 KiB
TypeScript
147 lines
4.4 KiB
TypeScript
import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute";
|
|
|
|
import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service";
|
|
import { StateVersion } from "@bitwarden/common/enums/stateVersion";
|
|
import { StateFactory } from "@bitwarden/common/factories/stateFactory";
|
|
import { Account } from "@bitwarden/common/models/domain/account";
|
|
import { GlobalState } from "@bitwarden/common/models/domain/globalState";
|
|
import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service";
|
|
|
|
const userId = "USER_ID";
|
|
|
|
// Note: each test calls the private migration method for that migration,
|
|
// so that we don't accidentally run all following migrations as well
|
|
|
|
describe("State Migration Service", () => {
|
|
let storageService: SubstituteOf<AbstractStorageService>;
|
|
let secureStorageService: SubstituteOf<AbstractStorageService>;
|
|
let stateFactory: SubstituteOf<StateFactory>;
|
|
|
|
let stateMigrationService: StateMigrationService;
|
|
|
|
beforeEach(() => {
|
|
storageService = Substitute.for<AbstractStorageService>();
|
|
secureStorageService = Substitute.for<AbstractStorageService>();
|
|
stateFactory = Substitute.for<StateFactory>();
|
|
|
|
stateMigrationService = new StateMigrationService(
|
|
storageService,
|
|
secureStorageService,
|
|
stateFactory
|
|
);
|
|
});
|
|
|
|
describe("StateVersion 3 to 4 migration", () => {
|
|
beforeEach(() => {
|
|
const globalVersion3: Partial<GlobalState> = {
|
|
stateVersion: StateVersion.Three,
|
|
};
|
|
|
|
storageService.get("global", Arg.any()).resolves(globalVersion3);
|
|
storageService.get("authenticatedAccounts", Arg.any()).resolves([userId]);
|
|
});
|
|
|
|
it("clears everBeenUnlocked", async () => {
|
|
const accountVersion3: Account = {
|
|
profile: {
|
|
apiKeyClientId: null,
|
|
convertAccountToKeyConnector: null,
|
|
email: "EMAIL",
|
|
emailVerified: true,
|
|
everBeenUnlocked: true,
|
|
hasPremiumPersonally: false,
|
|
kdfIterations: 100000,
|
|
kdfType: 0,
|
|
keyHash: "KEY_HASH",
|
|
lastSync: "LAST_SYNC",
|
|
userId: userId,
|
|
usesKeyConnector: false,
|
|
forcePasswordReset: false,
|
|
},
|
|
};
|
|
|
|
const expectedAccountVersion4: Account = {
|
|
profile: {
|
|
...accountVersion3.profile,
|
|
},
|
|
};
|
|
delete expectedAccountVersion4.profile.everBeenUnlocked;
|
|
|
|
storageService.get(userId, Arg.any()).resolves(accountVersion3);
|
|
|
|
await (stateMigrationService as any).migrateStateFrom3To4();
|
|
|
|
storageService.received(1).save(userId, expectedAccountVersion4, Arg.any());
|
|
});
|
|
|
|
it("updates StateVersion number", async () => {
|
|
await (stateMigrationService as any).migrateStateFrom3To4();
|
|
|
|
storageService.received(1).save(
|
|
"global",
|
|
Arg.is((globals: GlobalState) => globals.stateVersion === StateVersion.Four),
|
|
Arg.any()
|
|
);
|
|
});
|
|
});
|
|
|
|
describe("StateVersion 4 to 5 migration", () => {
|
|
it("migrates organization keys to new format", async () => {
|
|
const accountVersion4 = new Account({
|
|
keys: {
|
|
organizationKeys: {
|
|
encrypted: {
|
|
orgOneId: "orgOneEncKey",
|
|
orgTwoId: "orgTwoEncKey",
|
|
orgThreeId: "orgThreeEncKey",
|
|
},
|
|
},
|
|
},
|
|
} as any);
|
|
|
|
const expectedAccount = new Account({
|
|
keys: {
|
|
organizationKeys: {
|
|
encrypted: {
|
|
orgOneId: {
|
|
type: "organization",
|
|
key: "orgOneEncKey",
|
|
},
|
|
orgTwoId: {
|
|
type: "organization",
|
|
key: "orgTwoEncKey",
|
|
},
|
|
orgThreeId: {
|
|
type: "organization",
|
|
key: "orgThreeEncKey",
|
|
},
|
|
},
|
|
} as any,
|
|
} as any,
|
|
});
|
|
|
|
const migratedAccount = await (stateMigrationService as any).migrateAccountFrom4To5(
|
|
accountVersion4
|
|
);
|
|
|
|
expect(migratedAccount).toEqual(expectedAccount);
|
|
});
|
|
});
|
|
|
|
describe("StateVersion 5 to 6 migration", () => {
|
|
it("deletes account.keys.legacyEtmKey value", async () => {
|
|
const accountVersion5 = new Account({
|
|
keys: {
|
|
legacyEtmKey: "legacy key",
|
|
},
|
|
} as any);
|
|
|
|
const migratedAccount = await (stateMigrationService as any).migrateAccountFrom5To6(
|
|
accountVersion5
|
|
);
|
|
|
|
expect(migratedAccount.keys.legacyEtmKey).toBeUndefined();
|
|
});
|
|
});
|
|
});
|