From 940fd21ac467c314c70da9b741797544299c6449 Mon Sep 17 00:00:00 2001
From: Shane Melton <smelton@bitwarden.com>
Date: Wed, 6 Mar 2024 08:03:52 -0800
Subject: [PATCH] [PM-6645] Update canAccessOrgAdmin helper to consider
 disabled organizations and owners explicitly (#8220)

---
 .../organization/organization.service.abstraction.ts          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts b/libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts
index 06fe8efc87e..1ef0430f958 100644
--- a/libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts
+++ b/libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts
@@ -37,6 +37,10 @@ export function canAccessBillingTab(org: Organization): boolean {
 }
 
 export function canAccessOrgAdmin(org: Organization): boolean {
+  // Admin console can only be accessed by Owners for disabled organizations
+  if (!org.enabled && !org.isOwner) {
+    return false;
+  }
   return (
     canAccessMembersTab(org) ||
     canAccessGroupsTab(org) ||