From e690ba2d127d5c6f4ed89fcac708a2088dd31428 Mon Sep 17 00:00:00 2001
From: Shane Melton <smelton@bitwarden.com>
Date: Mon, 19 Sep 2022 12:37:44 -0700
Subject: [PATCH] [EC-16] Fix bulk group request type name

---
 apps/web/src/app/organizations/manage/groups.component.ts  | 5 ++---
 libs/common/src/abstractions/api.service.ts                | 4 +++-
 .../src/models/request/OrganizationGroupBulkRequest.ts     | 7 +++++++
 libs/common/src/services/api.service.ts                    | 4 +++-
 4 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 libs/common/src/models/request/OrganizationGroupBulkRequest.ts

diff --git a/apps/web/src/app/organizations/manage/groups.component.ts b/apps/web/src/app/organizations/manage/groups.component.ts
index de3d18fb138..999eeff6b01 100644
--- a/apps/web/src/app/organizations/manage/groups.component.ts
+++ b/apps/web/src/app/organizations/manage/groups.component.ts
@@ -14,7 +14,7 @@ import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { Utils } from "@bitwarden/common/misc/utils";
 import { CollectionData } from "@bitwarden/common/models/data/collectionData";
 import { Collection } from "@bitwarden/common/models/domain/collection";
-import { OrganizationUserBulkRequest } from "@bitwarden/common/models/request/organizationUserBulkRequest";
+import { OrganizationGroupBulkRequest } from "@bitwarden/common/models/request/OrganizationGroupBulkRequest";
 import { CollectionDetailsResponse } from "@bitwarden/common/models/response/collectionResponse";
 import { IGroupDetailsResponse } from "@bitwarden/common/models/response/groupResponse";
 import { CollectionView } from "@bitwarden/common/models/view/collectionView";
@@ -51,7 +51,6 @@ export class GroupsComponent implements OnInit, OnDestroy {
   organizationId: string;
   groups: IGroupDetailsView[];
   collectionMap: CollectionViewMap = {};
-  selectAll = false;
 
   protected didScroll = false;
   protected pageSize = 100;
@@ -251,7 +250,7 @@ export class GroupsComponent implements OnInit, OnDestroy {
     try {
       const result = await this.apiService.deleteManyGroups(
         this.organizationId,
-        new OrganizationUserBulkRequest(groupsToDelete.map((g) => g.id))
+        new OrganizationGroupBulkRequest(groupsToDelete.map((g) => g.id))
       );
       this.platformUtilsService.showToast(
         "success",
diff --git a/libs/common/src/abstractions/api.service.ts b/libs/common/src/abstractions/api.service.ts
index 252ba5834a6..76c981968bd 100644
--- a/libs/common/src/abstractions/api.service.ts
+++ b/libs/common/src/abstractions/api.service.ts
@@ -1,3 +1,5 @@
+import { OrganizationGroupBulkRequest } from "@bitwarden/common/models/request/OrganizationGroupBulkRequest";
+
 import { OrganizationConnectionType } from "../enums/organizationConnectionType";
 import { SetKeyConnectorKeyRequest } from "../models/request/account/setKeyConnectorKeyRequest";
 import { AttachmentRequest } from "../models/request/attachmentRequest";
@@ -342,7 +344,7 @@ export abstract class ApiService {
   deleteGroup: (organizationId: string, id: string) => Promise<any>;
   deleteManyGroups: (
     organizationId: string,
-    request: OrganizationUserBulkRequest
+    request: OrganizationGroupBulkRequest
   ) => Promise<ListResponse<GroupResponse>>;
   deleteGroupUser: (organizationId: string, id: string, organizationUserId: string) => Promise<any>;
 
diff --git a/libs/common/src/models/request/OrganizationGroupBulkRequest.ts b/libs/common/src/models/request/OrganizationGroupBulkRequest.ts
new file mode 100644
index 00000000000..d8f1b5876dc
--- /dev/null
+++ b/libs/common/src/models/request/OrganizationGroupBulkRequest.ts
@@ -0,0 +1,7 @@
+export class OrganizationGroupBulkRequest {
+  ids: string[];
+
+  constructor(ids: string[]) {
+    this.ids = ids == null ? [] : ids;
+  }
+}
diff --git a/libs/common/src/services/api.service.ts b/libs/common/src/services/api.service.ts
index 0c05e6f23b6..4118e931f06 100644
--- a/libs/common/src/services/api.service.ts
+++ b/libs/common/src/services/api.service.ts
@@ -1,3 +1,5 @@
+import { OrganizationGroupBulkRequest } from "@bitwarden/common/models/request/OrganizationGroupBulkRequest";
+
 import { ApiService as ApiServiceAbstraction } from "../abstractions/api.service";
 import { AppIdService } from "../abstractions/appId.service";
 import { EnvironmentService } from "../abstractions/environment.service";
@@ -986,7 +988,7 @@ export class ApiService implements ApiServiceAbstraction {
 
   async deleteManyGroups(
     organizationId: string,
-    request: OrganizationUserBulkRequest
+    request: OrganizationGroupBulkRequest
   ): Promise<ListResponse<GroupResponse>> {
     const r = await this.send(
       "DELETE",