mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-02-21 02:56:40 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 Select base url depending on the datacenter (#1744)

Browse source
This commit is contained in:
Ricardo Espinoza 2021-05-07 19:54:40 -04:00 committed by GitHub
parent f6fdf6b5e1
commit 31dd959109
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/nodes-base/credentials/ZohoOAuth2Api.credentials.ts
View file

@ -53,7 +53,7 @@ export class ZohoOAuth2Api implements ICredentialType {
}, },
{ {
name: 'CN - https://accounts.zoho.com.cn/oauth/v2/token', name: 'CN - https://accounts.zoho.com.cn/oauth/v2/token',
value: ' https://accounts.zoho.com.cn/oauth/v2/token', value: 'https://accounts.zoho.com.cn/oauth/v2/token',
}, },
], ],
default: 'https://accounts.zoho.com/oauth/v2/token', default: 'https://accounts.zoho.com/oauth/v2/token',

13
packages/nodes-base/nodes/Zoho/GenericFunctions.ts
View file

@ -1,4 +1,7 @@
import { OptionsWithUri } from 'request'; import {
OptionsWithUri,
} from 'request';
import { import {
IExecuteFunctions, IExecuteFunctions,
IExecuteSingleFunctions, IExecuteSingleFunctions,
@ -9,6 +12,8 @@ import {
} from 'n8n-workflow'; } from 'n8n-workflow';
export async function zohoApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any export async function zohoApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
const { oauthTokenData: { api_domain } } = this.getCredentials('zohoOAuth2Api') as { [key: string]: IDataObject };
const options: OptionsWithUri = { const options: OptionsWithUri = {
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
@ -20,7 +25,7 @@ export async function zohoApiRequest(this: IExecuteFunctions | IExecuteSingleFun
], ],
}, },
qs, qs,
uri: uri || `https://www.zohoapis.com/crm/v2${resource}`, uri: uri || `${api_domain}/crm/v2${resource}`,
json: true, json: true,
}; };
try { try {
@ -31,7 +36,7 @@ export async function zohoApiRequest(this: IExecuteFunctions | IExecuteSingleFun
} }
} }
export async function zohoApiRequestAllItems(this: IExecuteFunctions | ILoadOptionsFunctions, propertyName: string ,method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any export async function zohoApiRequestAllItems(this: IExecuteFunctions | ILoadOptionsFunctions, propertyName: string, method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
const returnData: IDataObject[] = []; const returnData: IDataObject[] = [];
@ -51,4 +56,4 @@ export async function zohoApiRequestAllItems(this: IExecuteFunctions | ILoadOpti
); );
return returnData; return returnData;
} }