Updating agent property based on new changes in Got

packages/gitbeaker-browser/src/KyRequester.ts

@@ -1,4 +1,5 @@
 import Ky from 'ky';
+import { Agent } from 'https';
 import {
   Service,
   DefaultRequestOptions,
@@ -20,6 +21,12 @@ function responseHeadersAsObject(response): Record<string, string> {
 export function defaultRequest(service: Service, options: DefaultRequestOptions = {}) {
   const opts = baseDefaultRequest(service, options);
 
+  if (service.url.includes('https')) {
+    opts.agent = new Agent({
+      rejectUnauthorized: service.rejectUnauthorized,
+    });
+  }
+
   return { ...opts, headers: new Headers(service.headers as Record<string, string>) };
 }
 

packages/gitbeaker-browser/test/unit/KyRequester.ts

@@ -1,5 +1,6 @@
 import ky from 'ky';
 import fetch from 'node-fetch';
+import { Agent } from 'https';
 import { processBody, handler, defaultRequest } from '../../src/KyRequester';
 
 // Set globals for testing purposes
@@ -173,4 +174,11 @@ describe('defaultRequest', () => {
     expect(headers).toBeInstanceOf(Headers);
     expect(body).toBe(JSON.stringify(testBody));
   });
+
+  it('should assign the agent property if given https url', async () => {
+    const options = defaultRequest({ ...service, url: 'https://test.com' }, { method: 'post' });
+
+    expect(options.agent).toBeInstanceOf(Agent);
+    expect(options.agent.rejectUnauthorized).toBeFalsy();
+  });
 });

packages/gitbeaker-node/src/GotRequester.ts

@@ -1,6 +1,7 @@
 import Got from 'got';
 import FormData from 'form-data';
 import { decamelizeKeys } from 'xcase';
+import { Agent } from 'https';
 import {
   Service,
   DefaultRequestOptions,
@@ -20,6 +21,14 @@ export function defaultRequest(
     delete options.body;
   }
 
+  if (service.url.includes('https')) {
+    options.agent = {
+      https: new Agent({
+        rejectUnauthorized: service.rejectUnauthorized,
+      }),
+    };
+  }
+
   return options;
 }
 

packages/gitbeaker-node/test/unit/GotRequester.ts

@@ -1,5 +1,6 @@
 import got from 'got';
 import FormData from 'form-data';
+import { Agent } from 'https';
 import { processBody, handler, defaultRequest } from '../../src/GotRequester';
 
 jest.mock('got');
@@ -129,4 +130,11 @@ describe('defaultRequest', () => {
     expect(output2.body).toBeInstanceOf(FormData);
     expect(output2.json).toBeUndefined();
   });
+
+  it('should assign the agent property if given https url', async () => {
+    const options = defaultRequest({ ...service, url: 'https://test.com' }, { method: 'post' });
+
+    expect(options.agent.https).toBeInstanceOf(Agent);
+    expect(options.agent.https.rejectUnauthorized).toBeFalsy();
+  });
 });

packages/gitbeaker-requester-utils/src/RequesterUtils.ts

@@ -1,6 +1,5 @@
 import FormData from 'form-data';
 import { decamelizeKeys } from 'xcase';
-import { Agent } from 'https';
 import { stringify } from 'query-string';
 
 export interface RequesterType {
@@ -48,12 +47,6 @@ export function defaultRequest(
     bod = body;
   }
 
-  if (service.url.includes('https')) {
-    agent = new Agent({
-      rejectUnauthorized: service.rejectUnauthorized,
-    });
-  }
-
   return {
     agent,
     headers,

packages/gitbeaker-requester-utils/test/unit/RequesterUtils.ts

@@ -1,5 +1,4 @@
 import FormData from 'form-data';
-import { Agent } from 'https';
 import { createInstance, defaultRequest } from '../../src/RequesterUtils';
 
 const methods = ['get', 'put', 'delete', 'stream', 'post'];
@@ -36,13 +35,6 @@ describe('defaultRequest', () => {
     expect(options.agent).toBeUndefined();
   });
 
-  it('should assign the agent property if given https url', async () => {
-    const options = defaultRequest({ ...service, url: 'https://test.com' }, { method: 'post' });
-
-    expect(options.agent).toBeInstanceOf(Agent);
-    expect(options.agent.rejectUnauthorized).toBeFalsy();
-  });
-
   it('should not assign the sudo property if omitted', async () => {
     const { headers } = defaultRequest(service, {
       sudo: undefined,