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

[AC-1658] Update list command to show only organizations where the user is a member (#9453)

Browse Source 
* Refactor list organizations command to use organizationService.memberOrganizations$

* Deprecate OrganizationService.getAll method and update CLI get command to use the organizations observable
This commit is contained in:
Rui Tomé 2024-06-14 06:38:50 +01:00 committed by GitHub
parent 2333059885
commit f85b7b314c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/cli/src/commands/get.command.ts
View File

@ -468,7 +468,7 @@ export class GetCommand extends DownloadCommand {
if (Utils.isGuid(id)) { if (Utils.isGuid(id)) {
org = await this.organizationService.getFromState(id); org = await this.organizationService.getFromState(id);
} else if (id.trim() !== "") { } else if (id.trim() !== "") {
let orgs = await this.organizationService.getAll(); let orgs = await firstValueFrom(this.organizationService.organizations$);
orgs = CliUtils.searchOrganizations(orgs, id); orgs = CliUtils.searchOrganizations(orgs, id);
if (orgs.length > 1) { if (orgs.length > 1) {
return Response.multipleResults(orgs.map((c) => c.id)); return Response.multipleResults(orgs.map((c) => c.id));

4
apps/cli/src/commands/list.command.ts
View File

@ -1,3 +1,5 @@
import { firstValueFrom } from "rxjs";
import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service";
@ -239,7 +241,7 @@ export class ListCommand {
} }
private async listOrganizations(options: Options) { private async listOrganizations(options: Options) {
let organizations = await this.organizationService.getAll(); let organizations = await firstValueFrom(this.organizationService.memberOrganizations$);
if (options.search != null && options.search.trim() !== "") { if (options.search != null && options.search.trim() !== "") {
organizations = CliUtils.searchOrganizations(organizations, options.search); organizations = CliUtils.searchOrganizations(organizations, options.search);

3
libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts
View File

@ -117,6 +117,9 @@ export abstract class OrganizationService {
hasOrganizations: () => Promise<boolean>; hasOrganizations: () => Promise<boolean>;
get$: (id: string) => Observable<Organization | undefined>; get$: (id: string) => Observable<Organization | undefined>;
get: (id: string) => Promise<Organization>; get: (id: string) => Promise<Organization>;
/**
* @deprecated This method is only used in key connector and will be removed soon as part of https://bitwarden.atlassian.net/browse/AC-2252.
*/
getAll: (userId?: string) => Promise<Organization[]>; getAll: (userId?: string) => Promise<Organization[]>;
/** /**