bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-13 23:03:32 +00:00
Code Issues Releases Wiki Activity

[AC-2276] Move policyService helper methods to domain object (#8254)

Browse Source 
* Move mapPolicyFromResponse and mapPoliciesFromToken to static factory methods
This commit is contained in:
Thomas Rittson
2024-03-19 12:19:32 +10:00
committed by GitHub
parent a3f6b9eacb
commit b95dfd9d30
9 changed files with 17 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/web/src/app/admin-console/organizations/members/people.component.ts
View File

@@ -35,6 +35,7 @@ import {
PolicyType,
} from "@bitwarden/common/admin-console/enums";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
import { OrganizationKeysRequest } from "@bitwarden/common/admin-console/models/request/organization-keys.request";
import { ProductType } from "@bitwarden/common/enums";
import { ListResponse } from "@bitwarden/common/models/response/list.response";
@@ -155,7 +156,7 @@ export class PeopleComponent
switchMap((organization) => {
if (organization.isProviderUser) {
return from(this.policyApiService.getPolicies(organization.id)).pipe(
map((response) => this.policyService.mapPoliciesFromToken(response)),
map((response) => Policy.fromListResponse(response)),
);
}

2
apps/web/src/app/auth/accept-organization.component.ts
View File

@@ -167,7 +167,7 @@ export class AcceptOrganizationComponent extends BaseAcceptComponent {
qParams.email,
qParams.organizationUserId,
);
policyList = this.policyService.mapPoliciesFromToken(policies);
policyList = Policy.fromListResponse(policies);
} catch (e) {
this.logService.error(e);
}

2
apps/web/src/app/auth/login/login.component.ts
View File

@@ -120,7 +120,7 @@ export class LoginComponent extends BaseLoginComponent implements OnInit {
invite.email,
invite.organizationUserId,
);
policyList = this.policyService.mapPoliciesFromToken(this.policies);
policyList = Policy.fromListResponse(this.policies);
} catch (e) {
this.logService.error(e);
}

4
apps/web/src/app/auth/trial-initiation/trial-initiation.component.ts
View File

@@ -7,7 +7,6 @@ import { Subject, takeUntil } from "rxjs";
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 { PolicyData } from "@bitwarden/common/admin-console/models/data/policy.data";
import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
import { PlanType } from "@bitwarden/common/billing/enums";
@@ -191,8 +190,7 @@ export class TrialInitiationComponent implements OnInit, OnDestroy {
invite.organizationUserId,
);
if (policies.data != null) {
const policiesData = policies.data.map((p) => new PolicyData(p));
this.policies = policiesData.map((p) => new Policy(p));
this.policies = Policy.fromListResponse(policies);
}
} catch (e) {
this.logService.error(e);