[PS-1093] Move Organization Api Calls (#3243)

* Move organization api calls into seperate service

* Remove unneeded unknown

* Address PR feedback

apps/cli/src/bw.ts

@@ -5,6 +5,7 @@ import * as program from "commander";
 import * as jsdom from "jsdom";
 
 import { InternalFolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
 import { ClientType } from "@bitwarden/common/enums/clientType";
 import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions";
 import { LogLevelType } from "@bitwarden/common/enums/logLevelType";
@@ -30,6 +31,7 @@ import { KeyConnectorService } from "@bitwarden/common/services/keyConnector.ser
 import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service";
 import { NoopMessagingService } from "@bitwarden/common/services/noopMessaging.service";
 import { OrganizationService } from "@bitwarden/common/services/organization.service";
+import { OrganizationApiService } from "@bitwarden/common/services/organization/organization-api.service";
 import { PasswordGenerationService } from "@bitwarden/common/services/passwordGeneration.service";
 import { PolicyService } from "@bitwarden/common/services/policy/policy.service";
 import { ProviderService } from "@bitwarden/common/services/provider.service";
@@ -58,7 +60,7 @@ import { NodeEnvSecureStorageService } from "./services/nodeEnvSecureStorage.ser
 import { VaultProgram } from "./vault.program";
 
 // Polyfills
-(global as any).DOMParser = new jsdom.JSDOM().window.DOMParser;
+global.DOMParser = new jsdom.JSDOM().window.DOMParser;
 
 // eslint-disable-next-line
 const packageJson = require("../package.json");
@@ -108,6 +110,7 @@ export class Main {
   broadcasterService: BroadcasterService;
   folderApiService: FolderApiService;
   userVerificationApiService: UserVerificationApiService;
+  organizationApiService: OrganizationApiServiceAbstraction;
 
   constructor() {
     let p = null;
@@ -185,6 +188,9 @@ export class Main {
       async (expired: boolean) => await this.logout(),
       customUserAgent
     );
+
+    this.organizationApiService = new OrganizationApiService(this.apiService);
+
     this.containerService = new ContainerService(this.cryptoService);
 
     this.settingsService = new SettingsService(this.stateService);

apps/cli/src/commands/convertToKeyConnector.command.ts

@@ -1,18 +1,18 @@
 import * as inquirer from "inquirer";
 
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
 import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
 import { SyncService } from "@bitwarden/common/abstractions/sync.service";
 import { Response } from "@bitwarden/node/cli/models/response";
 import { MessageResponse } from "@bitwarden/node/cli/models/response/messageResponse";
 
 export class ConvertToKeyConnectorCommand {
   constructor(
-    private apiService: ApiService,
     private keyConnectorService: KeyConnectorService,
     private environmentService: EnvironmentService,
     private syncService: SyncService,
+    private organizationApiService: OrganizationApiServiceAbstraction,
     private logout: () => Promise<void>
   ) {}
 
@@ -72,7 +72,7 @@ export class ConvertToKeyConnectorCommand {
 
       return Response.success();
     } else if (answer.convert === "leave") {
-      await this.apiService.postLeaveOrganization(organization.id);
+      await this.organizationApiService.leave(organization.id);
       await this.keyConnectorService.removeConvertAccountRequired();
       await this.syncService.fullSync(true);
       return Response.success();

apps/cli/src/commands/serve.command.ts

@@ -121,6 +121,7 @@ export class ServeCommand {
       this.main.keyConnectorService,
       this.main.environmentService,
       this.main.syncService,
+      this.main.organizationApiService,
       async () => await this.main.logout()
     );
 

apps/cli/src/commands/unlock.command.ts

@@ -3,6 +3,7 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
 import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { SyncService } from "@bitwarden/common/abstractions/sync.service";
 import { HashPurpose } from "@bitwarden/common/enums/hashPurpose";
@@ -26,6 +27,7 @@ export class UnlockCommand {
     private keyConnectorService: KeyConnectorService,
     private environmentService: EnvironmentService,
     private syncService: SyncService,
+    private organizationApiService: OrganizationApiServiceAbstraction,
     private logout: () => Promise<void>
   ) {}
 
@@ -78,10 +80,10 @@ export class UnlockCommand {
 
       if (await this.keyConnectorService.getConvertAccountRequired()) {
         const convertToKeyConnectorCommand = new ConvertToKeyConnectorCommand(
-          this.apiService,
           this.keyConnectorService,
           this.environmentService,
           this.syncService,
+          this.organizationApiService,
           this.logout
         );
         const convertResponse = await convertToKeyConnectorCommand.run();

apps/cli/src/program.ts

@@ -260,6 +260,7 @@ export class Program extends BaseProgram {
             this.main.keyConnectorService,
             this.main.environmentService,
             this.main.syncService,
+            this.main.organizationApiService,
             async () => await this.main.logout()
           );
           const response = await command.run(password, cmd);
@@ -534,6 +535,7 @@ export class Program extends BaseProgram {
           this.main.keyConnectorService,
           this.main.environmentService,
           this.main.syncService,
+          this.main.organizationApiService,
           this.main.logout
         );
         const response = await command.run(null, null);