Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-25 12:15:18 +01:00
Code Issues Projects Releases Wiki Activity

[AC-1649] Remove organizationId from collection-bulk-delete.request (#6343)

Browse Source 
* refactor: remove organizationId from collection-bulk-delete-request, refs AC-1649

* refactor: remove request model from dialog component, refs AC-1649
This commit is contained in:
Vincent Salucci 2023-09-20 15:10:37 -05:00 committed by GitHub
parent d46cec81d8
commit 713bb37991
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts
View File

@ -3,7 +3,6 @@ import { Component, Inject } from "@angular/core";
import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { CollectionBulkDeleteRequest } from "@bitwarden/common/models/request/collection-bulk-delete.request";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
@ -127,8 +126,7 @@ export class BulkDeleteDialogComponent {
); );
return; return;
} }
const deleteRequest = new CollectionBulkDeleteRequest(this.collectionIds, this.organization.id); return await this.apiService.deleteManyCollections(this.organization.id, this.collectionIds);
return await this.apiService.deleteManyCollections(deleteRequest);
} }
private close(result: BulkDeleteDialogResult) { private close(result: BulkDeleteDialogResult) {

3
libs/common/src/abstractions/api.service.ts
View File

@ -99,7 +99,6 @@ import { PlanResponse } from "../billing/models/response/plan.response";
import { SubscriptionResponse } from "../billing/models/response/subscription.response"; import { SubscriptionResponse } from "../billing/models/response/subscription.response";
import { TaxInfoResponse } from "../billing/models/response/tax-info.response"; import { TaxInfoResponse } from "../billing/models/response/tax-info.response";
import { TaxRateResponse } from "../billing/models/response/tax-rate.response"; import { TaxRateResponse } from "../billing/models/response/tax-rate.response";
import { CollectionBulkDeleteRequest } from "../models/request/collection-bulk-delete.request";
import { DeleteRecoverRequest } from "../models/request/delete-recover.request"; import { DeleteRecoverRequest } from "../models/request/delete-recover.request";
import { EventRequest } from "../models/request/event.request"; import { EventRequest } from "../models/request/event.request";
import { IapCheckRequest } from "../models/request/iap-check.request"; import { IapCheckRequest } from "../models/request/iap-check.request";
@ -301,7 +300,7 @@ export abstract class ApiService {
request: CollectionRequest request: CollectionRequest
) => Promise<CollectionResponse>; ) => Promise<CollectionResponse>;
deleteCollection: (organizationId: string, id: string) => Promise<any>; deleteCollection: (organizationId: string, id: string) => Promise<any>;
deleteManyCollections: (request: CollectionBulkDeleteRequest) => Promise<any>; deleteManyCollections: (organizationId: string, collectionIds: string[]) => Promise<any>;
deleteCollectionUser: ( deleteCollectionUser: (
organizationId: string, organizationId: string,
id: string, id: string,

4
libs/common/src/models/request/collection-bulk-delete.request.ts
View File

@ -1,9 +1,7 @@
export class CollectionBulkDeleteRequest { export class CollectionBulkDeleteRequest {
ids: string[]; ids: string[];
organizationId: string;
constructor(ids: string[], organizationId?: string) { constructor(ids: string[]) {
this.ids = ids == null ? [] : ids; this.ids = ids == null ? [] : ids;
this.organizationId = organizationId;
} }
} }

6
libs/common/src/services/api.service.ts
View File

@ -834,11 +834,11 @@ export class ApiService implements ApiServiceAbstraction {
); );
} }
deleteManyCollections(request: CollectionBulkDeleteRequest): Promise<any> { deleteManyCollections(organizationId: string, collectionIds: string[]): Promise<any> {
return this.send( return this.send(
"DELETE", "DELETE",
"/organizations/" + request.organizationId + "/collections", "/organizations/" + organizationId + "/collections",
request, new CollectionBulkDeleteRequest(collectionIds),
true, true,
false false
); );