1
0
mirror of https://github.com/bitwarden/web synced 2025-12-21 10:43:26 +00:00

Cherry pick premium badge and reports page (#1525, #1536) (#1571)

This commit is contained in:
Oscar Hinton
2022-03-29 21:55:47 +02:00
committed by GitHub
parent 23b02a770a
commit 612442c1bb
35 changed files with 410 additions and 147 deletions

View File

@@ -0,0 +1,103 @@
import { Directive, ViewChild, ViewContainerRef } from "@angular/core";
import { ModalService } from "jslib-angular/services/modal.service";
import { MessagingService } from "jslib-common/abstractions/messaging.service";
import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service";
import { StateService } from "jslib-common/abstractions/state.service";
import { CipherRepromptType } from "jslib-common/enums/cipherRepromptType";
import { Organization } from "jslib-common/models/domain/organization";
import { CipherView } from "jslib-common/models/view/cipherView";
import { AddEditComponent as OrgAddEditComponent } from "../organizations/vault/add-edit.component";
import { AddEditComponent } from "../vault/add-edit.component";
@Directive()
export class CipherReportComponent {
@ViewChild("cipherAddEdit", { read: ViewContainerRef, static: true })
cipherAddEditModalRef: ViewContainerRef;
loading = false;
hasLoaded = false;
ciphers: CipherView[] = [];
organization: Organization;
constructor(
private modalService: ModalService,
protected messagingService: MessagingService,
public requiresPaid: boolean,
private stateService: StateService,
protected passwordRepromptService: PasswordRepromptService
) {}
async load() {
this.loading = true;
await this.setCiphers();
this.loading = false;
this.hasLoaded = true;
}
async selectCipher(cipher: CipherView) {
if (!(await this.repromptCipher(cipher))) {
return;
}
const type = this.organization != null ? OrgAddEditComponent : AddEditComponent;
const [modal, childComponent] = await this.modalService.openViewRef(
type,
this.cipherAddEditModalRef,
(comp: OrgAddEditComponent | AddEditComponent) => {
if (this.organization != null) {
(comp as OrgAddEditComponent).organization = this.organization;
comp.organizationId = this.organization.id;
}
comp.cipherId = cipher == null ? null : cipher.id;
comp.onSavedCipher.subscribe(async () => {
modal.close();
await this.load();
});
comp.onDeletedCipher.subscribe(async () => {
modal.close();
await this.load();
});
comp.onRestoredCipher.subscribe(async () => {
modal.close();
await this.load();
});
}
);
return childComponent;
}
protected async checkAccess(): Promise<boolean> {
if (this.organization != null) {
// TODO: Maybe we want to just make sure they are not on a free plan? Just compare useTotp for now
// since all paid plans include useTotp
if (this.requiresPaid && !this.organization.useTotp) {
this.messagingService.send("upgradeOrganization", { organizationId: this.organization.id });
return false;
}
} else {
const accessPremium = await this.stateService.getCanAccessPremium();
if (this.requiresPaid && !accessPremium) {
this.messagingService.send("premiumRequired");
this.loading = false;
return false;
}
}
return true;
}
protected async setCiphers() {
this.ciphers = [];
}
protected async repromptCipher(c: CipherView) {
return (
c.reprompt === CipherRepromptType.None ||
(await this.passwordRepromptService.showPasswordPrompt())
);
}
}