Merge branch 'main' into dependabot/npm_and_yarn/babel/traverse-7.23.2

package.json

@@ -34,6 +34,7 @@
     "changelog": "node node_modules/standard-version/bin/cli.js --skip.commit --skip.push --skip.tag --dry-run"
   },
   "dependencies": {
+    "@cypress/request": "^3.0.1",
     "@types/bluebird": "^3.5.35",
     "@types/node": "^18.15.3",
     "ajv": "^6.12.3",
@@ -43,7 +44,6 @@
     "merge-options": "^1.0.1",
     "promise-queue": "^2.2.3",
     "proxy-agent": "^6.3.0",
-    "request": "^2.88.0",
     "url-template": "^2.0.8",
     "uuid": "^9.0.0"
   },
@@ -53,7 +53,6 @@
     "@types/lodash": "^4.14.172",
     "@types/prettier": "^2.3.2",
     "@types/promise-queue": "^2.2.0",
-    "@types/request": "^2.48.5",
     "@types/shelljs": "^0.8.9",
     "@types/url-template": "^2.0.28",
     "@types/uuid": "^9.0.1",

src/api-request-manager.ts

@@ -10,7 +10,6 @@ import { Promise } from 'bluebird';
 import { EventEmitter } from 'events';
 import errors from './util/errors';
 import { PassThrough } from 'stream';
-import request from 'request';
 
 const APIRequest = require('./api-request');
 

src/api-request.ts

@@ -13,10 +13,11 @@
 import assert from 'assert';
 import { EventEmitter } from 'events';
 import httpStatusCodes from 'http-status';
-import request from 'request';
 import Config from './util/config';
 import getRetryTimeout from './util/exponential-backoff';
 
+const request = require('@cypress/request');
+
 // ------------------------------------------------------------------------------
 // Typedefs and Callbacks
 // ------------------------------------------------------------------------------
@@ -218,8 +219,8 @@ class APIRequest {
 	isRetryable: boolean;
 
 	_callback?: APIRequestCallback;
-	request?: request.Request;
-	stream?: request.Request;
+	request?: any; // request.Request;
+	stream?: any; // request.Request;
 	numRetries?: number;
 
 	constructor(config: Config, eventBus: EventEmitter) {
@@ -261,10 +262,10 @@ class APIRequest {
 		} else {
 			this.request = request(this.config.request);
 			this.stream = this.request;
-			this.stream.on('error', (err) => {
+			this.stream.on('error', (err: any) => {
 				this.eventBus.emit('response', err);
 			});
-			this.stream.on('response', (response) => {
+			this.stream.on('response', (response: any) => {
 				if (isClientErrorResponse(response)) {
 					this.eventBus.emit('response', createErrorForResponse(response));
 					return;

tests/integration-test.js

@@ -16,7 +16,7 @@ var assert = require('chai').assert,
 	fs = require('fs'),
 	path = require('path'),
 	crypto = require('crypto'),
-	request = require('request'),
+	request = require('@cypress/request'),
 	jwt = require('jsonwebtoken');
 
 describe('Box Node SDK', function() {

tests/lib/api-request-test.js

@@ -63,7 +63,7 @@ describe('APIRequest', function() {
 
 		// Setup Mockery
 		mockery.enable({ warnOnUnregistered: false });
-		mockery.registerMock('request', requestStub);
+		mockery.registerMock('@cypress/request', requestStub);
 
 		// Setup File Under Test
 		mockery.registerAllowable(MODULE_UNDER_TEST_PATH, true);