🔀 Merge branch 'master' of https://github.com/thorstenfreitag/n8n into thorstenfreitag-master

packages/nodes-base/credentials/GristApi.credentials.ts

@@ -29,6 +29,10 @@ export class GristApi implements ICredentialType {
 					name: 'Paid',
 					value: 'paid',
 				},
+				{
+					name: 'Self-hosted',
+					value: 'selfhosted',
+				},				
 			],
 		},
 		{
@@ -46,5 +50,20 @@ export class GristApi implements ICredentialType {
 				},
 			},
 		},
+		{
+			displayName: 'Self-hosted URL',
+			name: 'selfHostedUrl',
+			type: 'string',
+			default: '',
+			required: true,
+			description: 'URL of your Grist instance (include http/https without /api and no trailing slash)',
+			displayOptions: {
+				show: {
+					planType: [
+						'selfhosted',
+					],
+				},
+			},
+		},
 	];
 }

packages/nodes-base/nodes/Grist/GenericFunctions.ts

@@ -31,16 +31,19 @@ export async function gristApiRequest(
 		apiKey,
 		planType,
 		customSubdomain,
+		selfHostedUrl,
 	} = await this.getCredentials('gristApi') as GristCredentials;
 
-	const subdomain = planType === 'free' ? 'docs' : customSubdomain;
+	const gristapiurl = (planType === 'free') ? `https://docs.getgrist.com/api${endpoint}` :
+	(planType === 'paid') ? `https://${customSubdomain}.getgrist.com/api${endpoint}` :
+  	`${selfHostedUrl}/api${endpoint}`;
 
 	const options: OptionsWithUri = {
 		headers: {
 			Authorization: `Bearer ${apiKey}`,
 		},
 		method,
-		uri: `https://${subdomain}.getgrist.com/api${endpoint}`,
+		uri: gristapiurl,
 		qs,
 		body,
 		json: true,

packages/nodes-base/nodes/Grist/Grist.node.ts

@@ -85,18 +85,21 @@ export class Grist implements INodeType {
 					apiKey,
 					planType,
 					customSubdomain,
+					selfHostedUrl,
 				} = credential.data as GristCredentials;
 
-				const subdomain = planType === 'free' ? 'docs' : customSubdomain;
-
 				const endpoint = '/orgs';
 
+				const gristapiurl = (planType === 'free') ? `https://docs.getgrist.com/api${endpoint}` :
+				(planType === 'paid') ? `https://${customSubdomain}.getgrist.com/api${endpoint}` :
+  				`${selfHostedUrl}/api${endpoint}`;
+
 				const options: OptionsWithUri = {
 					headers: {
 						Authorization: `Bearer ${apiKey}`,
 					},
 					method: 'GET',
-					uri: `https://${subdomain}.getgrist.com/api${endpoint}`,
+					uri: gristapiurl,
 					qs: { limit: 1 },
 					json: true,
 				};

packages/nodes-base/nodes/Grist/types.d.ts

@@ -1,7 +1,8 @@
 export type GristCredentials = {
 	apiKey: string;
-	planType: 'free' | 'paid';
+	planType: 'free' | 'paid' | 'selfhosted';
 	customSubdomain?: string;
+	selfHostedUrl?: string;
 }
 
 export type GristColumns = {