From ba6e6f4b59b27f9ad41cba7e05007b626c14973b Mon Sep 17 00:00:00 2001
From: Stefano Verna <s.verna@datocms.com>
Date: Tue, 19 Mar 2024 17:06:05 +0100
Subject: [PATCH] Fixes

---
 packages/rest-client-utils/src/request.ts | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/packages/rest-client-utils/src/request.ts b/packages/rest-client-utils/src/request.ts
index efab1d61..df0a52eb 100644
--- a/packages/rest-client-utils/src/request.ts
+++ b/packages/rest-client-utils/src/request.ts
@@ -30,6 +30,15 @@ export enum LogLevel {
   BODY_AND_HEADERS = 3,
 }
 
+type Job = {
+  type: 'job';
+  id: string;
+};
+
+type JobResponse = {
+  data: Job;
+};
+
 type RequestOptions = {
   baseUrl: string;
   fetchJobResult: (jobId: string) => Promise<JobResult>;
@@ -260,19 +269,19 @@ export async function request<T>(options: RequestOptions): Promise<T> {
     if (logLevel >= LogLevel.BASIC) {
       log(`[${requestId}] Status: ${response.status} (${response.statusText})`);
       if (logLevel >= LogLevel.BODY_AND_HEADERS) {
-        [
+        for (const key of [
           'x-api-version',
           'x-environment',
           'x-queue-time',
           'x-ratelimit-remaining',
           'x-request-id',
           'cf-ray',
-        ].forEach((key) => {
+        ]) {
           const value = response.headers.get(key);
           if (value) {
             log(`[${requestId}] ${key}: ${value}`);
           }
-        });
+        }
       }
     }
 
@@ -284,7 +293,9 @@ export async function request<T>(options: RequestOptions): Promise<T> {
     }
 
     if (response.status === 202) {
-      const jobResult = await options.fetchJobResult(responseBody.data.id);
+      const jobResult = await options.fetchJobResult(
+        (responseBody as JobResponse).data.id,
+      );
 
       if (jobResult.status < 200 || jobResult.status >= 300) {
         throw new ApiError(
@@ -304,7 +315,7 @@ export async function request<T>(options: RequestOptions): Promise<T> {
     }
 
     if (response.status >= 200 && response.status < 300) {
-      return responseBody;
+      return responseBody as T;
     }
 
     const error = new ApiError(