From adfc8e4920c38ea77a347516783ed3e8f2607334 Mon Sep 17 00:00:00 2001 From: NinaFan0824 Date: Wed, 21 Feb 2024 16:32:24 +1300 Subject: [PATCH] update --- ts-force/src/rest/restHeader.ts | 4 ++-- ts-force/src/rest/restObject.ts | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ts-force/src/rest/restHeader.ts b/ts-force/src/rest/restHeader.ts index e13ba35..11dfd24 100644 --- a/ts-force/src/rest/restHeader.ts +++ b/ts-force/src/rest/restHeader.ts @@ -33,5 +33,5 @@ export type RequestHeadersInput = { 'If-None-Match'?: string[]; }; -export const GetOrHeadRequestHeaders = ['If-Match', 'If-None-Match', 'If-Modified-Since']; -export const PatchOrPostRequestHeaders = ['If-Match', 'If-None-Match', 'If-Unmodified-Since']; +export const GetOrHeadRequestHeaders: (keyof RequestHeadersInput)[] = ['If-Match', 'If-None-Match', 'If-Modified-Since']; +export const PatchOrPostRequestHeaders: (keyof RequestHeadersInput)[] = ['If-Match', 'If-None-Match', 'If-Unmodified-Since']; diff --git a/ts-force/src/rest/restObject.ts b/ts-force/src/rest/restObject.ts index 502aa76..475104b 100644 --- a/ts-force/src/rest/restObject.ts +++ b/ts-force/src/rest/restObject.ts @@ -254,8 +254,12 @@ export abstract class RestObject extends SObject { ); // Check if it contains Conditional Request Headers and deal with errors - const containsGetOrHeadHeader = Object.keys(opts.headers).some((key) => GetOrHeadRequestHeaders.includes(key)); - const containsPatchOrPostHeader = Object.keys(opts.headers).some((key) => PatchOrPostRequestHeaders.includes(key)); + const containsGetOrHeadHeader = Object.keys(opts.headers).some((key) => + GetOrHeadRequestHeaders.includes(key as keyof RequestHeadersInput) + ); + const containsPatchOrPostHeader = Object.keys(opts.headers).some((key) => + PatchOrPostRequestHeaders.includes(key as keyof RequestHeadersInput) + ); if (containsGetOrHeadHeader && response.status === 304) { throw new Error('Not Modified'); } else if (containsPatchOrPostHeader && response.status === 412) {