Clean up testing code in HTTP client

Author: cyrossignol

services/http.ts

@@ -51,23 +51,6 @@ export abstract class BaseHttpClient {
     return this._send(url, 'DELETE', undefined, config);
   }
 
-  async _sendTest(url: string, method: string, body?: HttpBody): Promise<Response> {
-    const response = await fetch(this.url(url), {
-      method,
-      body,
-      headers: {
-        'Accept': 'application/text',
-        'Authorization': this._requestHeaders.Authorization
-      }
-    });
-
-    if (!response.ok) {
-      throw new BaseHttpClientError(response);
-    }
-
-    return response;
-  }
-
   async _send(
     url: string,
     method: string,

services/tdei.ts

@@ -242,13 +242,17 @@ export class TdeiClient extends BaseHttpClient implements ICancelableClient {
   }
 
   async downloadOswDataset(tdeiRecordId: string, format: string = 'osw'): Promise<Blob> {
-    const response = await this._sendTest(`osw/${tdeiRecordId}?format=${format}`, 'GET');
+    const response = await this._get(`osw/${tdeiRecordId}?format=${format}`, {
+      headers: { Accept: '*/*' },
+    });
 
     return (await response.blob());
   }
 
   async downloadPathwaysDataset(tdeiDatasetId: string): Promise<Blob> {
-    const response = await this._sendTest(`gtfs-pathways/${tdeiDatasetId}`, 'GET');
+    const response = await this._get(`gtfs-pathways/${tdeiDatasetId}`, {
+      headers: { Accept: '*/*' },
+    });
 
     return (await response.blob());
   }
@@ -328,16 +332,14 @@ export class TdeiClient extends BaseHttpClient implements ICancelableClient {
     const filename = sourceFormat === 'osw' ? 'osw.zip' : 'osm.xml';
     body.append('file', new File([dataset], filename));
 
-    const jobResponse = await this._sendTest('osw/convert', 'POST', body);
+    const jobResponse = await this._post('osw/convert', body);
     const jobId = (await jobResponse.text());
 
     while (true) {
       console.info(`Waiting for dataset conversion job ${jobId}...`);
       await new Promise(resolve => setTimeout(resolve, 4000));
 
-      const statusResponse = await this._get(`jobs?job_id=${jobId}&tdei_project_group_id=${projectGroupId}`, {
-        headers: { 'Accept': 'application/text' }
-      });
+      const statusResponse = await this._get(`jobs?job_id=${jobId}&tdei_project_group_id=${projectGroupId}`);
       const statusBody = (await statusResponse.json())[0];
       const statusText = statusBody.status.toLowerCase();
 
@@ -350,7 +352,9 @@ export class TdeiClient extends BaseHttpClient implements ICancelableClient {
       }
     }
 
-    const fileResponse = await this._sendTest(`job/download/${jobId}`, 'GET');
+    const fileResponse = await this._get(`job/download/${jobId}`, {
+      headers: { 'Accept': '*/*' },
+    });
 
     return await fileResponse.blob();
   }