mirror of
https://github.com/bitwarden/browser
synced 2025-12-06 00:13:28 +00:00
* [EC-14] initial refactoring of vault filter * [EC-14] return observable trees for all filters with head node * [EC-14] Remove bindings on callbacks * [EC-14] fix formatting on disabled orgs * [EC-14] hide MyVault if personal org policy * [EC-14] add check for single org policy * [EC-14] add policies to org and change node constructor * [EC-14] don't show options if personal vault policy * [EC-14] default to all vaults * [EC-14] add default selection to filters * [EC-14] finish filter model callbacks * [EC-14] finish filter functionality and begin cleaning up * [EC-14] clean up old components and start on org vault * [EC-14] loop through filters for presentation * [EC-14] refactor VaultFilterService and put filter presentation data back into Vault Filter component. Remove VaultService * [EC-14] begin refactoring org vault * [EC-14] Refactor Vault Filter Service to use observables * [EC-14] finish org vault filter * [EC-14] fix vault model tests * [EC-14] fix org service calls * [EC-14] pull refactor out of shared code * [EC-14] include head node for collections even if collections aren't loaded yet * [EC-14] fix url params for vaults * [EC-14] remove comments * [EC-14] Remove unnecesary getter for org on vault filter * [EC-14] fix linter * [EC-14] fix prettier * [EC-14] add deprecated methods to collection service for desktop and browser * [EC-14] simplify cipher type node check * [EC-14] add getters to vault filter model * [EC-14] refactor how we build the filter list into methods * [EC-14] add getters to build filter method * [EC-14] remove param ids if false * [EC-14] fix collapsing nodes * [EC-14] add specific type to search placeholder * [EC-14] remove extra constructor and comment from org vault filter * [EC-14] extract subscription callback to methods * [EC-14] Remove unecessary await * [EC-14] Remove ternary operators while building org filter * [EC-14] remove unnecessary deps array in vault filter service declaration * [EC-14] consolidate new models into one file * [EC-14] initialize nested observable inside of service Signed-off-by: Jacob Fink <jfink@bitwarden.com> * [EC-14] change how we load orgs into the vault filter and select the default filter * [EC-14] remove get from getters name * [EC-14] remove eslint-disable comment * [EC-14] move vault filter service abstraction to angular folder and separate * [EC-14] rename filter types and delete VaultFilterLabel * [EC-14] remove changes to workspace file * [EC-14] remove deprecated service from jslib module * [EC-14] remove any remaining files from common code * [EC-14] consolidate vault filter components into components folder * [EC-14] simplify method call * [EC-14] refactor the vault filter service - orgs now have observable property - BehaviorSubjects have been migrated to ReplaySubjects if they don't need starting value - added unit tests - fix small error when selecting org badge of personal vault - renamed some properties * [EC-14] replace mergeMap with switchMap in vault filter service * [EC-14] early return to prevent nesting * [EC-14] clean up filterCollections method * [EC-14] use isDeleted helper in html * [EC-14] add jsdoc comments to ServiceUtils * [EC-14] fix linter * [EC-14] use array.slice instead of setting length * Update apps/web/src/app/vault/vault-filter/services/vault-filter.service.ts Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * [EC-14] add missing high level jsdoc description * [EC-14] fix storybook absolute imports * [EC-14] delete vault-shared.module * [EC-14] change search placeholder text to getter and add missing strings * [EC-14] remove two way binding from search text in vault filter * [EC-14] removed all binding from search text and just use input event * [EC-14] remove async from apply vault filter * [EC-14] remove circular observable calls in vault filter service Co-authored-by: Thomas Rittson <eliykat@users.noreply.github.com> * [EC-14] move collapsed nodes to vault filter section * [EC-14] deconstruct filter section inside component * [EC-14] fix merge conflicts and introduce refactored organization service to vault filter service * [EC-14] remove mutation from filter builders * [EC-14] fix styling on buildFolderTree * [EC-14] remove leftover folder-filters reference and use ternary for collapse icon * [EC-14] remove unecessary checks * [EC-14] stop rebuilding filters when the organization changes * [EC-14] Move subscription out of setter in vault filter section * [EC-14] remove extra policy service methods from vault filter service * [EC-14] remove new methods from old vault-filter.service * [EC-14] Use vault filter service in vault components * [EC-14] reload collections from vault now that we have vault filter service * [EC-14] remove currentFilterCollections in vault filter component * [EC-14] change VaultFilterType to more specific OrganizationFilter in organization-options * [EC-14] include org check in isNodeSelected * [EC-14] add getters to filter function, fix storybook, and add test for All Collections * [EC-14] show org options even if there's a personal vault policy * [EC-14] use !"AllCollections" instead of just !null * [EC-14] Remove extra org Subject in vault filter service * [EC-14] remove null check from vault search text * [EC-14] replace store/build names with set/get. Remove extra call to setOrganizationFilter * [EC-14] add take(1) to subscribe in test * [EC-14] move init logic in org vault filter component to ngOnInit * [EC-14] Fix linter * [EC-14] revert change to vault filter model * [EC-14] be specific about ignoring All Collections * [EC-14] move observable init logic to beforeEach in test * [EC-14] make buildAllFilters return something to reduce side effects Signed-off-by: Jacob Fink <jfink@bitwarden.com> Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Co-authored-by: Thomas Rittson <eliykat@users.noreply.github.com>
394 lines
14 KiB
TypeScript
394 lines
14 KiB
TypeScript
import {
|
|
ChangeDetectorRef,
|
|
Component,
|
|
NgZone,
|
|
OnDestroy,
|
|
OnInit,
|
|
ViewChild,
|
|
ViewContainerRef,
|
|
} from "@angular/core";
|
|
import { ActivatedRoute, Params, Router } from "@angular/router";
|
|
import { firstValueFrom } from "rxjs";
|
|
import { first } from "rxjs/operators";
|
|
|
|
import { ModalService } from "@bitwarden/angular/services/modal.service";
|
|
import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
|
|
import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
|
|
import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
|
|
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
|
|
import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
|
|
import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
|
|
import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service";
|
|
import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
|
|
import { StateService } from "@bitwarden/common/abstractions/state.service";
|
|
import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction";
|
|
import { TokenService } from "@bitwarden/common/abstractions/token.service";
|
|
import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils";
|
|
import { TreeNode } from "@bitwarden/common/models/domain/treeNode";
|
|
import { CipherView } from "@bitwarden/common/models/view/cipherView";
|
|
|
|
import { UpdateKeyComponent } from "../settings/update-key.component";
|
|
|
|
import { AddEditComponent } from "./add-edit.component";
|
|
import { AttachmentsComponent } from "./attachments.component";
|
|
import { CiphersComponent } from "./ciphers.component";
|
|
import { CollectionsComponent } from "./collections.component";
|
|
import { FolderAddEditComponent } from "./folder-add-edit.component";
|
|
import { ShareComponent } from "./share.component";
|
|
import { VaultFilterComponent } from "./vault-filter/components/vault-filter.component";
|
|
import { VaultFilterService } from "./vault-filter/services/abstractions/vault-filter.service";
|
|
import { VaultFilter } from "./vault-filter/shared/models/vault-filter.model";
|
|
import { FolderFilter, OrganizationFilter } from "./vault-filter/shared/models/vault-filter.type";
|
|
|
|
const BroadcasterSubscriptionId = "VaultComponent";
|
|
|
|
@Component({
|
|
selector: "app-vault",
|
|
templateUrl: "vault.component.html",
|
|
})
|
|
export class VaultComponent implements OnInit, OnDestroy {
|
|
@ViewChild("vaultFilter", { static: true }) filterComponent: VaultFilterComponent;
|
|
@ViewChild(CiphersComponent, { static: true }) ciphersComponent: CiphersComponent;
|
|
@ViewChild("attachments", { read: ViewContainerRef, static: true })
|
|
attachmentsModalRef: ViewContainerRef;
|
|
@ViewChild("folderAddEdit", { read: ViewContainerRef, static: true })
|
|
folderAddEditModalRef: ViewContainerRef;
|
|
@ViewChild("cipherAddEdit", { read: ViewContainerRef, static: true })
|
|
cipherAddEditModalRef: ViewContainerRef;
|
|
@ViewChild("share", { read: ViewContainerRef, static: true }) shareModalRef: ViewContainerRef;
|
|
@ViewChild("collections", { read: ViewContainerRef, static: true })
|
|
collectionsModalRef: ViewContainerRef;
|
|
@ViewChild("updateKeyTemplate", { read: ViewContainerRef, static: true })
|
|
updateKeyModalRef: ViewContainerRef;
|
|
|
|
showVerifyEmail = false;
|
|
showBrowserOutdated = false;
|
|
showUpdateKey = false;
|
|
showPremiumCallout = false;
|
|
trashCleanupWarning: string = null;
|
|
activeFilter: VaultFilter = new VaultFilter();
|
|
|
|
constructor(
|
|
private syncService: SyncService,
|
|
private route: ActivatedRoute,
|
|
private router: Router,
|
|
private changeDetectorRef: ChangeDetectorRef,
|
|
private i18nService: I18nService,
|
|
private modalService: ModalService,
|
|
private tokenService: TokenService,
|
|
private cryptoService: CryptoService,
|
|
private messagingService: MessagingService,
|
|
private platformUtilsService: PlatformUtilsService,
|
|
private broadcasterService: BroadcasterService,
|
|
private ngZone: NgZone,
|
|
private stateService: StateService,
|
|
private organizationService: OrganizationService,
|
|
private vaultFilterService: VaultFilterService,
|
|
private cipherService: CipherService,
|
|
private passwordRepromptService: PasswordRepromptService
|
|
) {}
|
|
|
|
async ngOnInit() {
|
|
this.showVerifyEmail = !(await this.tokenService.getEmailVerified());
|
|
this.showBrowserOutdated = window.navigator.userAgent.indexOf("MSIE") !== -1;
|
|
this.trashCleanupWarning = this.i18nService.t(
|
|
this.platformUtilsService.isSelfHost()
|
|
? "trashCleanupWarningSelfHosted"
|
|
: "trashCleanupWarning"
|
|
);
|
|
|
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
|
|
this.route.queryParams.pipe(first()).subscribe(async (params) => {
|
|
await this.syncService.fullSync(false);
|
|
const canAccessPremium = await this.stateService.getCanAccessPremium();
|
|
this.showPremiumCallout =
|
|
!this.showVerifyEmail && !canAccessPremium && !this.platformUtilsService.isSelfHost();
|
|
|
|
await this.vaultFilterService.reloadCollections();
|
|
this.showUpdateKey = !(await this.cryptoService.hasEncKey());
|
|
|
|
const cipherId = getCipherIdFromParams(params);
|
|
|
|
if (cipherId) {
|
|
const cipherView = new CipherView();
|
|
cipherView.id = cipherId;
|
|
if (params.action === "clone") {
|
|
await this.cloneCipher(cipherView);
|
|
} else if (params.action === "edit") {
|
|
await this.editCipher(cipherView);
|
|
}
|
|
}
|
|
await this.ciphersComponent.reload();
|
|
|
|
/* eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe, rxjs/no-nested-subscribe */
|
|
this.route.queryParams.subscribe(async (params) => {
|
|
const cipherId = getCipherIdFromParams(params);
|
|
if (cipherId) {
|
|
if ((await this.cipherService.get(cipherId)) != null) {
|
|
this.editCipherId(cipherId);
|
|
} else {
|
|
this.platformUtilsService.showToast(
|
|
"error",
|
|
this.i18nService.t("errorOccurred"),
|
|
this.i18nService.t("unknownCipher")
|
|
);
|
|
this.router.navigate([], {
|
|
queryParams: { itemId: null, cipherId: null },
|
|
queryParamsHandling: "merge",
|
|
});
|
|
}
|
|
}
|
|
});
|
|
|
|
this.broadcasterService.subscribe(BroadcasterSubscriptionId, (message: any) => {
|
|
this.ngZone.run(async () => {
|
|
switch (message.command) {
|
|
case "syncCompleted":
|
|
if (message.successfully) {
|
|
await Promise.all([
|
|
this.vaultFilterService.reloadCollections(),
|
|
this.ciphersComponent.load(this.ciphersComponent.filter),
|
|
]);
|
|
this.changeDetectorRef.detectChanges();
|
|
}
|
|
break;
|
|
}
|
|
});
|
|
});
|
|
});
|
|
}
|
|
|
|
get isShowingCards() {
|
|
return (
|
|
this.showBrowserOutdated ||
|
|
this.showPremiumCallout ||
|
|
this.showUpdateKey ||
|
|
this.showVerifyEmail
|
|
);
|
|
}
|
|
|
|
ngOnDestroy() {
|
|
this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
|
|
}
|
|
|
|
async applyVaultFilter(filter: VaultFilter) {
|
|
this.activeFilter = filter;
|
|
this.ciphersComponent.showAddNew = !this.activeFilter.isDeleted;
|
|
await this.ciphersComponent.reload(
|
|
this.activeFilter.buildFilter(),
|
|
this.activeFilter.isDeleted
|
|
);
|
|
this.go();
|
|
}
|
|
|
|
async applyOrganizationFilter(orgId: string) {
|
|
if (orgId == null) {
|
|
orgId = "MyVault";
|
|
}
|
|
const orgs = await firstValueFrom(this.filterComponent.filters.organizationFilter.data$);
|
|
const orgNode = ServiceUtils.getTreeNodeObject(orgs, orgId) as TreeNode<OrganizationFilter>;
|
|
this.filterComponent.filters?.organizationFilter?.action(orgNode);
|
|
}
|
|
|
|
addFolder = async (): Promise<void> => {
|
|
const [modal] = await this.modalService.openViewRef(
|
|
FolderAddEditComponent,
|
|
this.folderAddEditModalRef,
|
|
(comp) => {
|
|
comp.folderId = null;
|
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
|
|
comp.onSavedFolder.subscribe(async () => {
|
|
modal.close();
|
|
});
|
|
}
|
|
);
|
|
};
|
|
|
|
editFolder = async (folder: FolderFilter): Promise<void> => {
|
|
const [modal] = await this.modalService.openViewRef(
|
|
FolderAddEditComponent,
|
|
this.folderAddEditModalRef,
|
|
(comp) => {
|
|
comp.folderId = folder.id;
|
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
|
|
comp.onSavedFolder.subscribe(async () => {
|
|
modal.close();
|
|
});
|
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
|
|
comp.onDeletedFolder.subscribe(async () => {
|
|
modal.close();
|
|
});
|
|
}
|
|
);
|
|
};
|
|
|
|
filterSearchText(searchText: string) {
|
|
this.ciphersComponent.searchText = searchText;
|
|
this.ciphersComponent.search(200);
|
|
}
|
|
|
|
async editCipherAttachments(cipher: CipherView) {
|
|
const canAccessPremium = await this.stateService.getCanAccessPremium();
|
|
if (cipher.organizationId == null && !canAccessPremium) {
|
|
this.messagingService.send("premiumRequired");
|
|
return;
|
|
} else if (cipher.organizationId != null) {
|
|
const org = this.organizationService.get(cipher.organizationId);
|
|
if (org != null && (org.maxStorageGb == null || org.maxStorageGb === 0)) {
|
|
this.messagingService.send("upgradeOrganization", {
|
|
organizationId: cipher.organizationId,
|
|
});
|
|
return;
|
|
}
|
|
}
|
|
|
|
let madeAttachmentChanges = false;
|
|
const [modal] = await this.modalService.openViewRef(
|
|
AttachmentsComponent,
|
|
this.attachmentsModalRef,
|
|
(comp) => {
|
|
comp.cipherId = cipher.id;
|
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
|
|
comp.onUploadedAttachment.subscribe(() => (madeAttachmentChanges = true));
|
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
|
|
comp.onDeletedAttachment.subscribe(() => (madeAttachmentChanges = true));
|
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
|
|
comp.onReuploadedAttachment.subscribe(() => (madeAttachmentChanges = true));
|
|
}
|
|
);
|
|
|
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
|
|
modal.onClosed.subscribe(async () => {
|
|
if (madeAttachmentChanges) {
|
|
await this.ciphersComponent.refresh();
|
|
}
|
|
madeAttachmentChanges = false;
|
|
});
|
|
}
|
|
|
|
async shareCipher(cipher: CipherView) {
|
|
const [modal] = await this.modalService.openViewRef(
|
|
ShareComponent,
|
|
this.shareModalRef,
|
|
(comp) => {
|
|
comp.cipherId = cipher.id;
|
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
|
|
comp.onSharedCipher.subscribe(async () => {
|
|
modal.close();
|
|
await this.ciphersComponent.refresh();
|
|
});
|
|
}
|
|
);
|
|
}
|
|
|
|
async editCipherCollections(cipher: CipherView) {
|
|
const [modal] = await this.modalService.openViewRef(
|
|
CollectionsComponent,
|
|
this.collectionsModalRef,
|
|
(comp) => {
|
|
comp.cipherId = cipher.id;
|
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
|
|
comp.onSavedCollections.subscribe(async () => {
|
|
modal.close();
|
|
await this.ciphersComponent.refresh();
|
|
});
|
|
}
|
|
);
|
|
}
|
|
|
|
async addCipher() {
|
|
const component = await this.editCipher(null);
|
|
component.type = this.activeFilter.cipherType;
|
|
if (this.activeFilter.organizationId !== "MyVault") {
|
|
component.organizationId = this.activeFilter.organizationId;
|
|
component.collections = (
|
|
await firstValueFrom(this.vaultFilterService.filteredCollections$)
|
|
).filter((c) => !c.readOnly && c.id != null);
|
|
}
|
|
const selectedColId = this.activeFilter.collectionId;
|
|
if (selectedColId !== "AllCollections") {
|
|
component.collectionIds = [selectedColId];
|
|
}
|
|
component.folderId = this.activeFilter.folderId;
|
|
}
|
|
|
|
async editCipher(cipher: CipherView) {
|
|
return this.editCipherId(cipher?.id);
|
|
}
|
|
|
|
async editCipherId(id: string) {
|
|
const cipher = await this.cipherService.get(id);
|
|
if (cipher != null && cipher.reprompt != 0) {
|
|
if (!(await this.passwordRepromptService.showPasswordPrompt())) {
|
|
this.go({ cipherId: null, itemId: null });
|
|
return;
|
|
}
|
|
}
|
|
|
|
const [modal, childComponent] = await this.modalService.openViewRef(
|
|
AddEditComponent,
|
|
this.cipherAddEditModalRef,
|
|
(comp) => {
|
|
comp.cipherId = id;
|
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
|
|
comp.onSavedCipher.subscribe(async () => {
|
|
modal.close();
|
|
await this.ciphersComponent.refresh();
|
|
});
|
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
|
|
comp.onDeletedCipher.subscribe(async () => {
|
|
modal.close();
|
|
await this.ciphersComponent.refresh();
|
|
});
|
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
|
|
comp.onRestoredCipher.subscribe(async () => {
|
|
modal.close();
|
|
await this.ciphersComponent.refresh();
|
|
});
|
|
}
|
|
);
|
|
|
|
modal.onClosedPromise().then(() => {
|
|
this.go({ cipherId: null, itemId: null });
|
|
});
|
|
|
|
return childComponent;
|
|
}
|
|
|
|
async cloneCipher(cipher: CipherView) {
|
|
const component = await this.editCipher(cipher);
|
|
component.cloneMode = true;
|
|
}
|
|
|
|
async updateKey() {
|
|
await this.modalService.openViewRef(UpdateKeyComponent, this.updateKeyModalRef);
|
|
}
|
|
|
|
private go(queryParams: any = null) {
|
|
if (queryParams == null) {
|
|
queryParams = {
|
|
favorites: this.activeFilter.isFavorites || null,
|
|
type: this.activeFilter.cipherType,
|
|
folderId: this.activeFilter.folderId,
|
|
collectionId: this.activeFilter.collectionId,
|
|
deleted: this.activeFilter.isDeleted || null,
|
|
};
|
|
}
|
|
|
|
this.router.navigate([], {
|
|
relativeTo: this.route,
|
|
queryParams: queryParams,
|
|
queryParamsHandling: "merge",
|
|
replaceUrl: true,
|
|
});
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Allows backwards compatibility with
|
|
* old links that used the original `cipherId` param
|
|
*/
|
|
const getCipherIdFromParams = (params: Params): string => {
|
|
return params["itemId"] || params["cipherId"];
|
|
};
|