Remove node-fetch

apps/cli/package.json

@@ -81,7 +81,6 @@
     "lowdb": "1.0.0",
     "lunr": "2.3.9",
     "multer": "1.4.5-lts.2",
-    "node-fetch": "2.6.12",
     "node-forge": "1.3.1",
     "open": "10.1.2",
     "papaparse": "5.5.3",

apps/cli/src/platform/services/node-api.service.ts

@@ -1,54 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import * as FormData from "form-data";
-import { HttpsProxyAgent } from "https-proxy-agent";
-import * as fe from "node-fetch";
-
-import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
-import { VaultTimeoutSettingsService } from "@bitwarden/common/key-management/vault-timeout";
-import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
-import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { ApiService } from "@bitwarden/common/services/api.service";
-
-(global as any).fetch = fe.default;
-(global as any).Request = fe.Request;
-(global as any).Response = fe.Response;
-(global as any).Headers = fe.Headers;
-(global as any).FormData = FormData;
-
-export class NodeApiService extends ApiService {
-  constructor(
-    tokenService: TokenService,
-    platformUtilsService: PlatformUtilsService,
-    environmentService: EnvironmentService,
-    appIdService: AppIdService,
-    refreshAccessTokenErrorCallback: () => Promise<void>,
-    logService: LogService,
-    logoutCallback: () => Promise<void>,
-    vaultTimeoutSettingsService: VaultTimeoutSettingsService,
-    customUserAgent: string = null,
-  ) {
-    super(
-      tokenService,
-      platformUtilsService,
-      environmentService,
-      appIdService,
-      refreshAccessTokenErrorCallback,
-      logService,
-      logoutCallback,
-      vaultTimeoutSettingsService,
-      { createRequest: (url, request) => new Request(url, request) },
-      customUserAgent,
-    );
-  }
-
-  nativeFetch(request: Request): Promise<Response> {
-    const proxy = process.env.http_proxy || process.env.https_proxy;
-    if (proxy) {
-      (request as any).agent = new HttpsProxyAgent(proxy);
-    }
-    return fetch(request);
-  }
-}

apps/cli/src/service-container/service-container.ts

@@ -129,6 +129,7 @@ import { MemoryStorageService as MemoryStorageServiceForStateProviders } from "@
 import { SyncService } from "@bitwarden/common/platform/sync";
 // eslint-disable-next-line no-restricted-imports -- Needed for service construction
 import { DefaultSyncService } from "@bitwarden/common/platform/sync/internal";
+import { ApiService } from "@bitwarden/common/services/api.service";
 import { AuditService } from "@bitwarden/common/services/audit.service";
 import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service";
 import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
@@ -188,7 +189,6 @@ import { CliSdkLoadService } from "../platform/services/cli-sdk-load.service";
 import { ConsoleLogService } from "../platform/services/console-log.service";
 import { I18nService } from "../platform/services/i18n.service";
 import { LowdbStorageService } from "../platform/services/lowdb-storage.service";
-import { NodeApiService } from "../platform/services/node-api.service";
 import { NodeEnvSecureStorageService } from "../platform/services/node-env-secure-storage.service";
 import { CliRestrictedItemTypesService } from "../vault/services/cli-restricted-item-types.service";
 
@@ -216,7 +216,7 @@ export class ServiceContainer {
   keyService: KeyService;
   tokenService: TokenService;
   appIdService: AppIdService;
-  apiService: NodeApiService;
+  apiService: ApiService;
   environmentService: EnvironmentService;
   cipherService: CipherService;
   folderService: InternalFolderService;
@@ -494,7 +494,7 @@ export class ServiceContainer {
       throw new Error("Refresh Access token error");
     };
 
-    this.apiService = new NodeApiService(
+    this.apiService = new ApiService(
       this.tokenService,
       this.platformUtilsService,
       this.environmentService,
@@ -503,6 +503,7 @@ export class ServiceContainer {
       this.logService,
       logoutCallback,
       this.vaultTimeoutSettingsService,
+      { createRequest: (url, request) => new Request(url, request) },
       customUserAgent,
     );
 

apps/cli/webpack.config.js

@@ -32,10 +32,6 @@ const plugins = [
     banner: "#!/usr/bin/env node",
     raw: true,
   }),
-  new webpack.IgnorePlugin({
-    resourceRegExp: /^encoding$/,
-    contextRegExp: /node-fetch/,
-  }),
   new webpack.EnvironmentPlugin({
     ENV: ENV,
     BWCLI_ENV: ENV,