bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-21 02:33:46 +00:00
Code Issues Releases Wiki Activity

[PM-2135] feat: refactor user-verification-prompt

Browse Source
This commit is contained in:
Andreas Coroiu
2023-05-05 11:21:19 +02:00
parent 5ccf5584b8
commit 59813b4140
7 changed files with 111 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-tokens.component.ts
View File

@@ -1,11 +1,10 @@
import { Component, OnInit } from "@angular/core";
import { ActivatedRoute } from "@angular/router";
import { combineLatestWith, Observable, startWith, switchMap } from "rxjs";
import { combineLatestWith, firstValueFrom, Observable, startWith, switchMap } from "rxjs";
import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog";
import { ModalService } from "@bitwarden/angular/services/modal.service";
import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
import { UserVerificationPromptComponent } from "@bitwarden/web-vault/app/components/user-verification";
import { openUserVerificationPrompt } from "@bitwarden/web-vault/app/components/user-verification";
import { AccessTokenView } from "../models/view/access-token.view";
@@ -26,7 +25,6 @@ export class AccessTokenComponent implements OnInit {
private route: ActivatedRoute,
private accessService: AccessService,
private dialogService: DialogServiceAbstraction,
private modalService: ModalService,
private platformUtilsService: PlatformUtilsService
) {}
@@ -64,8 +62,7 @@ export class AccessTokenComponent implements OnInit {
}
private verifyUser() {
const ref = this.modalService.open(UserVerificationPromptComponent, {
allowMultipleModals: true,
const ref = openUserVerificationPrompt(this.dialogService, {
data: {
confirmDescription: "revokeAccessTokenDesc",
confirmButtonText: "revokeAccessToken",
@@ -77,7 +74,7 @@ export class AccessTokenComponent implements OnInit {
return;
}
return ref.onClosedPromise();
return firstValueFrom(ref.closed);
}
private async getAccessTokens(): Promise<AccessTokenView[]> {

13
bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.ts
View File

@@ -1,15 +1,15 @@
import { Component, OnDestroy, OnInit } from "@angular/core";
import { FormControl, FormGroup, Validators } from "@angular/forms";
import { ActivatedRoute } from "@angular/router";
import { Subject, switchMap, takeUntil } from "rxjs";
import { firstValueFrom, Subject, switchMap, takeUntil } from "rxjs";
import { ModalService } from "@bitwarden/angular/services/modal.service";
import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog";
import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/abstractions/log.service";
import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { UserVerificationPromptComponent } from "@bitwarden/web-vault/app/components/user-verification";
import { openUserVerificationPrompt } from "@bitwarden/web-vault/app/components/user-verification";
import { SecretsManagerPortingApiService } from "../services/sm-porting-api.service";
import { SecretsManagerPortingService } from "../services/sm-porting.service";
@@ -42,7 +42,7 @@ export class SecretsManagerExportComponent implements OnInit, OnDestroy {
private smPortingService: SecretsManagerPortingService,
private fileDownloadService: FileDownloadService,
private logService: LogService,
private modalService: ModalService,
private dialogService: DialogServiceAbstraction,
private secretsManagerApiService: SecretsManagerPortingApiService
) {}
@@ -98,8 +98,7 @@ export class SecretsManagerExportComponent implements OnInit, OnDestroy {
}
private verifyUser() {
const ref = this.modalService.open(UserVerificationPromptComponent, {
allowMultipleModals: true,
const ref = openUserVerificationPrompt(this.dialogService, {
data: {
confirmDescription: "exportWarningDesc",
confirmButtonText: "exportVault",
@@ -111,6 +110,6 @@ export class SecretsManagerExportComponent implements OnInit, OnDestroy {
return;
}
return ref.onClosedPromise();
return firstValueFrom(ref.closed);
}
}