Support testing with Postgres and MySQL for user management backend

packages/cli/package.json

@@ -30,6 +30,8 @@
     "start:default": "cd bin && ./n8n",
     "start:windows": "cd bin && n8n",
     "test": "jest",
+    "test:sqlite": "export DB_TYPE=sqlite && jest",
+    "test:postgres": "export DB_TYPE=postgresdb && jest",
     "watch": "tsc --watch",
     "typeorm": "ts-node ../../node_modules/typeorm/cli.js"
   },

packages/cli/src/Db.ts

@@ -4,7 +4,13 @@
 /* eslint-disable no-case-declarations */
 /* eslint-disable @typescript-eslint/naming-convention */
 import { UserSettings } from 'n8n-core';
-import { ConnectionOptions, createConnection, getRepository, LoggerOptions } from 'typeorm';
+import {
+	Connection,
+	ConnectionOptions,
+	createConnection,
+	getRepository,
+	LoggerOptions,
+} from 'typeorm';
 import { TlsOptions } from 'tls';
 import * as path from 'path';
 // eslint-disable-next-line import/no-cycle
@@ -18,8 +24,6 @@ import { entities } from './databases/entities';
 import { postgresMigrations } from './databases/postgresdb/migrations';
 import { mysqlMigrations } from './databases/mysqldb/migrations';
 import { sqliteMigrations } from './databases/sqlite/migrations';
