bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-01-07 19:13:39 +00:00
Code Issues Releases Wiki Activity

PM-2153 Update User Confirm Dialog (#8694)

Browse Source 
* PM-2153 Update User Confirm Dialog

* PM-2153 Called confirm user method before dialog close
This commit is contained in:
KiruthigaManivannan
2024-05-22 21:16:15 +05:30
committed by GitHub
parent d0c5312c34
commit ae74defc8c
3 changed files with 87 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
apps/web/src/app/admin-console/common/base.people.component.ts
View File

@@ -1,5 +1,13 @@
import { Directive, OnDestroy, OnInit, ViewChild, ViewContainerRef } from "@angular/core";
import { BehaviorSubject, Subject, firstValueFrom, from, switchMap, takeUntil } from "rxjs";
import {
BehaviorSubject,
Subject,
firstValueFrom,
from,
lastValueFrom,
switchMap,
takeUntil,
} from "rxjs";
import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe";
import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
@@ -385,25 +393,16 @@ export abstract class BasePeopleComponent<
this.organizationManagementPreferencesService.autoConfirmFingerPrints.state$,
);
if (autoConfirm == null || !autoConfirm) {
const [modal] = await this.modalService.openViewRef(
UserConfirmComponent,
this.confirmModalRef,
(comp) => {
comp.name = this.userNamePipe.transform(user);
comp.userId = user != null ? user.userId : null;
comp.publicKey = publicKey;
// eslint-disable-next-line rxjs/no-async-subscribe
comp.onConfirmedUser.subscribe(async () => {
try {
comp.formPromise = confirmUser(publicKey);
await comp.formPromise;
modal.close();
} catch (e) {
this.logService.error(e);
}
});
const dialogRef = UserConfirmComponent.open(this.dialogService, {
data: {
name: this.userNamePipe.transform(user),
userId: user != null ? user.userId : null,
publicKey: publicKey,
confirmUser: () => confirmUser(publicKey),
},
);
});
await lastValueFrom(dialogRef.closed);
return;
}