bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-08 04:33:38 +00:00
Code Issues Releases Wiki Activity

[PM-18721] get grantor policies if grantor is owner of an org

Browse Source
This commit is contained in:
rr-bw
2025-05-27 23:45:34 -07:00
parent 9eb69b1ddf
commit a425fb5ac0
2 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web/src/app/auth/emergency-access/services/emergency-access.service.ts
View File

@@ -87,7 +87,7 @@ export class EmergencyAccessService
}
/**
* Returns policies that apply to the grantor.
* Returns policies that apply to the grantor if the grantor is the owner of an org, otherwise returns null.
* Intended for grantee.
* @param id emergency access id
*/

37
apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts
View File

@@ -1,6 +1,6 @@
import { CommonModule } from "@angular/common";
import { AfterViewInit, Component, Inject, OnInit, ViewChild } from "@angular/core";
import { BehaviorSubject, combineLatest, map } from "rxjs";
import { Component, Inject, OnInit, ViewChild } from "@angular/core";
import { BehaviorSubject, firstValueFrom } from "rxjs";
import {
InputPasswordComponent,
@@ -10,6 +10,7 @@ import {
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import {
@@ -60,7 +61,7 @@ type EmergencyAccessTakeoverDialogResultType =
InputPasswordComponent,
],
})
export class EmergencyAccessTakeoverDialogComponent implements OnInit, AfterViewInit {
export class EmergencyAccessTakeoverDialogComponent implements OnInit {
@ViewChild(InputPasswordComponent)
inputPasswordComponent: InputPasswordComponent | undefined = undefined;
@@ -83,34 +84,18 @@ export class EmergencyAccessTakeoverDialogComponent implements OnInit, AfterView
) {}
async ngOnInit() {
// const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
// const grantorPolicies = await this.emergencyAccessService.getGrantorPolicies(
// this.dialogData.emergencyAccessId,
// );
const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
const grantorPolicies = await this.emergencyAccessService.getGrantorPolicies(
this.dialogData.emergencyAccessId,
);
// this.masterPasswordPolicyOptions = await firstValueFrom(
// this.policyService.masterPasswordPolicyOptions$(activeUserId, grantorPolicies),
// );
this.masterPasswordPolicyOptions = await firstValueFrom(
this.policyService.masterPasswordPolicyOptions$(activeUserId, grantorPolicies),
);
this.initializing = false;
}
ngAfterViewInit() {
if (!this.inputPasswordComponent) {
throw new Error("InputPasswordComponent is not initialized");
}
this.submitting$ = combineLatest([
this.submittingBehaviorSubject.asObservable(),
this.inputPasswordComponent.submitting$,
]).pipe(
map(
([dialogCompIsSubmitting, inputPasswordCompIsSubmitting]) =>
dialogCompIsSubmitting || inputPasswordCompIsSubmitting,
),
);
}
protected handlePrimaryButtonClick = async () => {
if (!this.inputPasswordComponent) {
throw new Error("InputPasswordComponent is not initialized");