Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-10-24 08:09:59 +02:00
Code Issues Projects Releases Wiki Activity

Move state definitions to separate file

Browse Source
This commit is contained in:
Thomas Rittson 2024-10-24 12:01:57 +10:00
parent ea23acc988
commit 7cb48b488b
No known key found for this signature in database
GPG Key ID: CDDDA03861C35E27
3 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libs/admin-console/src/common/collections/services/collection-vNext.state.ts Normal file
View File

@ -0,0 +1,37 @@
import { Jsonify } from "type-fest";
import {
COLLECTION_DATA,
DeriveDefinition,
UserKeyDefinition,
} from "@bitwarden/common/platform/state";
import { CollectionId, OrganizationId } from "@bitwarden/common/types/guid";
import { OrgKey } from "@bitwarden/common/types/key";
import { CollectionvNextService } from "../abstractions/collection-vNext.service";
import { Collection, CollectionData, CollectionView } from "../models";
export const ENCRYPTED_COLLECTION_DATA_KEY = UserKeyDefinition.record<CollectionData, CollectionId>(
COLLECTION_DATA,
"collections",
{
deserializer: (jsonData: Jsonify<CollectionData>) => CollectionData.fromJSON(jsonData),
clearOn: ["logout"],
},
);
export const DECRYPTED_COLLECTION_DATA_KEY = new DeriveDefinition<
[Record<CollectionId, CollectionData>, Record<OrganizationId, OrgKey>],
CollectionView[],
{ collectionService: CollectionvNextService }
>(COLLECTION_DATA, "decryptedCollections", {
deserializer: (obj) => obj.map((collection) => CollectionView.fromJSON(collection)),
derive: async ([collections, orgKeys], { collectionService }) => {
if (collections == null) {
return [];
}
const data = Object.values(collections).map((c) => new Collection(c));
return await collectionService.decryptMany(data, orgKeys);
},
});

6
libs/admin-console/src/common/collections/services/default-collection-vNext.service.spec.ts
View File

@ -19,10 +19,8 @@ import { OrgKey } from "@bitwarden/common/types/key";
import { CollectionData, CollectionView } from "../models";
import {
DefaultCollectionvNextService,
ENCRYPTED_COLLECTION_DATA_KEY,
} from "./default-collection-vNext.service";
import { ENCRYPTED_COLLECTION_DATA_KEY } from "./collection-vNext.state";
import { DefaultCollectionvNextService } from "./default-collection-vNext.service";
describe("DefaultCollectionService", () => {
let cryptoService: MockProxy<CryptoService>;

38
libs/admin-console/src/common/collections/services/default-collection-vNext.service.ts
View File

@ -1,18 +1,10 @@
import { combineLatest, firstValueFrom, map, Observable, of, switchMap } from "rxjs";
import { Jsonify } from "type-fest";
import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import {
ActiveUserState,
StateProvider,
COLLECTION_DATA,
DeriveDefinition,
DerivedState,
UserKeyDefinition,
} from "@bitwarden/common/platform/state";
import { ActiveUserState, StateProvider, DerivedState } from "@bitwarden/common/platform/state";
import { CollectionId, OrganizationId, UserId } from "@bitwarden/common/types/guid";
import { OrgKey } from "@bitwarden/common/types/key";
import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
@ -21,30 +13,10 @@ import { ServiceUtils } from "@bitwarden/common/vault/service-utils";
import { CollectionvNextService } from "../abstractions/collection-vNext.service";
import { Collection, CollectionData, CollectionView } from "../models";
export const ENCRYPTED_COLLECTION_DATA_KEY = UserKeyDefinition.record<CollectionData, CollectionId>(
COLLECTION_DATA,
"collections",
{
deserializer: (jsonData: Jsonify<CollectionData>) => CollectionData.fromJSON(jsonData),
clearOn: ["logout"],
},
);
const DECRYPTED_COLLECTION_DATA_KEY = new DeriveDefinition<
[Record<CollectionId, CollectionData>, Record<OrganizationId, OrgKey>],
CollectionView[],
{ collectionService: DefaultCollectionvNextService }
>(COLLECTION_DATA, "decryptedCollections", {
deserializer: (obj) => obj.map((collection) => CollectionView.fromJSON(collection)),
derive: async ([collections, orgKeys], { collectionService }) => {
if (collections == null) {
return [];
}
const data = Object.values(collections).map((c) => new Collection(c));
return await collectionService.decryptMany(data, orgKeys);
},
});
import {
DECRYPTED_COLLECTION_DATA_KEY,
ENCRYPTED_COLLECTION_DATA_KEY,
} from "./collection-vNext.state";
const NestingDelimiter = "/";