n8n 0.211.0 → 0.211.2

package/dist/commands/BaseCommand.js

@@ -52,17 +52,17 @@ class BaseCommand extends core_1.Command {
         this.exit();
     }
     async getInstanceOwner() {
-        const globalRole = await Db.collections.Role.findOneOrFail({
+        const globalRole = await Db.collections.Role.findOneByOrFail({
             name: 'owner',
             scope: 'global',
         });
-        const owner = await Db.collections.User.findOne({ globalRole });
+        const owner = await Db.collections.User.findOneBy({ globalRoleId: globalRole.id });
         if (owner)
             return owner;
         const user = new User_1.User();
         Object.assign(user, { ...this.defaultUserProps, globalRole });
         await Db.collections.User.save(user);
-        return Db.collections.User.findOneOrFail({ globalRole });
+        return Db.collections.User.findOneByOrFail({ globalRoleId: globalRole.id });
     }
 }
 exports.BaseCommand = BaseCommand;

package/dist/commands/BaseCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseCommand.js","sourceRoot":"","sources":["../../src/commands/BaseCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAsC;AACtC,+CAA2C;AAC3C,qCAA6C;AAC7C,4CAAyC;AACzC,yCAA2B;AAC3B,2CAAqC;AAErC,MAAsB,WAAY,SAAQ,cAAO;IAAjD;;QAwBC,qBAAgB,GAAG;YAClB,SAAS,EAAE,IAAI;YACf,QAAQ,EAAE,IAAI;YACd,KAAK,EAAE,IAAI;YACX,QAAQ,EAAE,IAAI;YACd,kBAAkB,EAAE,IAAI;SACxB,CAAC;IAoBH,CAAC;IA3CA,KAAK,CAAC,IAAI;QACT,IAAI,CAAC,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;QAC1B,0BAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE9B,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,OAAO;QACZ,IAAI,kBAAM;YAAE,OAAO;QAEnB,IAAI,CAAC,IAAI,EAAE,CAAC;IACb,CAAC;IAcD,KAAK,CAAC,gBAAgB;QACrB,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC;YAC1D,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,QAAQ;SACf,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;QAEhE,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;QAExB,MAAM,IAAI,GAAG,IAAI,WAAI,EAAE,CAAC;QAExB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,GAAG,IAAI,CAAC,gBAAgB,EAAE,UAAU,EAAE,CAAC,CAAC;QAE9D,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAErC,OAAO,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IAC1D,CAAC;CACD;AAlDD,kCAkDC"}
+{"version":3,"file":"BaseCommand.js","sourceRoot":"","sources":["../../src/commands/BaseCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAsC;AACtC,+CAA2C;AAC3C,qCAA6C;AAC7C,4CAAyC;AACzC,yCAA2B;AAC3B,2CAAqC;AAErC,MAAsB,WAAY,SAAQ,cAAO;IAAjD;;QAwBC,qBAAgB,GAAG;YAClB,SAAS,EAAE,IAAI;YACf,QAAQ,EAAE,IAAI;YACd,KAAK,EAAE,IAAI;YACX,QAAQ,EAAE,IAAI;YACd,kBAAkB,EAAE,IAAI;SACxB,CAAC;IAoBH,CAAC;IA3CA,KAAK,CAAC,IAAI;QACT,IAAI,CAAC,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;QAC1B,0BAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE9B,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,OAAO;QACZ,IAAI,kBAAM;YAAE,OAAO;QAEnB,IAAI,CAAC,IAAI,EAAE,CAAC;IACb,CAAC;IAcD,KAAK,CAAC,gBAAgB;QACrB,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC;YAC5D,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,QAAQ;SACf,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;QAEnF,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;QAExB,MAAM,IAAI,GAAG,IAAI,WAAI,EAAE,CAAC;QAExB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,GAAG,IAAI,CAAC,gBAAgB,EAAE,UAAU,EAAE,CAAC,CAAC;QAE9D,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAErC,OAAO,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;IAC7E,CAAC;CACD;AAlDD,kCAkDC"}

package/dist/commands/db/revert.js

@@ -26,13 +26,14 @@ class DbRevertMigrationCommand extends command_1.Command {
                 dropSchema: false,
                 logging: ['query', 'error', 'schema'],
             };
-            connection = await (0, typeorm_1.createConnection)(connectionOptions);
+            connection = new typeorm_1.DataSource(connectionOptions);
+            await connection.initialize();
             await connection.undoLastMigration();
-            await connection.close();
+            await connection.destroy();
         }
         catch (error) {
-            if (connection)
-                await connection.close();
+            if (connection === null || connection === void 0 ? void 0 : connection.isInitialized)
+                await connection.destroy();
             console.error('Error reverting last migration. See log messages for details.');
             logger.error(error.message);
             this.exit(1);

package/dist/commands/db/revert.js.map

@@ -1 +1 @@
-{"version":3,"file":"revert.js","sourceRoot":"","sources":["../../../src/commands/db/revert.ts"],"names":[],"mappings":";;;;;;AAEA,4CAAgD;AAChD,qCAA0E;AAC1E,+CAA2C;AAE3C,qCAAqC;AACrC,6BAA4C;AAC5C,sDAA8B;AAE9B,MAAa,wBAAyB,SAAQ,iBAAO;IASpD,KAAK,CAAC,GAAG;QACR,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;QAC3B,0BAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEzB,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAErC,IAAI,UAAkC,CAAC;QACvC,IAAI;YACH,MAAM,MAAM,GAAG,gBAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YAC9C,MAAM,iBAAiB,GAAsB;gBAC5C,GAAG,CAAC,MAAM,IAAA,yBAAoB,EAAC,MAAM,CAAC,CAAC;gBACvC,WAAW,EAAE,EAAE;gBACf,WAAW,EAAE,KAAK;gBAClB,aAAa,EAAE,KAAK;gBACpB,UAAU,EAAE,KAAK;gBACjB,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC;aACrC,CAAC;YACF,UAAU,GAAG,MAAM,IAAA,0BAAgB,EAAC,iBAAiB,CAAC,CAAC;YACvD,MAAM,UAAU,CAAC,iBAAiB,EAAE,CAAC;YACrC,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;SACzB;QAAC,OAAO,KAAK,EAAE;YACf,IAAI,UAAU;gBAAE,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;YAEzC,OAAO,CAAC,KAAK,CAAC,+DAA+D,CAAC,CAAC;YAE/E,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC5B,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACb;QAED,IAAI,CAAC,IAAI,EAAE,CAAC;IACb,CAAC;;AAvCF,4DAwCC;AAvCO,oCAAW,GAAG,gCAAgC,CAAC;AAE/C,iCAAQ,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAE/B,8BAAK,GAAG;IACd,IAAI,EAAE,eAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;CAC/B,CAAC"}
+{"version":3,"file":"revert.js","sourceRoot":"","sources":["../../../src/commands/db/revert.ts"],"names":[],"mappings":";;;;;;AAEA,4CAAgD;AAChD,qCAA2F;AAC3F,+CAA2C;AAE3C,qCAAqC;AACrC,6BAA4C;AAC5C,sDAA8B;AAE9B,MAAa,wBAAyB,SAAQ,iBAAO;IASpD,KAAK,CAAC,GAAG;QACR,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;QAC3B,0BAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEzB,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAErC,IAAI,UAAkC,CAAC;QACvC,IAAI;YACH,MAAM,MAAM,GAAG,gBAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YAC9C,MAAM,iBAAiB,GAAsB;gBAC5C,GAAG,CAAC,MAAM,IAAA,yBAAoB,EAAC,MAAM,CAAC,CAAC;gBACvC,WAAW,EAAE,EAAE;gBACf,WAAW,EAAE,KAAK;gBAClB,aAAa,EAAE,KAAK;gBACpB,UAAU,EAAE,KAAK;gBACjB,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC;aACrC,CAAC;YACF,UAAU,GAAG,IAAI,oBAAU,CAAC,iBAAiB,CAAC,CAAC;YAC/C,MAAM,UAAU,CAAC,UAAU,EAAE,CAAC;YAC9B,MAAM,UAAU,CAAC,iBAAiB,EAAE,CAAC;YACrC,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC;SAC3B;QAAC,OAAO,KAAK,EAAE;YACf,IAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,aAAa;gBAAE,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC;YAE1D,OAAO,CAAC,KAAK,CAAC,+DAA+D,CAAC,CAAC;YAE/E,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC5B,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACb;QAED,IAAI,CAAC,IAAI,EAAE,CAAC;IACb,CAAC;;AAxCF,4DAyCC;AAxCO,oCAAW,GAAG,gCAAgC,CAAC;AAE/C,iCAAQ,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAE/B,8BAAK,GAAG;IACd,IAAI,EAAE,eAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;CAC/B,CAAC"}

package/dist/commands/execute.js

@@ -67,7 +67,7 @@ class Execute extends command_1.Command {
             return;
         }
         let workflowId;
-        let workflowData;
+        let workflowData = null;
         if (flags.file) {
             try {
                 workflowData = JSON.parse(await fs_1.promises.readFile(flags.file, 'utf8'));
@@ -79,7 +79,7 @@ class Execute extends command_1.Command {
                 }
                 throw error;
             }
-            if (workflowData === undefined ||
+            if (workflowData === null ||
                 workflowData.nodes === undefined ||
                 workflowData.connections === undefined) {
                 console.info(`The file "${flags.file}" does not contain valid workflow data.`);
@@ -90,8 +90,8 @@ class Execute extends command_1.Command {
         await startDbInitPromise;
         if (flags.id) {
             workflowId = flags.id;
-            workflowData = await Db.collections.Workflow.findOne(workflowId);
-            if (workflowData === undefined) {
+            workflowData = await Db.collections.Workflow.findOneBy({ id: workflowId });
+            if (workflowData === null) {
                 console.info(`The workflow with the id "${workflowId}" does not exist.`);
                 process.exit(1);
             }

package/dist/commands/execute.js.map

@@ -1 +1 @@
-{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../src/commands/execute.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../src/commands/execute.ts"],"names":[],"mappings":"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"}

package/dist/commands/import/credentials.d.ts

@@ -1,5 +1,5 @@
 import { Command, flags } from '@oclif/command';
-import { EntityManager } from 'typeorm';
+import type { EntityManager } from 'typeorm';
 import { Role } from '../../databases/entities/Role';
 export declare class ImportCredentialsCommand extends Command {
     static description: string;

package/dist/commands/import/credentials.js

@@ -32,7 +32,6 @@ const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const fs_1 = __importDefault(require("fs"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
-const typeorm_1 = require("typeorm");
 const Logger_1 = require("../../Logger");
 const Db = __importStar(require("../../Db"));
 const SharedCredentials_1 = require("../../databases/entities/SharedCredentials");
@@ -72,7 +71,7 @@ class ImportCredentialsCommand extends command_1.Command {
                     absolute: true,
                 });
                 totalImported = files.length;
-                await (0, typeorm_1.getConnection)().transaction(async (transactionManager) => {
+                await Db.getConnection().transaction(async (transactionManager) => {
                     this.transactionManager = transactionManager;
                     for (const file of files) {
                         const credential = JSON.parse(fs_1.default.readFileSync(file, { encoding: 'utf8' }));
@@ -90,7 +89,7 @@ class ImportCredentialsCommand extends command_1.Command {
             if (!Array.isArray(credentials)) {
                 throw new Error('File does not seem to contain credentials. Make sure the credentials are contained in an array.');
             }
-            await (0, typeorm_1.getConnection)().transaction(async (transactionManager) => {
+            await Db.getConnection().transaction(async (transactionManager) => {
                 this.transactionManager = transactionManager;
                 for (const credential of credentials) {
                     if (typeof credential.data === 'object') {
@@ -137,14 +136,15 @@ class ImportCredentialsCommand extends command_1.Command {
         const ownerGlobalRole = await Db.collections.Role.findOne({
             where: { name: 'owner', scope: 'global' },
         });
-        const owner = await Db.collections.User.findOne({ globalRole: ownerGlobalRole });
+        const owner = ownerGlobalRole &&
+            (await Db.collections.User.findOneBy({ globalRoleId: ownerGlobalRole.id }));
         if (!owner) {
             throw new Error(`Failed to find owner. ${FIX_INSTRUCTION}`);
         }
         return owner;
     }
     async getAssignee(userId) {
-        const user = await Db.collections.User.findOne(userId);
+        const user = await Db.collections.User.findOneBy({ id: userId });
         if (!user) {
             throw new Error(`Failed to find user with ID ${userId}`);
         }

package/dist/commands/import/credentials.js.map

@@ -1 +1 @@
-{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../../../src/commands/import/credentials.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../../../src/commands/import/credentials.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,4CAAgD;AAEhD,uCAAqD;AAErD,+CAA2C;AAE3C,4CAAoB;AACpB,0DAA6B;AAE7B,qCAAqC;AACrC,yCAA2B;AAE3B,sEAAmE;AAEnE,sEAAmE;AAEnE,MAAM,eAAe,GACpB,iFAAiF,CAAC;AAEnF,MAAa,wBAAyB,SAAQ,iBAAO;IA4BpD,KAAK,CAAC,GAAG;QACR,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;QAC3B,0BAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEzB,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAEvD,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;YACjB,OAAO,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;YACzE,OAAO;SACP;QAED,IAAI,KAAK,CAAC,QAAQ,EAAE;YACnB,IAAI,YAAE,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBAC/B,IAAI,CAAC,YAAE,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,EAAE;oBAC7C,OAAO,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;oBAC5D,OAAO;iBACP;aACD;SACD;QAED,IAAI,aAAa,GAAG,CAAC,CAAC;QAEtB,IAAI;YACH,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;YAEhB,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;YACrC,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;YAGzF,MAAM,uBAAY,CAAC,mBAAmB,EAAE,CAAC;YAEzC,MAAM,aAAa,GAAG,MAAM,uBAAY,CAAC,gBAAgB,EAAE,CAAC;YAE5D,IAAI,KAAK,CAAC,QAAQ,EAAE;gBACnB,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;gBAEjC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;oBACjC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;iBAC1C;gBAED,MAAM,KAAK,GAAG,MAAM,IAAA,mBAAI,EAAC,QAAQ,EAAE;oBAClC,GAAG,EAAE,SAAS;oBACd,QAAQ,EAAE,IAAI;iBACd,CAAC,CAAC;gBAEH,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC;gBAE7B,MAAM,EAAE,CAAC,aAAa,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE;oBACjE,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;oBAC7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;wBACzB,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;wBAE3E,IAAI,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE;4BAExC,sBAAW,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;yBAC/E;wBAED,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;qBAC7C;gBACF,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;gBAClC,OAAO,CAAC,IAAI,EAAE,CAAC;aACf;YAED,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;YAEnF,aAAa,GAAG,WAAW,CAAC,MAAM,CAAC;YAEnC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;gBAChC,MAAM,IAAI,KAAK,CACd,iGAAiG,CACjG,CAAC;aACF;YAED,MAAM,EAAE,CAAC,aAAa,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE;gBACjE,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;gBAC7C,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;oBACrC,IAAI,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE;wBAExC,sBAAW,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;qBAC/E;oBACD,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;iBAC7C;YACF,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;YAClC,OAAO,CAAC,IAAI,EAAE,CAAC;SACf;QAAC,OAAO,KAAK,EAAE;YACf,OAAO,CAAC,KAAK,CAAC,8EAA8E,CAAC,CAAC;YAC9F,IAAI,KAAK,YAAY,KAAK;gBAAE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACxD,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACb;IACF,CAAC;IAEO,aAAa,CAAC,KAAa;QAClC,OAAO,CAAC,IAAI,CAAC,yBAAyB,KAAK,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC;IAChG,CAAC;IAEO,KAAK,CAAC,uBAAuB;QACpC,MAAM,mBAAmB,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC;YAC7D,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE;SAC7C,CAAC,CAAC;QAEH,IAAI,CAAC,mBAAmB,EAAE;YACzB,MAAM,IAAI,KAAK,CAAC,yCAAyC,eAAe,EAAE,CAAC,CAAC;SAC5E;QAED,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IAChD,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,UAAkB,EAAE,IAAU;QAC3D,MAAM,aAAa,GAAG,IAAI,qCAAiB,EAAE,CAAC;QAE9C,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAEzC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAoB,aAAa,CAAC,CAAC;QAE7F,MAAM,mBAAmB,GAAG,IAAI,qCAAiB,EAAE,CAAC;QAEpD,MAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE;YAClC,WAAW,EAAE,eAAe;YAC5B,IAAI;YACJ,IAAI,EAAE,IAAI,CAAC,mBAAmB;SAC9B,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAoB,mBAAmB,CAAC,CAAC;IAC5E,CAAC;IAEO,KAAK,CAAC,QAAQ;QACrB,MAAM,eAAe,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC;YACzD,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE;SACzC,CAAC,CAAC;QAEH,MAAM,KAAK,GACV,eAAe;YACf,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,YAAY,EAAE,eAAe,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAE7E,IAAI,CAAC,KAAK,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,yBAAyB,eAAe,EAAE,CAAC,CAAC;SAC5D;QAED,OAAO,KAAK,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,MAAc;QACvC,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAEjE,IAAI,CAAC,IAAI,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,+BAA+B,MAAM,EAAE,CAAC,CAAC;SACzD;QAED,OAAO,IAAI,CAAC;IACb,CAAC;;AArLF,4DAsLC;AArLO,oCAAW,GAAG,oBAAoB,CAAC;AAEnC,iCAAQ,GAAG;IACjB,4CAA4C;IAC5C,6DAA6D;IAC7D,0FAA0F;IAC1F,2GAA2G;CAC3G,CAAC;AAEK,8BAAK,GAAG;IACd,IAAI,EAAE,eAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IAC/B,KAAK,EAAE,eAAK,CAAC,MAAM,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,oDAAoD;KACjE,CAAC;IACF,QAAQ,EAAE,eAAK,CAAC,OAAO,CAAC;QACvB,WAAW,EAAE,yDAAyD;KACtE,CAAC;IACF,MAAM,EAAE,eAAK,CAAC,MAAM,CAAC;QACpB,WAAW,EAAE,0DAA0D;KACvE,CAAC;CACF,CAAC"}

package/dist/commands/import/workflow.d.ts

@@ -1,5 +1,5 @@
 import { Command, flags } from '@oclif/command';
-import { EntityManager } from 'typeorm';
+import type { EntityManager } from 'typeorm';
 import { Role } from '../../databases/entities/Role';
 export declare class ImportWorkflowsCommand extends Command {
     static description: string;

package/dist/commands/import/workflow.js

@@ -32,7 +32,6 @@ const n8n_workflow_1 = require("n8n-workflow");
 const fs_1 = __importDefault(require("fs"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const n8n_core_1 = require("n8n-core");
-const typeorm_1 = require("typeorm");
 const uuid_1 = require("uuid");
 const Logger_1 = require("../../Logger");
 const Db = __importStar(require("../../Db"));
@@ -87,7 +86,7 @@ class ImportWorkflowsCommand extends command_1.Command {
                     absolute: true,
                 });
                 totalImported = files.length;
-                await (0, typeorm_1.getConnection)().transaction(async (transactionManager) => {
+                await Db.getConnection().transaction(async (transactionManager) => {
                     this.transactionManager = transactionManager;
                     for (const file of files) {
                         const workflow = JSON.parse(fs_1.default.readFileSync(file, { encoding: 'utf8' }));
@@ -111,7 +110,7 @@ class ImportWorkflowsCommand extends command_1.Command {
             const workflows = JSON.parse(fs_1.default.readFileSync(flags.input, { encoding: 'utf8' }));
             assertHasWorkflowsToImport(workflows);
             totalImported = workflows.length;
-            await (0, typeorm_1.getConnection)().transaction(async (transactionManager) => {
+            await Db.getConnection().transaction(async (transactionManager) => {
                 this.transactionManager = transactionManager;
                 for (const workflow of workflows) {
                     if (credentials.length > 0) {
@@ -166,14 +165,15 @@ class ImportWorkflowsCommand extends command_1.Command {
         const ownerGlobalRole = await Db.collections.Role.findOne({
             where: { name: 'owner', scope: 'global' },
         });
-        const owner = await Db.collections.User.findOne({ globalRole: ownerGlobalRole });
+        const owner = ownerGlobalRole &&
+            (await Db.collections.User.findOneBy({ globalRoleId: ownerGlobalRole === null || ownerGlobalRole === void 0 ? void 0 : ownerGlobalRole.id }));
         if (!owner) {
             throw new Error(`Failed to find owner. ${FIX_INSTRUCTION}`);
         }
         return owner;
     }
     async getAssignee(userId) {
-        const user = await Db.collections.User.findOne(userId);
+        const user = await Db.collections.User.findOneBy({ id: userId });
         if (!user) {
             throw new Error(`Failed to find user with ID ${userId}`);
         }

package/dist/commands/import/workflow.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow.js","sourceRoot":"","sources":["../../../src/commands/import/workflow.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workflow.js","sourceRoot":"","sources":["../../../src/commands/import/workflow.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,4CAAgD;AAEhD,+CAA2E;AAE3E,4CAAoB;AACpB,0DAA6B;AAC7B,uCAAwC;AAExC,+BAAkC;AAClC,qCAAqC;AACrC,yCAA2B;AAC3B,gEAA6D;AAC7D,gEAA6D;AAG7D,6CAAgD;AAGhD,MAAM,eAAe,GACpB,iFAAiF,CAAC;AAEnF,SAAS,0BAA0B,CAAC,SAAkB;IACrD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC9B,MAAM,IAAI,KAAK,CACd,6FAA6F,CAC7F,CAAC;KACF;IAED,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QACjC,IACC,OAAO,QAAQ,KAAK,QAAQ;YAC5B,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC;YACxD,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,EAC7D;YACD,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;SAClE;KACD;AACF,CAAC;AAED,MAAa,sBAAuB,SAAQ,iBAAO;IA4BlD,KAAK,CAAC,GAAG;QACR,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;QAC3B,0BAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEzB,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAErD,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;YACjB,OAAO,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;YACzE,OAAO;SACP;QAED,IAAI,KAAK,CAAC,QAAQ,EAAE;YACnB,IAAI,YAAE,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBAC/B,IAAI,CAAC,YAAE,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,EAAE;oBAC7C,OAAO,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;oBAC5D,OAAO;iBACP;aACD;SACD;QAED,IAAI;YACH,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;YAEhB,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACnC,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;YAGzF,MAAM,uBAAY,CAAC,mBAAmB,EAAE,CAAC;YACzC,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;YAC5D,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YAE7C,IAAI,aAAa,GAAG,CAAC,CAAC;YAEtB,IAAI,KAAK,CAAC,QAAQ,EAAE;gBACnB,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;gBAEjC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;oBACjC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;iBAC1C;gBAED,MAAM,KAAK,GAAG,MAAM,IAAA,mBAAI,EAAC,QAAQ,EAAE;oBAClC,GAAG,EAAE,SAAS;oBACd,QAAQ,EAAE,IAAI;iBACd,CAAC,CAAC;gBAEH,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC;gBAE7B,MAAM,EAAE,CAAC,aAAa,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE;oBACjE,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;oBAE7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;wBACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;wBAEzE,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;4BAC3B,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAW,EAAE,EAAE;gCACtC,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;gCAE7C,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;oCAEb,IAAI,CAAC,EAAE,GAAG,IAAA,SAAI,GAAE,CAAC;iCACjB;4BACF,CAAC,CAAC,CAAC;yBACH;wBAED,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;4BAC3D,MAAM,IAAA,6BAAgB,EAAC,kBAAkB,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;yBAC3D;wBAED,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;qBACzC;gBACF,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;gBAClC,OAAO,CAAC,IAAI,EAAE,CAAC;aACf;YAED,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;YAEjF,0BAA0B,CAAC,SAAS,CAAC,CAAC;YAEtC,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC;YAEjC,MAAM,EAAE,CAAC,aAAa,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE;gBACjE,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;gBAE7C,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;oBACjC,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;wBAC3B,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAW,EAAE,EAAE;4BACtC,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;4BAE7C,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;gCAEb,IAAI,CAAC,EAAE,GAAG,IAAA,SAAI,GAAE,CAAC;6BACjB;wBACF,CAAC,CAAC,CAAC;qBACH;oBAED,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;wBAC3D,MAAM,IAAA,6BAAgB,EAAC,kBAAkB,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;qBAC3D;oBAED,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;iBACzC;YACF,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;YAClC,OAAO,CAAC,IAAI,EAAE,CAAC;SACf;QAAC,OAAO,KAAK,EAAE;YACf,OAAO,CAAC,KAAK,CAAC,4EAA4E,CAAC,CAAC;YAC5F,IAAI,KAAK,YAAY,KAAK;gBAAE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACxD,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACb;IACF,CAAC;IAEO,aAAa,CAAC,KAAa;QAClC,OAAO,CAAC,IAAI,CAAC,yBAAyB,KAAK,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;IAC5F,CAAC;IAEO,KAAK,CAAC,qBAAqB;QAClC,MAAM,iBAAiB,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC;YAC3D,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE;SAC3C,CAAC,CAAC;QAEH,IAAI,CAAC,iBAAiB,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,uCAAuC,eAAe,EAAE,CAAC,CAAC;SAC1E;QAED,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC5C,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,QAAgB,EAAE,IAAU;QACvD,MAAM,WAAW,GAAG,IAAI,+BAAc,EAAE,CAAC;QAEzC,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAErC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAiB,WAAW,CAAC,CAAC;QAEtF,MAAM,iBAAiB,GAAG,IAAI,+BAAc,EAAE,CAAC;QAE/C,MAAM,CAAC,MAAM,CAAC,iBAAiB,EAAE;YAChC,QAAQ,EAAE,aAAa;YACvB,IAAI;YACJ,IAAI,EAAE,IAAI,CAAC,iBAAiB;SAC5B,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAiB,iBAAiB,CAAC,CAAC;IACvE,CAAC;IAEO,KAAK,CAAC,QAAQ;QACrB,MAAM,eAAe,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC;YACzD,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE;SACzC,CAAC,CAAC;QAEH,MAAM,KAAK,GACV,eAAe;YACf,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,YAAY,EAAE,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,EAAE,EAAE,CAAC,CAAC,CAAC;QAE9E,IAAI,CAAC,KAAK,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,yBAAyB,eAAe,EAAE,CAAC,CAAC;SAC5D;QAED,OAAO,KAAK,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,MAAc;QACvC,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAEjE,IAAI,CAAC,IAAI,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,+BAA+B,MAAM,EAAE,CAAC,CAAC;SACzD;QAED,OAAO,IAAI,CAAC;IACb,CAAC;IAEO,oBAAoB,CAAC,IAAW,EAAE,mBAAqC;QAC9E,IAAI,IAAI,CAAC,WAAW,EAAE;YACrB,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC5D,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,kBAAkB,EAAE;gBAC9C,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;oBAC7B,MAAM,eAAe,GAA4B;wBAChD,EAAE,EAAE,IAAI;wBACR,IAAI;qBACJ,CAAC;oBAEF,MAAM,mBAAmB,GAAG,mBAAmB,CAAC,MAAM,CACrD,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,KAAK,IAAI,IAAI,WAAW,CAAC,IAAI,KAAK,IAAI,CACvE,CAAC;oBAEF,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE;wBACrC,eAAe,CAAC,EAAE,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;qBAC/C;oBAGD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC;iBACzC;aACD;SACD;IACF,CAAC;;AAjOF,wDAkOC;AAjOO,kCAAW,GAAG,kBAAkB,CAAC;AAEjC,+BAAQ,GAAG;IACjB,yCAAyC;IACzC,0DAA0D;IAC1D,uFAAuF;IACvF,wGAAwG;CACxG,CAAC;AAEK,4BAAK,GAAG;IACd,IAAI,EAAE,eAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IAC/B,KAAK,EAAE,eAAK,CAAC,MAAM,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,oDAAoD;KACjE,CAAC;IACF,QAAQ,EAAE,eAAK,CAAC,OAAO,CAAC;QACvB,WAAW,EAAE,yDAAyD;KACtE,CAAC;IACF,MAAM,EAAE,eAAK,CAAC,MAAM,CAAC;QACpB,WAAW,EAAE,wDAAwD;KACrE,CAAC;CACF,CAAC"}

package/dist/commands/start.js

@@ -210,7 +210,7 @@ class Start extends command_1.Command {
                 });
             });
             await n8n_core_1.UserSettings.getEncryptionKey();
-            const databaseSettings = await Db.collections.Settings.find({ loadOnStartup: true });
+            const databaseSettings = await Db.collections.Settings.findBy({ loadOnStartup: true });
             databaseSettings.forEach((setting) => {
                 config_1.default.set(setting.key, JSON.parse(setting.value));
             });

package/dist/commands/start.js.map

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"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"}

package/dist/commands/user-management/reset.js

@@ -30,16 +30,16 @@ const BaseCommand_1 = require("../BaseCommand");
 class Reset extends BaseCommand_1.BaseCommand {
     async run() {
         const owner = await this.getInstanceOwner();
-        const ownerWorkflowRole = await Db.collections.Role.findOneOrFail({
+        const ownerWorkflowRole = await Db.collections.Role.findOneByOrFail({
             name: 'owner',
             scope: 'workflow',
         });
-        const ownerCredentialRole = await Db.collections.Role.findOneOrFail({
+        const ownerCredentialRole = await Db.collections.Role.findOneByOrFail({
             name: 'owner',
             scope: 'credential',
         });
-        await Db.collections.SharedWorkflow.update({ user: { id: (0, typeorm_1.Not)(owner.id) }, role: ownerWorkflowRole }, { user: owner });
-        await Db.collections.SharedCredentials.update({ user: { id: (0, typeorm_1.Not)(owner.id) }, role: ownerCredentialRole }, { user: owner });
+        await Db.collections.SharedWorkflow.update({ userId: (0, typeorm_1.Not)(owner.id), roleId: ownerWorkflowRole.id }, { user: owner });
+        await Db.collections.SharedCredentials.update({ userId: (0, typeorm_1.Not)(owner.id), roleId: ownerCredentialRole.id }, { user: owner });
         await Db.collections.User.delete({ id: (0, typeorm_1.Not)(owner.id) });
         await Db.collections.User.save(Object.assign(owner, this.defaultUserProps));
         const danglingCredentials = (await Db.collections.Credentials.createQueryBuilder('credentials')

package/dist/commands/user-management/reset.js.map

@@ -1 +1 @@
-{"version":3,"file":"reset.js","sourceRoot":"","sources":["../../../src/commands/user-management/reset.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAA8B;AAC9B,yCAA2B;AAE3B,gDAA6C;AAE7C,MAAa,KAAM,SAAQ,yBAAW;IAGrC,KAAK,CAAC,GAAG;QACR,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAE5C,MAAM,iBAAiB,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC;YACjE,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,UAAU;SACjB,CAAC,CAAC;QAEH,MAAM,mBAAmB,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC;YACnE,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,YAAY;SACnB,CAAC,CAAC;QAEH,MAAM,EAAE,CAAC,WAAW,CAAC,cAAc,CAAC,MAAM,CACzC,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,IAAA,aAAG,EAAC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,EACxD,EAAE,IAAI,EAAE,KAAK,EAAE,CACf,CAAC;QAEF,MAAM,EAAE,CAAC,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAC5C,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,IAAA,aAAG,EAAC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,mBAAmB,EAAE,EAC1D,EAAE,IAAI,EAAE,KAAK,EAAE,CACf,CAAC;QAEF,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,IAAA,aAAG,EAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACxD,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAE5E,MAAM,mBAAmB,GACxB,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,kBAAkB,CAAC,aAAa,CAAC;aACjE,iBAAiB,CAAC,oBAAoB,EAAE,QAAQ,CAAC;aACjD,KAAK,CAAC,8BAA8B,CAAC;aACrC,OAAO,EAAE,CAAwB,CAAC;QACrC,MAAM,oBAAoB,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CACpE,EAAE,CAAC,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC;YACvC,WAAW;YACX,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,mBAAmB;SACzB,CAAC,CACF,CAAC;QACF,MAAM,EAAE,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAElE,MAAM,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CACnC,EAAE,GAAG,EAAE,qCAAqC,EAAE,EAC9C,EAAE,KAAK,EAAE,OAAO,EAAE,CAClB,CAAC;QACF,MAAM,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CACnC,EAAE,GAAG,EAAE,uCAAuC,EAAE,EAChD,EAAE,KAAK,EAAE,OAAO,EAAE,CAClB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAAY;QACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;QAC7E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACd,CAAC;;AA3DF,sBA4DC;AA3DO,iBAAW,GAAG,iDAAiD,CAAC"}
+{"version":3,"file":"reset.js","sourceRoot":"","sources":["../../../src/commands/user-management/reset.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAA8B;AAC9B,yCAA2B;AAE3B,gDAA6C;AAE7C,MAAa,KAAM,SAAQ,yBAAW;IAGrC,KAAK,CAAC,GAAG;QACR,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAE5C,MAAM,iBAAiB,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC;YACnE,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,UAAU;SACjB,CAAC,CAAC;QAEH,MAAM,mBAAmB,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC;YACrE,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,YAAY;SACnB,CAAC,CAAC;QAEH,MAAM,EAAE,CAAC,WAAW,CAAC,cAAc,CAAC,MAAM,CACzC,EAAE,MAAM,EAAE,IAAA,aAAG,EAAC,KAAK,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,EAAE,EACvD,EAAE,IAAI,EAAE,KAAK,EAAE,CACf,CAAC;QAEF,MAAM,EAAE,CAAC,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAC5C,EAAE,MAAM,EAAE,IAAA,aAAG,EAAC,KAAK,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,mBAAmB,CAAC,EAAE,EAAE,EACzD,EAAE,IAAI,EAAE,KAAK,EAAE,CACf,CAAC;QAEF,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,IAAA,aAAG,EAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACxD,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAE5E,MAAM,mBAAmB,GACxB,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,kBAAkB,CAAC,aAAa,CAAC;aACjE,iBAAiB,CAAC,oBAAoB,EAAE,QAAQ,CAAC;aACjD,KAAK,CAAC,8BAA8B,CAAC;aACrC,OAAO,EAAE,CAAwB,CAAC;QACrC,MAAM,oBAAoB,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CACpE,EAAE,CAAC,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC;YACvC,WAAW;YACX,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,mBAAmB;SACzB,CAAC,CACF,CAAC;QACF,MAAM,EAAE,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAElE,MAAM,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CACnC,EAAE,GAAG,EAAE,qCAAqC,EAAE,EAC9C,EAAE,KAAK,EAAE,OAAO,EAAE,CAClB,CAAC;QACF,MAAM,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CACnC,EAAE,GAAG,EAAE,uCAAuC,EAAE,EAChD,EAAE,KAAK,EAAE,OAAO,EAAE,CAClB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAAY;QACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;QAC7E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACd,CAAC;;AA3DF,sBA4DC;AA3DO,iBAAW,GAAG,iDAAiD,CAAC"}

package/dist/commands/worker.js

@@ -32,7 +32,6 @@ const http_1 = __importDefault(require("http"));
 const command_1 = require("@oclif/command");
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
-const typeorm_1 = require("typeorm");
 const CredentialsOverwrites_1 = require("../CredentialsOverwrites");
 const CredentialTypes_1 = require("../CredentialTypes");
 const Db = __importStar(require("../Db"));
@@ -93,7 +92,7 @@ class Worker extends command_1.Command {
     }
     async runJob(job, nodeTypes) {
         const { executionId, loadStaticData } = job.data;
-        const executionDb = await Db.collections.Execution.findOne(executionId);
+        const executionDb = await Db.collections.Execution.findOneBy({ id: executionId });
         if (!executionDb) {
             n8n_workflow_1.LoggerProxy.error(`Worker failed to find data of execution "${executionId}" in database. Cannot continue.`, { executionId });
             throw new Error(`Unable to find data of execution "${executionId}" in database. Aborting execution.`);
@@ -103,11 +102,13 @@ class Worker extends command_1.Command {
         const workflowOwner = await (0, UserManagementHelper_1.getWorkflowOwner)(currentExecutionDb.workflowData.id.toString());
         let { staticData } = currentExecutionDb.workflowData;
         if (loadStaticData) {
-            const findOptions = {
+            const workflowData = await Db.collections.Workflow.findOne({
                 select: ['id', 'staticData'],
-            };
-            const workflowData = await Db.collections.Workflow.findOne(currentExecutionDb.workflowData.id, findOptions);
-            if (workflowData === undefined) {
+                where: {
+                    id: currentExecutionDb.workflowData.id,
+                },
+            });
+            if (workflowData === null) {
                 n8n_workflow_1.LoggerProxy.error('Worker execution failed because workflow could not be found in database.', {
                     workflowId: currentExecutionDb.workflowData.id,
                     executionId,
@@ -251,9 +252,9 @@ class Worker extends command_1.Command {
                     const server = http_1.default.createServer(app);
                     app.get('/healthz', async (req, res) => {
                         n8n_workflow_1.LoggerProxy.debug('Health check started!');
-                        const connection = (0, typeorm_1.getConnectionManager)().get();
+                        const connection = Db.getConnection();
                         try {
-                            if (!connection.isConnected) {
+                            if (!connection.isInitialized) {
                                 throw new Error('No active database connection!');
                             }
                             await connection.query('SELECT 1');

package/dist/commands/worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/commands/worker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/commands/worker.ts"],"names":[],"mappings":"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"}

package/dist/credentials/credentials.controller.js

@@ -113,7 +113,7 @@ exports.credentialsController.patch('/:id(\\d+)', ResponseHelper.send(async (req
     const preparedCredentialData = await credentials_service_1.CredentialsService.prepareUpdateData(req.body, decryptedData);
     const newCredentialData = credentials_service_1.CredentialsService.createEncryptedData(key, credentialId, preparedCredentialData);
     const responseData = await credentials_service_1.CredentialsService.update(credentialId, newCredentialData);
-    if (responseData === undefined) {
+    if (responseData === null) {
         throw new ResponseHelper.NotFoundError(`Credential ID "${credentialId}" could not be found to be updated.`);
     }
     const { data: _, ...rest } = responseData;

package/dist/credentials/credentials.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"credentials.controller.js","sourceRoot":"","sources":["../../src/credentials/credentials.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"credentials.controller.js","sourceRoot":"","sources":["../../src/credentials/credentials.controller.ts"],"names":[],"mappings":"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"}

package/dist/credentials/credentials.service.d.ts

@@ -1,14 +1,14 @@
 import { ICredentialDataDecryptedObject, ICredentialsDecrypted, INodeCredentialTestResult } from 'n8n-workflow';
-import { FindManyOptions } from 'typeorm';
+import { FindManyOptions, FindOptionsWhere } from 'typeorm';
 import { ICredentialsDb } from '../Interfaces';
 import { CredentialsEntity } from '../databases/entities/CredentialsEntity';
 import { SharedCredentials } from '../databases/entities/SharedCredentials';
 import type { User } from '../databases/entities/User';
 import type { CredentialRequest } from '@/requests';
 export declare class CredentialsService {
-    static get(credential: Partial<ICredentialsDb>, options?: {
+    static get(where: FindOptionsWhere<ICredentialsDb>, options?: {
         relations: string[];
-    }): Promise<ICredentialsDb | undefined>;
+    }): Promise<ICredentialsDb | null>;
     static getAll(user: User, options?: {
         relations?: string[];
         roles?: string[];
@@ -17,13 +17,13 @@ export declare class CredentialsService {
     static getMany(filter: FindManyOptions<ICredentialsDb>): Promise<ICredentialsDb[]>;
     static getSharing(user: User, credentialId: string, relations?: string[], { allowGlobalOwner }?: {
         allowGlobalOwner: boolean;
-    }): Promise<SharedCredentials | undefined>;
+    }): Promise<SharedCredentials | null>;
     static prepareCreateData(data: CredentialRequest.CredentialProperties): Promise<CredentialsEntity>;
     static prepareUpdateData(data: CredentialRequest.CredentialProperties, decryptedData: ICredentialDataDecryptedObject): Promise<CredentialsEntity>;
     static createEncryptedData(encryptionKey: string, credentialId: string | null, data: CredentialsEntity): ICredentialsDb;
     static getEncryptionKey(): Promise<string>;
     static decrypt(encryptionKey: string, credential: CredentialsEntity): Promise<ICredentialDataDecryptedObject>;
-    static update(credentialId: string, newCredentialData: ICredentialsDb): Promise<ICredentialsDb | undefined>;
+    static update(credentialId: string, newCredentialData: ICredentialsDb): Promise<ICredentialsDb | null>;
     static save(credential: CredentialsEntity, encryptedData: ICredentialsDb, user: User): Promise<CredentialsEntity>;
     static delete(credentials: CredentialsEntity): Promise<void>;
     static test(user: User, encryptionKey: string, credentials: ICredentialsDecrypted): Promise<INodeCredentialTestResult>;

package/dist/credentials/credentials.service.ee.d.ts

@@ -11,7 +11,7 @@ export declare class EECredentialsService extends CredentialsService {
     }>;
     static getSharing(user: User, credentialId: string, relations?: string[], { allowGlobalOwner }?: {
         allowGlobalOwner: boolean;
-    }): Promise<SharedCredentials | undefined>;
+    }): Promise<SharedCredentials | null>;
     static getSharings(transaction: EntityManager, credentialId: string): Promise<SharedCredentials[]>;
     static pruneSharings(transaction: EntityManager, credentialId: string, userIds: string[]): Promise<DeleteResult>;
     static share(transaction: EntityManager, credential: CredentialsEntity, shareWithIds: string[]): Promise<SharedCredentials[]>;

package/dist/credentials/credentials.service.ee.js

@@ -44,7 +44,7 @@ class EECredentialsService extends credentials_service_1.CredentialsService {
     static async getSharing(user, credentialId, relations = ['credentials'], { allowGlobalOwner } = { allowGlobalOwner: true }) {
         const where = { credentialsId: credentialId };
         if (!allowGlobalOwner || user.globalRole.name !== 'owner') {
-            where.user = { id: user.id };
+            where.userId = user.id;
         }
         return Db.collections.SharedCredentials.findOne({
             where,
@@ -74,9 +74,9 @@ class EECredentialsService extends credentials_service_1.CredentialsService {
         const newSharedCredentials = users
             .filter((user) => !user.isPending)
             .map((user) => Db.collections.SharedCredentials.create({
-            credentials: credential,
-            user,
-            role,
+            credentialsId: credential.id,
+            userId: user.id,
+            roleId: role === null || role === void 0 ? void 0 : role.id,
         }));
         return transaction.save(newSharedCredentials);
     }