fix: use conn.request

Author: iowillhoit

src/commands/data/setup/transfer.ts

@@ -269,39 +269,19 @@ export default class SetupTransfer extends SfCommand<SetupTransferResult> {
       this.spinner.status = messages.getMessage('info.callingExportApi');
       const sourceApiVersion = sourceConnection.version;
       const exportApiPath = `/services/data/v${sourceApiVersion}/connect/industries/setup/dataset/actions/export`;
-      const instanceUrl = sourceConnection.instanceUrl ?? '';
-      const fullUrl = `${instanceUrl}${exportApiPath}`;
 
-      const exportAbort = new AbortController();
-      const exportTimeoutId = setTimeout(() => exportAbort.abort(), SetupTransfer.HTTP_TIMEOUT_MS);
-      let httpResponse: Response;
-      try {
-        httpResponse = await fetch(fullUrl, {
+      const exportResponse = await sourceConnection.request<ExportResponse>(
+        {
           method: 'POST',
+          url: exportApiPath,
+          body: JSON.stringify(exportPayload),
           headers: {
             'Content-Type': 'application/json',
-            Authorization: `Bearer ${sourceConnection.accessToken ?? ''}`,
           },
-          body: JSON.stringify(exportPayload),
-          signal: exportAbort.signal,
-        });
-      } finally {
-        clearTimeout(exportTimeoutId);
-      }
-
-      const rawBody = await httpResponse.text();
-
-      if (!httpResponse.ok) {
-        throw new Error(`Export API returned ${httpResponse.status}: ${rawBody}`);
-      }
-
-      // eslint-disable-next-line no-control-regex
-      const sanitizedBody = rawBody.replace(/[\x00-\x1F\x7F]/g, (ch) =>
-        ch === '\n' || ch === '\r' || ch === '\t' ? ch : ''
+        },
+        { timeout: SetupTransfer.HTTP_TIMEOUT_MS }
       );
 
-      const exportResponse = JSON.parse(sanitizedBody) as ExportResponse;
-
       const errors = exportResponse.errors as Array<{ message?: string }> | undefined;
       if (exportResponse.isSuccess === false) {
         const errorDetails = errors?.map((e) => e.message ?? JSON.stringify(e)).join('\n') ?? 'Unknown error';

test/commands/data/setup/transfer.test.ts

@@ -40,16 +40,12 @@ describe('data setup transfer', () => {
     sfCommandStubs = stubSfCommandUx($$.SANDBOX);
     await $$.stubAuths(mockSourceOrg, mockTargetOrg);
 
-    // Stub fetch for export API
-    $$.SANDBOX.stub(global, 'fetch').resolves({
-      ok: true,
-      status: 200,
-      text: async () => JSON.stringify(mockExportResponse),
-    } as Response);
-
-    // Stub connection.request for import API
-    const targetConnection = await mockTargetOrg.getConnection();
-    targetConnection.request = $$.SANDBOX.stub().resolves(mockImportResponse);
+    $$.fakeConnectionRequest = (request) => {
+      if (typeof request === 'string' || (request as { url: string }).url.includes('/export')) {
+        return Promise.resolve(mockExportResponse);
+      }
+      return Promise.resolve(mockImportResponse);
+    };
   });
 
   afterEach(() => {
@@ -171,21 +167,15 @@ describe('data setup transfer', () => {
 
   describe('error handling', () => {
     it('throws error when export API returns error', async () => {
-      $$.SANDBOX.restore();
-      await $$.stubAuths(mockSourceOrg, mockTargetOrg);
-
-      $$.SANDBOX.stub(global, 'fetch').resolves({
-        ok: true,
-        status: 200,
-        text: async () =>
-          JSON.stringify({
+      $$.fakeConnectionRequest = (request) => {
+        if (typeof request === 'string' || (request as { url: string }).url.includes('/export')) {
+          return Promise.resolve({
             isSuccess: false,
             errors: [{ message: 'Invalid definition identifier' }],
-          }),
-      } as Response);
-
-      const targetConnection = await mockTargetOrg.getConnection();
-      targetConnection.request = $$.SANDBOX.stub().resolves(mockImportResponse);
+          });
+        }
+        return Promise.resolve(mockImportResponse);
+      };
 
       try {
         await SetupTransfer.run([
@@ -205,18 +195,13 @@ describe('data setup transfer', () => {
       }
     });
 
-    it('throws error when export API returns non-200 status', async () => {
-      $$.SANDBOX.restore();
-      await $$.stubAuths(mockSourceOrg, mockTargetOrg);
-
-      $$.SANDBOX.stub(global, 'fetch').resolves({
-        ok: false,
-        status: 400,
-        text: async () => 'Bad Request',
-      } as Response);
-
-      const targetConnection = await mockTargetOrg.getConnection();
-      targetConnection.request = $$.SANDBOX.stub().resolves(mockImportResponse);
+    it('throws error when export API request fails', async () => {
+      $$.fakeConnectionRequest = (request) => {
+        if (typeof request === 'string' || (request as { url: string }).url.includes('/export')) {
+          return Promise.reject(new Error('REQUEST_FAILED: Bad Request'));
+        }
+        return Promise.resolve(mockImportResponse);
+      };
 
       try {
         await SetupTransfer.run([
@@ -231,7 +216,7 @@ describe('data setup transfer', () => {
         ]);
         expect.fail('Should have thrown an error');
       } catch (error) {
-        expect((error as Error).message).to.include('Export API returned 400');
+        expect((error as Error).message).to.include('REQUEST_FAILED');
       }
     });
   });