fix(ERPNext Node): Fix issue with credential test and add frappe cloud url (#6283)

This commit is contained in:
Jon 2023-05-22 11:11:08 +01:00 committed by GitHub
parent 37506050c3
commit 2a2b6452dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 3 deletions

View file

@ -56,6 +56,28 @@ export class ERPNextApi implements ICredentialType {
},
},
},
{
displayName: 'Domain',
name: 'domain',
type: 'options',
default: 'erpnext.com',
options: [
{
name: 'erpnext.com',
value: 'erpnext.com',
},
{
name: 'frappe.cloud',
value: 'frappe.cloud',
},
],
description: 'Domain for your cloud hosted ERPNext instance.',
displayOptions: {
show: {
environment: ['cloudHosted'],
},
},
},
{
displayName: 'Domain',
name: 'domain',
@ -90,9 +112,19 @@ export class ERPNextApi implements ICredentialType {
test: ICredentialTestRequest = {
request: {
baseURL:
'={{$credentials.environment === "cloudHosted" ? "https://" + $credentials.subdomain + ".erpnext.com" : $credentials.domain}}',
url: '/api/resource/Doctype',
'={{$credentials.environment === "cloudHosted" ? "https://" + $credentials.subdomain + "." + $credentials.domain : $credentials.domain}}',
url: '/api/method/frappe.auth.get_logged_user',
skipSslCertificateValidation: '={{ $credentials.allowUnauthorizedCerts }}',
},
rules: [
{
type: 'responseSuccessBody',
properties: {
key: 'message',
value: undefined,
message: 'Unable to authenticate, Check the credentials and the url',
},
},
],
};
}

View file

@ -13,7 +13,7 @@ import { NodeApiError } from 'n8n-workflow';
* Return the base API URL based on the user's environment.
*/
const getBaseUrl = ({ environment, domain, subdomain }: ERPNextApiCredentials) =>
environment === 'cloudHosted' ? `https://${subdomain}.erpnext.com` : domain;
environment === 'cloudHosted' ? `https://${subdomain}.${domain}` : domain;
export async function erpNextApiRequest(
this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,