mirror of
https://github.com/bitwarden/browser
synced 2026-02-10 13:40:06 +00:00
* [PM-18707] Use different BroadcasterSubscriptionId in base view component to avoid collision with desktop view component * [PM-18707] Use userId instead of payloadUserId for cipher notification syncs * [PM-19032] Live Sync on Desktop (#13851) * migrate the vault-items to an observables rather than async/promises - this helps keep data in sync with the service state and avoids race conditions * migrate the view component to an observables rather than async/promises - this helps keep data in sync with the service state and avoids race conditions * decrypt saved cipher from server * bump timeout for upserting ciphers * mark `go` as async in desktop vault - previously it was a floating promise * Revert "mark `go` as async in desktop vault" This reverts commitfd28f40b18. * Revert "bump timeout for upserting ciphers" This reverts commite963acc377. * move vault utilities to `common` rather than `lib` to avoid circular dependencies * use `perUserCache$` for `cipherViews$` to avoid new subscriptions from being created * use userId from observable rather than locally set to be the most up to date * [PM-18707] Add clearBuffer$ input to perUserCache$ helper so that the internal share replay buffers can be cleared * [PM-18707] Rework forceCipherViews$ to clearBuffer$ refactor - Add dependency for cipherDecryptionKeys$ for the cipherViews so that decryption is never attempted without keys * [PM-18707] Add overload to perUserCache to satisfy type checker * [PM-18707] Fix overloads * [PM-18707] Add check for empty failed to decrypt ciphers * [PM-18707] Mark vault component for check after observable emits. The cipherViews$ observable now persists between subscriptions, meaning that updates via the sync push notifications can occur outside the AngularZone causing delays in updating the view. --------- Co-authored-by: Nick Krantz <125900171+nick-livefront@users.noreply.github.com> Co-authored-by: Nick Krantz <nick@livefront.com>
167 lines
4.8 KiB
TypeScript
167 lines
4.8 KiB
TypeScript
// FIXME: Update this file to be type safe and remove this and next line
|
|
// @ts-strict-ignore
|
|
import { Directive, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angular/core";
|
|
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
|
|
import {
|
|
BehaviorSubject,
|
|
Subject,
|
|
combineLatest,
|
|
filter,
|
|
from,
|
|
of,
|
|
switchMap,
|
|
takeUntil,
|
|
} from "rxjs";
|
|
|
|
import { SearchService } from "@bitwarden/common/abstractions/search.service";
|
|
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
|
|
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
|
|
import { getUserId } from "@bitwarden/common/auth/services/account.service";
|
|
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
|
|
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
|
|
|
|
@Directive()
|
|
export class VaultItemsComponent implements OnInit, OnDestroy {
|
|
@Input() activeCipherId: string = null;
|
|
@Output() onCipherClicked = new EventEmitter<CipherView>();
|
|
@Output() onCipherRightClicked = new EventEmitter<CipherView>();
|
|
@Output() onAddCipher = new EventEmitter();
|
|
@Output() onAddCipherOptions = new EventEmitter();
|
|
|
|
loaded = false;
|
|
ciphers: CipherView[] = [];
|
|
deleted = false;
|
|
organization: Organization;
|
|
|
|
protected searchPending = false;
|
|
|
|
/** Construct filters as an observable so it can be appended to the cipher stream. */
|
|
private _filter$ = new BehaviorSubject<(cipher: CipherView) => boolean | null>(null);
|
|
private destroy$ = new Subject<void>();
|
|
private isSearchable: boolean = false;
|
|
private _searchText$ = new BehaviorSubject<string>("");
|
|
|
|
get searchText() {
|
|
return this._searchText$.value;
|
|
}
|
|
set searchText(value: string) {
|
|
this._searchText$.next(value);
|
|
}
|
|
|
|
get filter() {
|
|
return this._filter$.value;
|
|
}
|
|
|
|
set filter(value: (cipher: CipherView) => boolean | null) {
|
|
this._filter$.next(value);
|
|
}
|
|
|
|
constructor(
|
|
protected searchService: SearchService,
|
|
protected cipherService: CipherService,
|
|
protected accountService: AccountService,
|
|
) {
|
|
this.subscribeToCiphers();
|
|
}
|
|
|
|
async ngOnInit() {
|
|
combineLatest([getUserId(this.accountService.activeAccount$), this._searchText$])
|
|
.pipe(
|
|
switchMap(([userId, searchText]) =>
|
|
from(this.searchService.isSearchable(userId, searchText)),
|
|
),
|
|
takeUntil(this.destroy$),
|
|
)
|
|
.subscribe((isSearchable) => {
|
|
this.isSearchable = isSearchable;
|
|
});
|
|
}
|
|
|
|
ngOnDestroy(): void {
|
|
this.destroy$.next();
|
|
this.destroy$.complete();
|
|
}
|
|
|
|
async load(filter: (cipher: CipherView) => boolean = null, deleted = false) {
|
|
this.deleted = deleted ?? false;
|
|
await this.applyFilter(filter);
|
|
this.loaded = true;
|
|
}
|
|
|
|
async reload(filter: (cipher: CipherView) => boolean = null, deleted = false) {
|
|
this.loaded = false;
|
|
await this.load(filter, deleted);
|
|
}
|
|
|
|
async refresh() {
|
|
await this.reload(this.filter, this.deleted);
|
|
}
|
|
|
|
async applyFilter(filter: (cipher: CipherView) => boolean = null) {
|
|
this.filter = filter;
|
|
}
|
|
|
|
selectCipher(cipher: CipherView) {
|
|
this.onCipherClicked.emit(cipher);
|
|
}
|
|
|
|
rightClickCipher(cipher: CipherView) {
|
|
this.onCipherRightClicked.emit(cipher);
|
|
}
|
|
|
|
addCipher() {
|
|
this.onAddCipher.emit();
|
|
}
|
|
|
|
addCipherOptions() {
|
|
this.onAddCipherOptions.emit();
|
|
}
|
|
|
|
isSearching() {
|
|
return !this.searchPending && this.isSearchable;
|
|
}
|
|
|
|
protected deletedFilter: (cipher: CipherView) => boolean = (c) => c.isDeleted === this.deleted;
|
|
|
|
/**
|
|
* Creates stream of dependencies that results in the list of ciphers to display
|
|
* within the vault list.
|
|
*
|
|
* Note: This previously used promises but race conditions with how the ciphers were
|
|
* stored in electron. Using observables is more reliable as fresh values will always
|
|
* cascade through the components.
|
|
*/
|
|
private subscribeToCiphers() {
|
|
getUserId(this.accountService.activeAccount$)
|
|
.pipe(
|
|
switchMap((userId) =>
|
|
combineLatest([
|
|
this.cipherService.cipherViews$(userId).pipe(filter((ciphers) => ciphers != null)),
|
|
this.cipherService.failedToDecryptCiphers$(userId),
|
|
this._searchText$,
|
|
this._filter$,
|
|
of(userId),
|
|
]),
|
|
),
|
|
switchMap(([indexedCiphers, failedCiphers, searchText, filter, userId]) => {
|
|
let allCiphers = indexedCiphers ?? [];
|
|
const _failedCiphers = failedCiphers ?? [];
|
|
|
|
allCiphers = [..._failedCiphers, ...allCiphers];
|
|
|
|
return this.searchService.searchCiphers(
|
|
userId,
|
|
searchText,
|
|
[filter, this.deletedFilter],
|
|
allCiphers,
|
|
);
|
|
}),
|
|
takeUntilDestroyed(),
|
|
)
|
|
.subscribe((ciphers) => {
|
|
this.ciphers = ciphers;
|
|
this.loaded = true;
|
|
});
|
|
}
|
|
}
|