mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-19 19:11:13 +00:00
refactor: Add IRequestOptions type to helpers.request for more type safety (no-changelog) (#8563)
Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
import type { OptionsWithUri } from 'request';
|
||||
|
||||
import type {
|
||||
ICredentialDataDecryptedObject,
|
||||
ICredentialTestFunctions,
|
||||
IDataObject,
|
||||
IExecuteFunctions,
|
||||
IHookFunctions,
|
||||
IHttpRequestMethods,
|
||||
ILoadOptionsFunctions,
|
||||
IRequestOptions,
|
||||
JsonObject,
|
||||
} from 'n8n-workflow';
|
||||
import { NodeApiError } from 'n8n-workflow';
|
||||
@@ -15,7 +15,7 @@ import moment from 'moment-timezone';
|
||||
|
||||
export async function hubspotApiRequest(
|
||||
this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
|
||||
method: string,
|
||||
method: IHttpRequestMethods,
|
||||
endpoint: string,
|
||||
// tslint:disable-next-line:no-any
|
||||
body: any = {},
|
||||
@@ -29,15 +29,15 @@ export async function hubspotApiRequest(
|
||||
authenticationMethod = 'developerApi';
|
||||
}
|
||||
|
||||
const options: OptionsWithUri = {
|
||||
const options = {
|
||||
method,
|
||||
qs: query,
|
||||
headers: {},
|
||||
headers: {} as IDataObject,
|
||||
uri: uri || `https://api.hubapi.com${endpoint}`,
|
||||
body,
|
||||
json: true,
|
||||
useQuerystring: true,
|
||||
};
|
||||
} satisfies IRequestOptions;
|
||||
|
||||
try {
|
||||
if (authenticationMethod === 'apiKey') {
|
||||
@@ -48,7 +48,7 @@ export async function hubspotApiRequest(
|
||||
} else if (authenticationMethod === 'appToken') {
|
||||
const credentials = await this.getCredentials('hubspotAppToken');
|
||||
|
||||
options.headers!.Authorization = `Bearer ${credentials.appToken}`;
|
||||
options.headers.Authorization = `Bearer ${credentials.appToken}`;
|
||||
return await this.helpers.request(options);
|
||||
} else if (authenticationMethod === 'developerApi') {
|
||||
if (endpoint.includes('webhooks')) {
|
||||
@@ -79,7 +79,7 @@ export async function hubspotApiRequest(
|
||||
export async function hubspotApiRequestAllItems(
|
||||
this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
|
||||
propertyName: string,
|
||||
method: string,
|
||||
method: IHttpRequestMethods,
|
||||
endpoint: string,
|
||||
// tslint:disable-next-line:no-any
|
||||
body: any = {},
|
||||
@@ -2002,7 +2002,7 @@ export async function validateCredentials(
|
||||
apiKey: string;
|
||||
};
|
||||
|
||||
const options: OptionsWithUri = {
|
||||
const options: IRequestOptions = {
|
||||
method: 'GET',
|
||||
headers: {},
|
||||
uri: 'https://api.hubapi.com/deals/v1/deal/paged',
|
||||
|
||||
Reference in New Issue
Block a user