clean up refactor

bitwarden · Dec 12, 2024 · 39a7592 · 39a7592
1 parent 93e0d23
commit 39a7592
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 30 deletions.
diff --git a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
@@ -20,8 +20,7 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
 import { PolicyType, ProviderStatusType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { OrganizationApiService } from "@bitwarden/common/admin-console/services/organization/organization-api.service";
-import { PlanType, ProductTierType } from "@bitwarden/common/billing/enums";
+import { ProductTierType } from "@bitwarden/common/billing/enums";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -69,7 +68,6 @@ export class OrganizationLayoutComponent implements OnInit {
     private configService: ConfigService,
     private policyService: PolicyService,
     private providerService: ProviderService,
-    private organizationApiService: OrganizationApiService,
   ) {}
 
   async ngOnInit() {
@@ -110,15 +108,6 @@ export class OrganizationLayoutComponent implements OnInit {
       ),
     );
 
-    const excludedPlans = [
-      PlanType.Free,
-      PlanType.Custom,
-      PlanType.TeamsStarter,
-      PlanType.TeamsStarter2023,
-      PlanType.FamiliesAnnually,
-      PlanType.FamiliesAnnually2019,
-    ];
-
     this.integrationPageEnabled$ = combineLatest(
       this.organization$,
       this.configService.getFeatureFlag$(FeatureFlag.PM14505AdminConsoleIntegrationPage),
@@ -128,16 +117,7 @@ export class OrganizationLayoutComponent implements OnInit {
           (org.productTierType === ProductTierType.Enterprise ||
             org.productTierType === ProductTierType.Teams) &&
             featureFlagEnabled,
-        ).pipe(
-          filter(
-            (enabled) =>
-              enabled &&
-              org.isAdmin &&
-              (org.useSso || org.useDirectory || org.useScim || org.useEvents),
-          ),
-          switchMap(() => this.organizationApiService.getPlanType(org.id)),
-          map((planType) => !excludedPlans.includes(planType)),
-        ),
+        ).pipe(filter((enabled) => enabled && org.isAdmin && org.canAccessIntegrations)),
       ),
     );
 

diff --git a/...ommon/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts b/...ommon/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts
@@ -1,6 +1,5 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { PlanType } from "@bitwarden/common/billing/enums";
 import { BillingHistoryResponse } from "@bitwarden/common/billing/models/response/billing-history.response";
 
 import { OrganizationApiKeyRequest } from "../../../admin-console/models/request/organization-api-key.request";
@@ -43,7 +42,6 @@ export class OrganizationApiServiceAbstraction {
   getSubscription: (id: string) => Promise<OrganizationSubscriptionResponse>;
   getLicense: (id: string, installationId: string) => Promise<unknown>;
   getAutoEnrollStatus: (identifier: string) => Promise<OrganizationAutoEnrollStatusResponse>;
-  getPlanType: (id: string) => Promise<PlanType>;
   create: (request: OrganizationCreateRequest) => Promise<OrganizationResponse>;
   createWithoutPayment: (
     request: OrganizationNoPaymentMethodCreateRequest,

diff --git a/libs/common/src/admin-console/models/domain/organization.ts b/libs/common/src/admin-console/models/domain/organization.ts
@@ -362,6 +362,11 @@ export class Organization {
   }
 
   get canAccessIntegrations() {
-    return this.isAdmin || this.userIsManagedByOrganization || this.canAccessEventLogs;
+    return (
+      this.isAdmin ||
+      this.permissions.manageUsers ||
+      this.permissions.manageGroups ||
+      this.permissions.accessEventLogs
+    );
   }
 }
diff --git a/libs/common/src/admin-console/services/organization/organization-api.service.ts b/libs/common/src/admin-console/services/organization/organization-api.service.ts
@@ -1,6 +1,5 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { PlanType } from "@bitwarden/common/billing/enums";
 import { BillingHistoryResponse } from "@bitwarden/common/billing/models/response/billing-history.response";
 
 import { ApiService } from "../../../abstractions/api.service";
@@ -93,10 +92,6 @@ export class OrganizationApiService implements OrganizationApiServiceAbstraction
     );
   }
 
-  async getPlanType(id: string): Promise<PlanType> {
-    return this.apiService.send("GET", "/organizations/" + id + "/plan-type", null, true, true);
-  }
-
   async getAutoEnrollStatus(identifier: string): Promise<OrganizationAutoEnrollStatusResponse> {
     const r = await this.apiService.send(
       "GET",