-import { TEST_CONNECTION_OPTIONS } from '../test/integration/shared/constants';
-import { isTestRun } from '../test/integration/shared/utils';
 
 export const collections: IDatabaseCollections = {
 	Credentials: null,
@@ -34,82 +38,91 @@ export const collections: IDatabaseCollections = {
 	Settings: null,
 };
 
-export async function init(): Promise<IDatabaseCollections> {
+export async function init(
+	testConnectionOptions?: ConnectionOptions,
+): Promise<IDatabaseCollections> {
 	const dbType = (await GenericHelpers.getConfigValue('database.type')) as DatabaseType;
 	const n8nFolder = UserSettings.getUserN8nFolderPath();
 
 	let connectionOptions: ConnectionOptions;
+	let connection: Connection;
 
 	const entityPrefix = config.get('database.tablePrefix');
 
-	switch (dbType) {
-		case 'postgresdb':
-			const sslCa = (await GenericHelpers.getConfigValue('database.postgresdb.ssl.ca')) as string;
-			const sslCert = (await GenericHelpers.getConfigValue(
-				'database.postgresdb.ssl.cert',
-			)) as string;
-			const sslKey = (await GenericHelpers.getConfigValue('database.postgresdb.ssl.key')) as string;
-			const sslRejectUnauthorized = (await GenericHelpers.getConfigValue(
-				'database.postgresdb.ssl.rejectUnauthorized',
-			)) as boolean;
-
-			let ssl: TlsOptions | undefined;
-			if (sslCa !== '' || sslCert !== '' || sslKey !== '' || !sslRejectUnauthorized) {
-				ssl = {
-					ca: sslCa || undefined,
-					cert: sslCert || undefined,
-					key: sslKey || undefined,
-					rejectUnauthorized: sslRejectUnauthorized,
+	if (testConnectionOptions) {
+		connectionOptions = testConnectionOptions;
+	} else {
+		switch (dbType) {
+			case 'postgresdb':
+				const sslCa = (await GenericHelpers.getConfigValue('database.postgresdb.ssl.ca')) as string;
+				const sslCert = (await GenericHelpers.getConfigValue(
+					'database.postgresdb.ssl.cert',
+				)) as string;
+				const sslKey = (await GenericHelpers.getConfigValue(
+					'database.postgresdb.ssl.key',
+				)) as string;
+				const sslRejectUnauthorized = (await GenericHelpers.getConfigValue(
+					'database.postgresdb.ssl.rejectUnauthorized',
+				)) as boolean;
+
+				let ssl: TlsOptions | undefined;
+				if (sslCa !== '' || sslCert !== '' || sslKey !== '' || !sslRejectUnauthorized) {
+					ssl = {
+						ca: sslCa || undefined,
+						cert: sslCert || undefined,
+						key: sslKey || undefined,
+						rejectUnauthorized: sslRejectUnauthorized,
+					};
+				}
+
+				connectionOptions = {
+					type: 'postgres',
+					entityPrefix,
+					database: (await GenericHelpers.getConfigValue('database.postgresdb.database')) as string,
+					host: (await GenericHelpers.getConfigValue('database.postgresdb.host')) as string,
+					password: (await GenericHelpers.getConfigValue('database.postgresdb.password')) as string,
+					port: (await GenericHelpers.getConfigValue('database.postgresdb.port')) as number,
+					username: (await GenericHelpers.getConfigValue('database.postgresdb.user')) as string,
+					schema: config.get('database.postgresdb.schema'),
+					migrations: postgresMigrations,
+					migrationsRun: true,
+					migrationsTableName: `${entityPrefix}migrations`,
+					ssl,
 				};
-			}
-
-			connectionOptions = {
-				type: 'postgres',
-				entityPrefix,
-				database: (await GenericHelpers.getConfigValue('database.postgresdb.database')) as string,
-				host: (await GenericHelpers.getConfigValue('database.postgresdb.host')) as string,
-				password: (await GenericHelpers.getConfigValue('database.postgresdb.password')) as string,
-				port: (await GenericHelpers.getConfigValue('database.postgresdb.port')) as number,
-				username: (await GenericHelpers.getConfigValue('database.postgresdb.user')) as string,
-				schema: config.get('database.postgresdb.schema'),
-				migrations: postgresMigrations,
-				migrationsRun: true,
-				migrationsTableName: `${entityPrefix}migrations`,
-				ssl,
-			};
-
-			break;
-
-		case 'mariadb':
-		case 'mysqldb':
-			connectionOptions = {
-				type: dbType === 'mysqldb' ? 'mysql' : 'mariadb',
-				database: (await GenericHelpers.getConfigValue('database.mysqldb.database')) as string,
-				entityPrefix,
-				host: (await GenericHelpers.getConfigValue('database.mysqldb.host')) as string,
-				password: (await GenericHelpers.getConfigValue('database.mysqldb.password')) as string,
-				port: (await GenericHelpers.getConfigValue('database.mysqldb.port')) as number,
-				username: (await GenericHelpers.getConfigValue('database.mysqldb.user')) as string,
-				migrations: mysqlMigrations,
-				migrationsRun: true,
-				migrationsTableName: `${entityPrefix}migrations`,
-				timezone: 'Z', // set UTC as default
-			};
-			break;
-
-		case 'sqlite':
-			connectionOptions = {
-				type: 'sqlite',
-				database: path.join(n8nFolder, 'database.sqlite'),
-				entityPrefix,
-				migrations: sqliteMigrations,
-				migrationsRun: false, // migrations for sqlite will be ran manually for now; see below
-				migrationsTableName: `${entityPrefix}migrations`,
-			};
-			break;
-
-		default:
-			throw new Error(`The database "${dbType}" is currently not supported!`);
+
+				break;
+
+			case 'mariadb':
+			case 'mysqldb':
+				connectionOptions = {
+					type: dbType === 'mysqldb' ? 'mysql' : 'mariadb',
+					database: (await GenericHelpers.getConfigValue('database.mysqldb.database')) as string,
+					entityPrefix,
+					host: (await GenericHelpers.getConfigValue('database.mysqldb.host')) as string,
+					password: (await GenericHelpers.getConfigValue('database.mysqldb.password')) as string,
+					port: (await GenericHelpers.getConfigValue('database.mysqldb.port')) as number,
+					username: (await GenericHelpers.getConfigValue('database.mysqldb.user')) as string,
+					migrations: mysqlMigrations,
+					migrationsRun: true,
+					migrationsTableName: `${entityPrefix}migrations`,
+					timezone: 'Z', // set UTC as default
+				};
+				break;
+
+			case 'sqlite':
+				connectionOptions = {
+					type: 'sqlite',
+					database: path.join(n8nFolder, 'database.sqlite'),
+					entityPrefix,
+					migrations: sqliteMigrations,
+					migrationsRun: false, // migrations for sqlite will be ran manually for now; see below
+					migrationsTableName: `${entityPrefix}migrations`,
+				};
+				break;
+
+			default:
+				throw new Error(`The database "${dbType}" is currently not supported!`);
+		}
 	}
 
 	let loggingOption: LoggerOptions = (await GenericHelpers.getConfigValue(
@@ -128,10 +141,6 @@ export async function init(): Promise<IDatabaseCollections> {
 		}
 	}
 
-	if (isTestRun) {
-		connectionOptions = TEST_CONNECTION_OPTIONS;
-	}
-
 	Object.assign(connectionOptions, {
 		entities: Object.values(entities),
 		synchronize: false,
@@ -141,9 +150,9 @@ export async function init(): Promise<IDatabaseCollections> {
 		)) as string,
 	});
 
-	let connection = await createConnection(connectionOptions);
+	connection = await createConnection(connectionOptions);
 
-	if (dbType === 'sqlite') {
+	if (!testConnectionOptions && dbType === 'sqlite') {
 		// This specific migration changes database metadata.
 		// A field is now nullable. We need to reconnect so that
 		// n8n knows it has changed. Happens only on sqlite.
@@ -169,17 +178,20 @@ export async function init(): Promise<IDatabaseCollections> {
 		}
 	}
 
-	collections.Credentials = getRepository(entities.CredentialsEntity);
-	collections.Execution = getRepository(entities.ExecutionEntity);
-	collections.Workflow = getRepository(entities.WorkflowEntity);
-	collections.Webhook = getRepository(entities.WebhookEntity);
-	collections.Tag = getRepository(entities.TagEntity);
-
-	collections.Role = getRepository(entities.Role);
-	collections.User = getRepository(entities.User);
-	collections.SharedCredentials = getRepository(entities.SharedCredentials);
-	collections.SharedWorkflow = getRepository(entities.SharedWorkflow);
-	collections.Settings = getRepository(entities.Settings);
+	collections.Credentials = getRepository(entities.CredentialsEntity, testConnectionOptions?.name);
+	collections.Execution = getRepository(entities.ExecutionEntity, testConnectionOptions?.name);
+	collections.Workflow = getRepository(entities.WorkflowEntity, testConnectionOptions?.name);
+	collections.Webhook = getRepository(entities.WebhookEntity, testConnectionOptions?.name);
+	collections.Tag = getRepository(entities.TagEntity, testConnectionOptions?.name);
+
+	collections.Role = getRepository(entities.Role, testConnectionOptions?.name);
+	collections.User = getRepository(entities.User, testConnectionOptions?.name);
+	collections.SharedCredentials = getRepository(
+		entities.SharedCredentials,
+		testConnectionOptions?.name,
+	);
+	collections.SharedWorkflow = getRepository(entities.SharedWorkflow, testConnectionOptions?.name);
+	collections.Settings = getRepository(entities.Settings, testConnectionOptions?.name);
 
 	return collections;
 }

packages/cli/src/UserManagement/routes/users.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-restricted-syntax */
 /* eslint-disable import/no-cycle */
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { Response } from 'express';
@@ -202,6 +203,16 @@ export function usersNamespace(this: N8nApp): void {
 				throw new ResponseHelper.ResponseError('Invalid payload', undefined, 400);
 			}
 
+			// Postgres validates UUID format
+			for (const userId of [inviterId, inviteeId]) {
+				if (!validator.isUUID(userId)) {
+					Logger.debug('Request to resolve signup token failed because of invalid user ID', {
+						userId,
+					});
+					throw new ResponseHelper.ResponseError('Invalid userId', undefined, 400);
+				}
+			}
+
 			const users = await Db.collections.User!.find({ where: { id: In([inviterId, inviteeId]) } });
 
 			if (users.length !== 2) {