vaultwarden
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

don't display free bitwarden families button

This commit is contained in:
jaasen-livefront 2024-09-20 14:07:57 -07:00
parent d33e049dd0
commit 832564d705
No known key found for this signature in database
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/browser/src/tools/popup/settings/about-page/more-from-bitwarden-page-v2.component.ts
View File

@ -38,7 +38,7 @@ export class MoreFromBitwardenPageV2Component {
private organizationService: OrganizationService, private organizationService: OrganizationService,
) { ) {
this.canAccessPremium$ = billingAccountProfileStateService.hasPremiumFromAnySource$; this.canAccessPremium$ = billingAccountProfileStateService.hasPremiumFromAnySource$;
this.familySponsorshipAvailable$ = this.organizationService.canManageSponsorships$; this.familySponsorshipAvailable$ = this.organizationService.familySponsorshipAvailable$;
} }
async openFreeBitwardenFamiliesPage() { async openFreeBitwardenFamiliesPage() {

4
libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts
View File

@ -117,6 +117,10 @@ export abstract class OrganizationService {
* Emits true if the user can create or manage a Free Bitwarden Families sponsorship. * Emits true if the user can create or manage a Free Bitwarden Families sponsorship.
*/ */
canManageSponsorships$: Observable<boolean>; canManageSponsorships$: Observable<boolean>;
/**
* Emits true if any of the user's organizations have a Free Bitwarden Families sponsorship available.
*/
familySponsorshipAvailable$: Observable<boolean>;
hasOrganizations: () => Promise<boolean>; hasOrganizations: () => Promise<boolean>;
get$: (id: string) => Observable<Organization | undefined>; get$: (id: string) => Observable<Organization | undefined>;
get: (id: string) => Promise<Organization>; get: (id: string) => Promise<Organization>;

4
libs/common/src/admin-console/services/organization/organization.service.ts
View File

@ -88,6 +88,10 @@ export class OrganizationService implements InternalOrganizationServiceAbstracti
mapToBooleanHasAnyOrganizations(), mapToBooleanHasAnyOrganizations(),
); );
familySponsorshipAvailable$ = this.organizations$.pipe(
map((orgs) => orgs.some((o) => o.familySponsorshipAvailable)),
);
async hasOrganizations(): Promise<boolean> { async hasOrganizations(): Promise<boolean> {
return await firstValueFrom(this.organizations$.pipe(mapToBooleanHasAnyOrganizations())); return await firstValueFrom(this.organizations$.pipe(mapToBooleanHasAnyOrganizations()));
} }