From c700e05fd55cb32fc8e4ecaf8c8bfffe7cfc97ca Mon Sep 17 00:00:00 2001 From: Jared Snider Date: Thu, 9 May 2024 12:07:05 -0400 Subject: [PATCH] PM-7392 - Remove logout reason from CLI as each logout call handles messaging on its own. --- apps/cli/src/bw.ts | 6 ++---- apps/cli/src/platform/services/node-api.service.ts | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts index e2c6323dfc..9069bc7003 100644 --- a/apps/cli/src/bw.ts +++ b/apps/cli/src/bw.ts @@ -13,7 +13,6 @@ import { PinCryptoService, PinCryptoServiceAbstraction, UserDecryptionOptionsService, - LogoutReason, } from "@bitwarden/auth/common"; import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/abstractions/event/event-collection.service"; import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service"; @@ -258,8 +257,7 @@ export class Main { p = path.join(process.env.HOME, ".config/Bitwarden CLI"); } - const logoutCallback = async (logoutReason: LogoutReason, userId?: UserId) => - await this.logout(logoutReason, userId); + const logoutCallback = async () => await this.logout(); this.platformUtilsService = new CliPlatformUtilsService(ClientType.Cli, packageJson); this.logService = new ConsoleLogService( @@ -736,7 +734,7 @@ export class Main { } } - async logout(logoutReason: LogoutReason, passedInUserId?: UserId) { + async logout() { this.authService.logOut(() => { /* Do nothing */ }); diff --git a/apps/cli/src/platform/services/node-api.service.ts b/apps/cli/src/platform/services/node-api.service.ts index 7878ba238d..5e2a9302b6 100644 --- a/apps/cli/src/platform/services/node-api.service.ts +++ b/apps/cli/src/platform/services/node-api.service.ts @@ -2,7 +2,6 @@ import * as FormData from "form-data"; import { HttpsProxyAgent } from "https-proxy-agent"; import * as fe from "node-fetch"; -import { LogoutReason } from "@bitwarden/auth/common"; import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service"; import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; @@ -26,7 +25,7 @@ export class NodeApiService extends ApiService { stateService: StateService, refreshAccessTokenErrorCallback: () => Promise, logService: LogService, - logoutCallback: (logoutReason: LogoutReason) => Promise, + logoutCallback: () => Promise, customUserAgent: string = null, ) { super(