From f95cc7b82cb0e8f1f5921740c4033e2ddbcbd536 Mon Sep 17 00:00:00 2001 From: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com> Date: Fri, 6 Dec 2024 15:17:48 +0100 Subject: [PATCH] Resolve the Unauthorized issue (#12262) --- apps/web/src/app/vault/individual-vault/vault.component.ts | 5 ++++- apps/web/src/app/vault/org-vault/vault.component.ts | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts index 5f66bb49af5..73a5de2ad5e 100644 --- a/apps/web/src/app/vault/individual-vault/vault.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault.component.ts @@ -210,7 +210,10 @@ export class VaultComponent implements OnInit, OnDestroy { protected organizationsPaymentStatus$: Observable = combineLatest([ this.organizationService.organizations$.pipe( - map((organizations) => organizations?.filter((org) => org.isOwner) ?? []), + map( + (organizations) => + organizations?.filter((org) => org.isOwner && org.canViewBillingHistory) ?? [], + ), ), this.hasSubscription$, ]).pipe( diff --git a/apps/web/src/app/vault/org-vault/vault.component.ts b/apps/web/src/app/vault/org-vault/vault.component.ts index 18cc6e49abc..eb7d586cf74 100644 --- a/apps/web/src/app/vault/org-vault/vault.component.ts +++ b/apps/web/src/app/vault/org-vault/vault.component.ts @@ -592,7 +592,9 @@ export class VaultComponent implements OnInit, OnDestroy { organization$, this.hasSubscription$.pipe(filter((hasSubscription) => hasSubscription !== null)), ]).pipe( - filter(([org, hasSubscription]) => org.isOwner && hasSubscription), + filter( + ([org, hasSubscription]) => org.isOwner && hasSubscription && org.canViewBillingHistory, + ), switchMap(([org]) => combineLatest([ of(org),