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

changes to sponsorship is showing in individual vault (#14627)

Browse Source
This commit is contained in:
cyprain-okeke
2025-05-12 18:20:56 +01:00
committed by GitHub
parent 355bddc6c9
commit a10b9530af
5 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/web/src/app/billing/settings/sponsored-families.component.ts
View File

@@ -112,13 +112,15 @@ export class SponsoredFamiliesComponent implements OnInit, OnDestroy {
}); });
} }
}); });
this.anyOrgsAvailable$ = this.availableSponsorshipOrgs$.pipe(map((orgs) => orgs.length > 0)); this.anyOrgsAvailable$ = this.availableSponsorshipOrgs$.pipe(map((orgs) => orgs.length > 0));
this.activeSponsorshipOrgs$ = this.organizationService this.activeSponsorshipOrgs$ = this.organizationService
.organizations$(userId) .organizations$(userId)
.pipe(map((orgs) => orgs.filter((o) => o.familySponsorshipFriendlyName !== null))); .pipe(
map((orgs) =>
orgs.filter((o) => o.familySponsorshipFriendlyName !== null && !o.isAdminInitiated),
),
);
this.anyActiveSponsorships$ = this.activeSponsorshipOrgs$.pipe(map((orgs) => orgs.length > 0)); this.anyActiveSponsorships$ = this.activeSponsorshipOrgs$.pipe(map((orgs) => orgs.length > 0));
this.loading = false; this.loading = false;

1
libs/common/src/admin-console/models/data/organization.data.spec.ts
View File

@@ -59,6 +59,7 @@ describe("ORGANIZATIONS state", () => {
userIsManagedByOrganization: false, userIsManagedByOrganization: false,
useRiskInsights: false, useRiskInsights: false,
useAdminSponsoredFamilies: false, useAdminSponsoredFamilies: false,
isAdminInitiated: false,
}, },
}; };
const result = sut.deserializer(JSON.parse(JSON.stringify(expectedResult))); const result = sut.deserializer(JSON.parse(JSON.stringify(expectedResult)));

2
libs/common/src/admin-console/models/data/organization.data.ts
View File

@@ -61,6 +61,7 @@ export class OrganizationData {
userIsManagedByOrganization: boolean; userIsManagedByOrganization: boolean;
useRiskInsights: boolean; useRiskInsights: boolean;
useAdminSponsoredFamilies: boolean; useAdminSponsoredFamilies: boolean;
isAdminInitiated: boolean;
constructor( constructor(
response?: ProfileOrganizationResponse, response?: ProfileOrganizationResponse,
@@ -124,6 +125,7 @@ export class OrganizationData {
this.userIsManagedByOrganization = response.userIsManagedByOrganization; this.userIsManagedByOrganization = response.userIsManagedByOrganization;
this.useRiskInsights = response.useRiskInsights; this.useRiskInsights = response.useRiskInsights;
this.useAdminSponsoredFamilies = response.useAdminSponsoredFamilies; this.useAdminSponsoredFamilies = response.useAdminSponsoredFamilies;
this.isAdminInitiated = response.isAdminInitiated;
this.isMember = options.isMember; this.isMember = options.isMember;
this.isProviderUser = options.isProviderUser; this.isProviderUser = options.isProviderUser;

2
libs/common/src/admin-console/models/domain/organization.ts
View File

@@ -91,6 +91,7 @@ export class Organization {
userIsManagedByOrganization: boolean; userIsManagedByOrganization: boolean;
useRiskInsights: boolean; useRiskInsights: boolean;
useAdminSponsoredFamilies: boolean; useAdminSponsoredFamilies: boolean;
isAdminInitiated: boolean;
constructor(obj?: OrganizationData) { constructor(obj?: OrganizationData) {
if (obj == null) { if (obj == null) {
@@ -150,6 +151,7 @@ export class Organization {
this.userIsManagedByOrganization = obj.userIsManagedByOrganization; this.userIsManagedByOrganization = obj.userIsManagedByOrganization;
this.useRiskInsights = obj.useRiskInsights; this.useRiskInsights = obj.useRiskInsights;
this.useAdminSponsoredFamilies = obj.useAdminSponsoredFamilies; this.useAdminSponsoredFamilies = obj.useAdminSponsoredFamilies;
this.isAdminInitiated = obj.isAdminInitiated;
} }
get canAccess() { get canAccess() {

2
libs/common/src/admin-console/models/response/profile-organization.response.ts
View File

@@ -56,6 +56,7 @@ export class ProfileOrganizationResponse extends BaseResponse {
userIsManagedByOrganization: boolean; userIsManagedByOrganization: boolean;
useRiskInsights: boolean; useRiskInsights: boolean;
useAdminSponsoredFamilies: boolean; useAdminSponsoredFamilies: boolean;
isAdminInitiated: boolean;
constructor(response: any) { constructor(response: any) {
super(response); super(response);
@@ -123,5 +124,6 @@ export class ProfileOrganizationResponse extends BaseResponse {
this.userIsManagedByOrganization = this.getResponseProperty("UserIsManagedByOrganization"); this.userIsManagedByOrganization = this.getResponseProperty("UserIsManagedByOrganization");
this.useRiskInsights = this.getResponseProperty("UseRiskInsights"); this.useRiskInsights = this.getResponseProperty("UseRiskInsights");
this.useAdminSponsoredFamilies = this.getResponseProperty("UseAdminSponsoredFamilies"); this.useAdminSponsoredFamilies = this.getResponseProperty("UseAdminSponsoredFamilies");
this.isAdminInitiated = this.getResponseProperty("IsAdminInitiated");
} }
} }