Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-03-02 03:41:09 +01:00
Code Issues Projects Releases Wiki Activity

Fix claimed domains page for manage SSO users by replacing policies server check with policy service (#12863)

Browse Source
This commit is contained in:
Rui Tomé 2025-01-14 22:11:29 +00:00 committed by GitHub
parent 5fb383d7dc
commit 6f018e1b2e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ 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 { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
import { PolicyType } from "@bitwarden/common/admin-console/enums"; 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";
@ -54,7 +54,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, private policyService: PolicyService,
) { ) {
this.accountDeprovisioningEnabled$ = this.configService.getFeatureFlag$( this.accountDeprovisioningEnabled$ = this.configService.getFeatureFlag$(
FeatureFlag.AccountDeprovisioning, FeatureFlag.AccountDeprovisioning,
@ -83,9 +83,14 @@ export class DomainVerificationComponent implements OnInit, OnDestroy {
await this.orgDomainApiService.getAllByOrgId(this.organizationId); await this.orgDomainApiService.getAllByOrgId(this.organizationId);
if (await this.configService.getFeatureFlag(FeatureFlag.AccountDeprovisioning)) { if (await this.configService.getFeatureFlag(FeatureFlag.AccountDeprovisioning)) {
const singleOrgPolicy = await this.policyApiService.getPolicy( const singleOrgPolicy = await firstValueFrom(
this.organizationId, this.policyService.policies$.pipe(
PolicyType.SingleOrg, map((policies) =>
policies.find(
(p) => p.type === PolicyType.SingleOrg && p.organizationId === this.organizationId,
),
),
),
); );
this.singleOrgPolicyEnabled = singleOrgPolicy?.enabled ?? false; this.singleOrgPolicyEnabled = singleOrgPolicy?.enabled ?? false;
} }