Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-10 14:43:34 +01:00
Code Issues Projects Releases Wiki Activity

[PM-15386] Refactor DomainVerificationComponent to warn about enabling SingleOrg policy only when it is not already enabled (#12156)

Browse Source
This commit is contained in:
Rui Tomé 2024-11-27 15:51:40 +00:00 committed by GitHub
parent 37c7421000
commit e938bb1087
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts
View File

@ -14,6 +14,8 @@ import {
import { OrgDomainApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization-domain/org-domain-api.service.abstraction"; import { OrgDomainApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization-domain/org-domain-api.service.abstraction";
import { OrgDomainServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization-domain/org-domain.service.abstraction"; import { OrgDomainServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization-domain/org-domain.service.abstraction";
import { OrganizationDomainResponse } from "@bitwarden/common/admin-console/abstractions/organization-domain/responses/organization-domain.response"; import { OrganizationDomainResponse } from "@bitwarden/common/admin-console/abstractions/organization-domain/responses/organization-domain.response";
import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
import { PolicyType } from "@bitwarden/common/admin-console/enums";
import { HttpStatusCode } from "@bitwarden/common/enums"; import { HttpStatusCode } from "@bitwarden/common/enums";
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
@ -33,6 +35,7 @@ import {
}) })
export class DomainVerificationComponent implements OnInit, OnDestroy { export class DomainVerificationComponent implements OnInit, OnDestroy {
private componentDestroyed$ = new Subject<void>(); private componentDestroyed$ = new Subject<void>();
private singleOrgPolicyEnabled = false;
loading = true; loading = true;
@ -48,6 +51,7 @@ export class DomainVerificationComponent implements OnInit, OnDestroy {
private validationService: ValidationService, private validationService: ValidationService,
private toastService: ToastService, private toastService: ToastService,
private configService: ConfigService, private configService: ConfigService,
private policyApiService: PolicyApiServiceAbstraction,
) {} ) {}
// eslint-disable-next-line @typescript-eslint/no-empty-function // eslint-disable-next-line @typescript-eslint/no-empty-function
@ -71,6 +75,14 @@ export class DomainVerificationComponent implements OnInit, OnDestroy {
async load() { async load() {
await this.orgDomainApiService.getAllByOrgId(this.organizationId); await this.orgDomainApiService.getAllByOrgId(this.organizationId);
if (await this.configService.getFeatureFlag(FeatureFlag.AccountDeprovisioning)) {
const singleOrgPolicy = await this.policyApiService.getPolicy(
this.organizationId,
PolicyType.SingleOrg,
);
this.singleOrgPolicyEnabled = singleOrgPolicy?.enabled ?? false;
}
this.loading = false; this.loading = false;
} }
@ -87,6 +99,7 @@ export class DomainVerificationComponent implements OnInit, OnDestroy {
map(async ([accountDeprovisioningEnabled, organizationDomains]) => { map(async ([accountDeprovisioningEnabled, organizationDomains]) => {
if ( if (
accountDeprovisioningEnabled && accountDeprovisioningEnabled &&
!this.singleOrgPolicyEnabled &&
organizationDomains.every((domain) => domain.verifiedDate === null) organizationDomains.every((domain) => domain.verifiedDate === null)
) { ) {
await this.dialogService.openSimpleDialog({ await this.dialogService.openSimpleDialog({