feat(NocoDB Node): Add support v0.90.0+ (#3146)

* feat(NocoDB Node): add support for new NocoDB API * fix(NocoDB Node): fix binary row update on old NocoDB API * fix(NocoDB Node): fix getAll endpoint * feat(NocoDB Node): allow xc-token as credential * fix(NocoDB Node): get all for new api * feat(NocoDB Node): list options & change to single data apis * Moved to new format and reduced some code reuse * Added API Version to Node Settings * Improvements to remove code reuse and use bulk endpoints * Added new credentials to close off PR#2909 * Credential testing working * ⚡ Improvements * ⚡ Add generic authentication type to credentials * 🔥 Remove credentials verification * Fixed Get All not working with manual limit * Removed json object from project / table fields * added fix from n8n-4159 * 👕 Fix linting issue * feat: Improvements to pairedItem * refactor: Consolidate hoisted package versions (#3724) * 📦 Consolidate hoisted package versions * 📦 Update `package-lock.json` * 📦 Update `package-lock.json` * 📦 Update `package-lock.json` * refactor: Upgrade to ESLint 8 (#3722) * ⬆️ Upgrade to ESLint 8 * 📦 Update package-lock.json * 👕 Add lint exceptions * 👕 Add more lint exceptions * ➖ Remove `tslint` from some packages * 👕 Except init file * 📦 Update `package-lock.json` * 📦 Update `package-lock.json` * 👕 Add exceptions to new lines coming from `master ` Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com> * refactor: Format all credentials (#3720) * Apply Prettier to all credentials * Fix quotes for lint * 👕 Remove `quotemark` rule * 👕 Run Prettier to take over quotes * ⬆️ Upgrade `eslint-plugin-n8n-nodes-base` * 📦 Update `package-lock.json` Co-authored-by: Omar Ajoue <krynble@gmail.com> Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com> * fix: Fix node_type property in all events (#3759) * ⬆️ Update package-lock.json file * fix(Mautic Node): Fix authentication issue (#3761) * Fixes mautic credential issue * removed unused imports Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com> * fix(AWS DynamoDB Node): Fix expression attribute names (#3763) * Fix expression attribute names in getAll * fix: EAN value should be a string, not object * Removed extra code for working out what credentials are in use * fix(editor): Fix linking buttons color (#3770) * fix color of icon * center buttons * fix(editor): Restore pindata header colors (#3758) * 🎨 Restore `color-secondary-tint` colors * 🔥 Remove typing from JS file * fix(editor): Fix sticky duplication and position bug (#3755) * fix bug when inserting sticky * center sticky on insert * export as const * refactor(editor): Move all colors to css variables (#3723) * update white color * update white color * update more whites * update color * update curr running * update text color #555 * update white color * set search bar colors * update colors * update node executing * update text colors * update light color * update theme * update theme * update overlays carousel * update theme vars * add dark theme tokens * update text * update table colors * fix conflict * update colors * feat(Metabase Node): Add Metabase Node (#3033) * Boilerplate with new node's version for metabse * Metabases MVP features * Added new credential for metabse, added custom auth for metabase * Fixed bug with one enpoint not working * Clean up code * Uniformised the renovate token * Made two example of responses for review * Fixed lint issues * Feature add datasources * Changed output from databases * Changed questions data output * Fixed issue when testing credentials with new node format * Add the possibility to get raw data * Removed handle for the metabase meta results, changed export's name * Add binary extraction for the result data * Fixed binary download issue * ⚡ Add preAuthentication method to credentials * Revert "Added new credential for metabse, added custom auth for metabase" This reverts commit 5f1b760. * Revert "Added new credential for metabse, added custom auth for metabase" This reverts commit 5f1b760. * Added preAuth and fixed autfixable linting rules * Fixed linting errors * Linting fixes * Remove / at the end of url, and add placeholder for cred url * Make export to Json retun only json and no binary * Fix lint issues * Add action and exception for lint rule * Remove unnecessary credential file * ⚡ Simplify and cleanup Co-authored-by: ricardo <ricardoespinoza105@gmail.com> Co-authored-by: Omar Ajoue <krynble@gmail.com> Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com> * fix(editor): Fix spaces bug (#3774) * refactor(editor): Change welcome sticky content (#3769) * Updated Welcome sticky content * Updated welcome sticky thumbnail image Image was swapped out, used exact same file name + sizing so did not require code changes. * Replaced welcome sticky thumbnail image * fix(Fix Rocketchat Node): Fix authentication issue (#3778) * Add suggested VSCode settings (#3783) * ⚡ Add suggested settings * 🔥 Remove app-level setting * 🎨 Update indentation * fix(core): Add windows support to import:credentials --separate (#3589) * feat(Item List Node): Add operation for creating array from input items (#3149) * 🔨 create array operation * 🔨 removed semicolumn * 🔨 updated UI * ⚡ display option fix * ⚡ aggregate operation description update, default aggregate item * refactor: Add Onboarding call prompts (#3682) * ✨ Implemented initial onboarding call prompt logic * ✨ Added onboarding call prompt feature environment variable * ✨ Implemented onboarding session signup modal * 📈 Added initial telemetry for the onboarding call prompt * ✔️ Fixing linter error in server.ts * 💄 Updating onboaring call prompt and modal wording and styling * ✨ Implemented initial version of fake doors feature * ✨ Added parameters to onboarding call prompt request * ✨ Finished implementing fake doors in settings * 🔨 Updating onboarding call prompt fetching logic (fetching before timeout starts) * 👌 Updating onboarding call prompt and fake door components based on the front-end review feedback * ✨ Updated fake doors so they support UI location specification. Added credentials UI fake doors. * ⚡ Added checkbox to the signup form, improved N8NCheckbox formatting to better handle overflow * 💄 Moving seignup checkbox label text to i18n file, updating checkbox component css to force text wrap * ✨ Update API calls to work with the new workflow request and response formats * 👌 Updating fake door front-end based on the review feedback * 👌 Updating onboarding call prompt and fake doors UI based in the product feedback * ✨ Updated onboarding call prompts front-end to work with new endpoints and added new telemetry events * 🐛 Fixing onboarding call prompts not appearing in first user sessions * ⚡️ add createdAt to PublicUser * 👌 Updating onboarding call prompts front-end to work with the latest back-end and addressing latest product review * ✨ Improving error handling when submitting user emails on signup * 💄 Updating info text on Logging feature page * 💄 Updating first onboarding call prompt timeout to 5 minutes * 💄 Fixing `N8nCheckbox` component font overflow Co-authored-by: Ben Hesseldieck <b.hesseldieck@gmail.com> * feat(Kafka Trigger Node): Add additional options (#3600) * 🔨 additional options to kafka trigger * ⚡ option for maxInFlightRequests * ⚡ Small change Co-authored-by: ricardo <ricardoespinoza105@gmail.com> * fix(editor): Fix pin data in executions when pinData is null. (#3787) * ⬆️ Update package-lock.json file * 🔖 Release n8n-workflow@0.110.0 * ⬆️ Set n8n-workflow@0.110.0 on n8n-core * 🔖 Release n8n-core@0.128.0 * ⬆️ Set n8n-core@0.128.0 and n8n-workflow@0.110.0 on n8n-node-dev * 🔖 Release n8n-node-dev@0.67.0 * ⬆️ Set n8n-core@0.128.0 and n8n-workflow@0.110.0 on n8n-nodes-base * 🔖 Release n8n-nodes-base@0.186.0 * 🔖 Release n8n-design-system@0.28.0 * ⬆️ Set n8n-design-system@0.28.0 and n8n-workflow@0.110.0 on n8n-editor-ui * 🔖 Release n8n-editor-ui@0.154.0 * ⬆️ Set n8n-core@0.128.0, n8n-editor-ui@0.154.0, n8n-nodes-base@0.186.0 and n8n-workflow@0.110.0 on n8n * 🔖 Release n8n@0.188.0 * 🔖 Update main package.json to 0.188.0 * 📚 Update CHANGELOG.md with version 0.188.0 * 👕 Adjust line endings for Prettier lintings (#3786) * build: Use package-lock.json file with custom build * 💄 Updating onboarding prompt label * ⬆️ Set eslint@8.0.0 on n8n-workflow (#3768) * ⬆️ Upgrade `n8n-workflow` to ESLint 8 * 📦 Update `package-lock.json` * 📦 Re-update `package-lock.json` * ⚡ Fix on error behaviour for Delete, Get and Update Co-authored-by: Jonathan Bennetts <jonathan.bennetts@gmail.com> Co-authored-by: ricardo <ricardoespinoza105@gmail.com> Co-authored-by: Ricardo Espinoza <ricardo@n8n.io> Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com> Co-authored-by: Iván Ovejero <ivov.src@gmail.com> Co-authored-by: Omar Ajoue <krynble@gmail.com> Co-authored-by: Ahsan Virani <ahsan.virani@gmail.com> Co-authored-by: Nicholas Penree <nick@penree.com> Co-authored-by: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com> Co-authored-by: agobrech <45268029+agobrech@users.noreply.github.com> Co-authored-by: maxtkacz <maxtkacz@gmail.com> Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <netroy@users.noreply.github.com> Co-authored-by: Michael Kret <88898367+michael-radency@users.noreply.github.com> Co-authored-by: Milorad FIlipović <miloradfilipovic19@gmail.com> Co-authored-by: Ben Hesseldieck <b.hesseldieck@gmail.com> Co-authored-by: Alex Grozav <alex@grozav.com> Co-authored-by: Milorad Filipovic <milorad@n8n.io>
n8n-io · Aug 5, 2022 · e1e9a68 · e1e9a68
1 parent deffc28
commit e1e9a68
Show file tree

Hide file tree

Showing 6 changed files with 353 additions and 38 deletions.
diff --git a/packages/nodes-base/credentials/NocoDb.credentials.ts b/packages/nodes-base/credentials/NocoDb.credentials.ts
@@ -11,7 +11,7 @@ export class NocoDb implements ICredentialType {
 	documentationUrl = 'nocoDb';
 	properties: INodeProperties[] = [
 		{
-			displayName: 'API Token',
+			displayName: 'User Token',
 			name: 'apiToken',
 			type: 'string',
 			default: '',

diff --git a/packages/nodes-base/credentials/NocoDbApiToken.credentials.ts b/packages/nodes-base/credentials/NocoDbApiToken.credentials.ts
@@ -0,0 +1,37 @@
+import {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+
+export class NocoDbApiToken implements ICredentialType {
+	name = 'nocoDbApiToken';
+	displayName = 'NocoDB API Token';
+	documentationUrl = 'nocoDb';
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Token',
+			name: 'apiToken',
+			type: 'string',
+			default: '',
+		},
+		{
+			displayName: 'Host',
+			name: 'host',
+			type: 'string',
+			default: '',
+			placeholder: 'http(s)://localhost:8080',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'xc-token': '={{$credentials.apiToken}}',
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/nodes/NocoDB/GenericFunctions.ts b/packages/nodes-base/nodes/NocoDB/GenericFunctions.ts
@@ -35,14 +35,22 @@ interface IAttachment {
  * @returns {Promise<any>}
  */
 export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions, method: string, endpoint: string, body: object, query?: IDataObject, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
-	const credentials = await this.getCredentials('nocoDb');
+	const authenticationMethod = this.getNodeParameter('authentication', 0) as string;
+	const credentials = await this.getCredentials(authenticationMethod);
+
+	if (credentials === undefined) {
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
+	}
+
+	const baseUrl = credentials.host as string;
+
 	query = query || {};
 
 	const options: OptionsWithUri = {
 		method,
 		body,
 		qs: query,
-		uri: uri || `${credentials.host}${endpoint}`,
+		uri: uri || baseUrl.endsWith('/') ? `${baseUrl.slice(0, -1)}${endpoint}` : `${baseUrl}${endpoint}`,
 		json: true,
 
 	};
@@ -56,7 +64,7 @@ export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoa
 	}
 
 	try {
-		return await this.helpers.requestWithAuthentication.call(this, 'nocoDb', options);
+		return await this.helpers.requestWithAuthentication.call(this, authenticationMethod, options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error);
 	}
@@ -76,6 +84,7 @@ export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoa
  * @returns {Promise<any>}
  */
 export async function apiRequestAllItems(this: IHookFunctions | IExecuteFunctions | IPollFunctions, method: string, endpoint: string, body: IDataObject, query?: IDataObject): Promise<any> { // tslint:disable-line:no-any
+	const version = this.getNode().typeVersion as number;
 
 	if (query === undefined) {
 		query = {};
@@ -88,12 +97,12 @@ export async function apiRequestAllItems(this: IHookFunctions | IExecuteFunction
 
 	do {
 		responseData = await apiRequest.call(this, method, endpoint, body, query);
-		returnData.push(...responseData);
+		version === 1 ? returnData.push(...responseData) : returnData.push(...responseData.list);
 
 		query.offset += query.limit;
 
 	} while (
-		responseData.length !== 0
+		version === 1 ? responseData.length !== 0 : responseData.pageInfo.isLastPage !== true
 	);
 
 	return returnData;