n8n 2.4.3 → 2.5.0

package/dist/services/pruning/workflow-history-compaction.service.js

@@ -20,14 +20,16 @@ const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const node_assert_1 = require("node:assert");
 let WorkflowHistoryCompactionService = class WorkflowHistoryCompactionService {
-    constructor(config, logger, instanceSettings, dbConnection, workflowHistoryRepository) {
+    constructor(config, globalConfig, logger, instanceSettings, dbConnection, workflowHistoryRepository) {
         this.config = config;
+        this.globalConfig = globalConfig;
         this.logger = logger;
         this.instanceSettings = instanceSettings;
         this.dbConnection = dbConnection;
         this.workflowHistoryRepository = workflowHistoryRepository;
         this.isShuttingDown = false;
-        this.isCompactingRecentHistories = false;
+        this.isOptimizingHistories = false;
+        this.isTrimmingHistories = false;
         this.logger = this.logger.scoped('workflow-history-compaction');
     }
     init() {
@@ -42,45 +44,89 @@ let WorkflowHistoryCompactionService = class WorkflowHistoryCompactionService {
         const { connectionState } = this.dbConnection;
         if (!this.isEnabled || !connectionState.migrated || this.isShuttingDown)
             return;
-        this.logger.debug('Started workflow histories compaction', { ...this.config });
-        this.scheduleRollingCompacting();
-        if (this.config.compactOnStartUp) {
-            this.logger.debug('Compacting on start up');
-            void this.compactRecentHistories();
-        }
+        this.logger.debug('Started workflow histories optimization and trimming', { ...this.config });
+        this.scheduleOptimization();
+        this.scheduleTrimming();
     }
     stopCompacting() {
-        if (!this.compactingInterval)
+        if (!this.optimizingInterval && !this.trimmingInterval)
+            return;
+        clearInterval(this.optimizingInterval);
+        clearInterval(this.trimmingInterval);
+        this.logger.debug('Stopped workflow histories compaction and trimming');
+    }
+    scheduleTrimming() {
+        if (this.globalConfig.workflowHistory.pruneTime !== -1 &&
+            this.globalConfig.workflowHistory.pruneTime * constants_1.Time.hours.toMilliseconds <
+                this.config.trimmingMinimumAgeDays * constants_1.Time.days.toMilliseconds) {
+            this.logger.info('Skipping workflow history trimming as pruneAge < trimmingMinimumAge');
             return;
-        clearInterval(this.compactingInterval);
-        this.logger.debug('Stopped workflow histories compaction');
+        }
+        const trimOnceADay = async () => {
+            if (new Date().getHours() === 3) {
+                await this.trimLongRunningHistories();
+            }
+        };
+        this.trimmingInterval = setInterval(trimOnceADay, 1 * constants_1.Time.hours.toMilliseconds);
+        if (this.config.trimOnStartUp) {
+            void this.trimLongRunningHistories();
+        }
+        else {
+            void trimOnceADay();
+        }
+        this.logger.debug('Trimming histories once a day at 3am server time');
     }
-    scheduleRollingCompacting() {
-        const rateMs = (this.config.compactingTimeWindowHours / 2) * constants_1.Time.hours.toMilliseconds;
-        this.compactingInterval = setInterval(async () => await this.compactRecentHistories(), rateMs);
-        this.logger.debug(`Compacting histories every ${this.config.compactingTimeWindowHours / 2.0} hour(s)`);
+    scheduleOptimization() {
+        const rateMs = (this.config.optimizingTimeWindowHours / 2) * constants_1.Time.hours.toMilliseconds;
+        this.optimizingInterval = setInterval(async () => await this.optimizeHistories(), rateMs);
+        this.logger.debug(`Optimizing histories every ${this.config.optimizingTimeWindowHours / 2.0} hour(s)`);
+        void this.optimizeHistories();
     }
     shutdown() {
         this.isShuttingDown = true;
         this.stopCompacting();
     }
-    async compactRecentHistories() {
-        if (this.isCompactingRecentHistories) {
-            this.logger.warn('Skipping recent compaction as there is already a running iteration');
+    async trimLongRunningHistories() {
+        if (this.isTrimmingHistories) {
+            this.logger.warn('Skipping trimming as there is already a running iteration');
+            return;
+        }
+        this.isTrimmingHistories = true;
+        const startDelta = (this.config.trimmingMinimumAgeDays + this.config.trimmingTimeWindowDays) *
+            constants_1.Time.days.toMilliseconds;
+        const endDelta = this.config.trimmingMinimumAgeDays * constants_1.Time.days.toMilliseconds;
+        try {
+            await this.compactHistories(startDelta, endDelta, [
+                n8n_workflow_1.RULES.makeMergeDependingOnSizeRule(new Map([
+                    [0, 60 * 1_000],
+                    [100, 5 * 60 * 1_000],
+                    [1000, 30 * 60 * 1_000],
+                    [5000, 60 * 60 * 1_000],
+                    [10000, 4 * 60 * 60 * 1_000],
+                ])),
+            ], [], { workflowSizeScore: true });
+        }
+        finally {
+            this.isTrimmingHistories = false;
+        }
+    }
+    async optimizeHistories() {
+        if (this.isOptimizingHistories) {
+            this.logger.warn('Skipping recent optimization as there is already a running iteration');
             return;
         }
-        this.isCompactingRecentHistories = true;
-        const startDelta = (this.config.compactingMinimumAgeHours + this.config.compactingTimeWindowHours) *
+        this.isOptimizingHistories = true;
+        const startDelta = (this.config.optimizingMinimumAgeHours + this.config.optimizingTimeWindowHours) *
             constants_1.Time.hours.toMilliseconds;
-        const endDelta = this.config.compactingMinimumAgeHours * constants_1.Time.hours.toMilliseconds;
+        const endDelta = this.config.optimizingMinimumAgeHours * constants_1.Time.hours.toMilliseconds;
         try {
-            await this.compactHistories(startDelta, endDelta, [n8n_workflow_1.RULES.mergeAdditiveChanges], [n8n_workflow_1.SKIP_RULES.makeSkipTimeDifference(this.config.minimumTimeBetweenSessionsMs)]);
+            await this.compactHistories(startDelta, endDelta, [n8n_workflow_1.RULES.mergeAdditiveChanges], [n8n_workflow_1.SKIP_RULES.makeSkipTimeDifference(20 * 60 * 1000)]);
         }
         finally {
-            this.isCompactingRecentHistories = false;
+            this.isOptimizingHistories = false;
         }
     }
-    async compactHistories(startDeltaMs, endDeltaMs, rules, skipRules) {
+    async compactHistories(startDeltaMs, endDeltaMs, rules, skipRules, metaData = {}) {
         const compactionStartTime = Date.now();
         const startDate = new Date(compactionStartTime - startDeltaMs);
         const endDate = new Date(compactionStartTime - endDeltaMs);
@@ -98,7 +144,7 @@ let WorkflowHistoryCompactionService = class WorkflowHistoryCompactionService {
         let errorCount = 0;
         for (const [index, workflowId] of workflowIds.entries()) {
             try {
-                const { seen, deleted } = await this.workflowHistoryRepository.pruneHistory(workflowId, startDate, endDate, rules, skipRules);
+                const { seen, deleted } = await this.workflowHistoryRepository.pruneHistory(workflowId, startDate, endDate, rules, skipRules, metaData);
                 batchSum += seen;
                 totalVersionsSeen += seen;
                 totalVersionsDeleted += deleted;
@@ -151,6 +197,7 @@ __decorate([
 exports.WorkflowHistoryCompactionService = WorkflowHistoryCompactionService = __decorate([
     (0, di_1.Service)(),
     __metadata("design:paramtypes", [config_1.WorkflowHistoryCompactionConfig,
+        config_1.GlobalConfig,
         backend_common_1.Logger,
         n8n_core_1.InstanceSettings,
         db_1.DbConnection,

package/dist/services/pruning/workflow-history-compaction.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-history-compaction.service.js","sourceRoot":"","sources":["../../../src/services/pruning/workflow-history-compaction.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workflow-history-compaction.service.js","sourceRoot":"","sources":["../../../src/services/pruning/workflow-history-compaction.service.ts"],"names":[],"mappings":"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"}

package/dist/services/public-api-key.service.js

@@ -13,6 +13,7 @@ exports.PublicApiKeyService = void 0;
 const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const permissions_1 = require("@n8n/permissions");
+const crypto_1 = require("crypto");
 const jsonwebtoken_1 = require("jsonwebtoken");
 const jwt_service_1 = require("./jwt.service");
 const last_active_at_service_1 = require("./last-active-at.service");
@@ -120,7 +121,7 @@ let PublicApiKeyService = class PublicApiKeyService {
     }
     generateApiKey(user, expiresAt) {
         const nowInSeconds = Math.floor(Date.now() / 1000);
-        return this.jwtService.sign({ sub: user.id, iss: API_KEY_ISSUER, aud: API_KEY_AUDIENCE }, { ...(expiresAt && { expiresIn: expiresAt - nowInSeconds }) });
+        return this.jwtService.sign({ sub: user.id, iss: API_KEY_ISSUER, aud: API_KEY_AUDIENCE, jti: (0, crypto_1.randomUUID)() }, { ...(expiresAt && { expiresIn: expiresAt - nowInSeconds }) });
     }
     apiKeyHasValidScopesForRole(role, apiKeyScopes) {
         const scopesForRole = (0, permissions_1.getApiKeyScopesForRole)(role);

package/dist/services/public-api-key.service.js.map

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

package/dist/services/role-cache.service.d.ts

@@ -1,4 +1,5 @@
 import { Logger } from '@n8n/backend-common';
+import type { EntityManager } from '@n8n/db';
 import { type Scope } from '@n8n/permissions';
 import { CacheService } from './cache/cache.service';
 export declare class RoleCacheService {
@@ -8,7 +9,7 @@ export declare class RoleCacheService {
     private static readonly CACHE_TTL;
     constructor(cacheService: CacheService, logger: Logger);
     private buildRoleScopeMap;
-    getRolesWithAllScopes(namespace: 'global' | 'project' | 'credential' | 'workflow', requiredScopes: Scope[]): Promise<string[]>;
+    getRolesWithAllScopes(namespace: 'global' | 'project' | 'credential' | 'workflow', requiredScopes: Scope[], em?: EntityManager): Promise<string[]>;
     invalidateCache(): Promise<void>;
     refreshCache(): Promise<void>;
 }

package/dist/services/role-cache.service.js

@@ -22,10 +22,10 @@ let RoleCacheService = RoleCacheService_1 = class RoleCacheService {
         this.cacheService = cacheService;
         this.logger = logger;
     }
-    async buildRoleScopeMap() {
+    async buildRoleScopeMap(trx) {
         try {
             const roleRepository = di_1.Container.get(db_1.RoleRepository);
-            const roles = await roleRepository.findAll();
+            const roles = await roleRepository.findAll(trx);
             const roleScopeMap = {};
             for (const role of roles) {
                 roleScopeMap[role.roleType] ??= {};
@@ -40,11 +40,11 @@ let RoleCacheService = RoleCacheService_1 = class RoleCacheService {
             throw error;
         }
     }
-    async getRolesWithAllScopes(namespace, requiredScopes) {
+    async getRolesWithAllScopes(namespace, requiredScopes, em) {
         if (requiredScopes.length === 0)
             return [];
         const roleScopeMap = await this.cacheService.get(RoleCacheService_1.CACHE_KEY, {
-            refreshFn: async () => await this.buildRoleScopeMap(),
+            refreshFn: async () => await this.buildRoleScopeMap(em),
             fallbackValue: undefined,
         });
         if (roleScopeMap === undefined) {

package/dist/services/role-cache.service.js.map

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

package/dist/services/role.service.d.ts

@@ -1,6 +1,7 @@
 import { CreateRoleDto, UpdateRoleDto } from '@n8n/api-types';
 import { LicenseState } from '@n8n/backend-common';
 import { CredentialsEntity, SharedCredentials, SharedWorkflow, User, ListQueryDb, ScopesField, ProjectRelation, RoleRepository, ScopeRepository } from '@n8n/db';
+import type { EntityManager } from '@n8n/db';
 import type { Scope, Role as RoleDTO, AssignableProjectRole, RoleNamespace } from '@n8n/permissions';
 import { RoleCacheService } from './role-cache.service';
 export declare class RoleService {
@@ -54,6 +55,6 @@ export declare class RoleService {
     addScopes(rawCredential: CredentialsEntity, user: User, userProjectRelations: ProjectRelation[]): CredentialsEntity & ScopesField;
     addScopes(rawCredential: ListQueryDb.Credentials.WithSharing | ListQueryDb.Credentials.WithOwnedByAndSharedWith, user: User, userProjectRelations: ProjectRelation[]): ListQueryDb.Credentials.WithScopes;
     combineResourceScopes(type: 'workflow' | 'credential', user: User, shared: SharedCredentials[] | SharedWorkflow[], userProjectRelations: ProjectRelation[]): Scope[];
-    rolesWithScope(namespace: RoleNamespace, scopes: Scope | Scope[]): Promise<string[]>;
+    rolesWithScope(namespace: RoleNamespace, scopes: Scope | Scope[], trx?: EntityManager): Promise<string[]>;
     isRoleLicensed(role: AssignableProjectRole): boolean;
 }

package/dist/services/role.service.js

@@ -17,8 +17,8 @@ const permissions_1 = require("@n8n/permissions");
 const n8n_workflow_1 = require("n8n-workflow");
 const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
 const not_found_error_1 = require("../errors/response-errors/not-found.error");
-const role_cache_service_1 = require("./role-cache.service");
 const response_helper_1 = require("../response-helper");
+const role_cache_service_1 = require("./role-cache.service");
 let RoleService = class RoleService {
     constructor(license, roleRepository, scopeRepository, roleCacheService) {
         this.license = license;
@@ -182,11 +182,11 @@ let RoleService = class RoleService {
         }
         return [...scopesSet].sort();
     }
-    async rolesWithScope(namespace, scopes) {
+    async rolesWithScope(namespace, scopes, trx) {
         if (!Array.isArray(scopes)) {
             scopes = [scopes];
         }
-        return await this.roleCacheService.getRolesWithAllScopes(namespace, scopes);
+        return await this.roleCacheService.getRolesWithAllScopes(namespace, scopes, trx);
     }
     isRoleLicensed(role) {
         if (!(0, permissions_1.isBuiltInRole)(role)) {

package/dist/services/role.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../src/services/role.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,wDAAmD;AACnD,gCAaiB;AACjB,gCAAkC;AAOlC,kDAQ0B;AAC1B,+CAA0D;AAE1D,kFAA6E;AAC7E,8EAAyE;AACzE,6DAAwD;AACxD,uDAA4D;AAGrD,IAAM,WAAW,GAAjB,MAAM,WAAW;IACvB,YACkB,OAAqB,EACrB,cAA8B,EAC9B,eAAgC,EAChC,gBAAkC;QAHlC,YAAO,GAAP,OAAO,CAAc;QACrB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,oBAAe,GAAf,eAAe,CAAiB;QAChC,qBAAgB,GAAhB,gBAAgB,CAAkB;IACjD,CAAC;IAEI,eAAe,CAAC,IAAU,EAAE,WAAoB;QACvD,OAAO;YACN,GAAG,IAAI;YACP,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YACtC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC;YACxC,WAAW;SACX,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,YAAqB,KAAK;QAC3C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;QAElD,IAAI,CAAC,SAAS,EAAE,CAAC;YAChB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;QAClD,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC;QAEjE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACzB,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/C,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAY,EAAE,YAAqB,KAAK;QACrD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,IAAI,EAAE,CAAC;YACV,MAAM,WAAW,GAAG,SAAS;gBAC5B,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC;gBACpD,CAAC,CAAC,SAAS,CAAC;YACb,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAChD,CAAC;QACD,MAAM,IAAI,+BAAa,CAAC,gBAAgB,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,IAAY;QAClC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,MAAM,IAAI,+BAAa,CAAC,gBAAgB,CAAC,CAAC;QAC3C,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,MAAM,IAAI,mCAAe,CAAC,4BAA4B,CAAC,CAAC;QACzD,CAAC;QAGD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzE,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,mCAAe,CAAC,sCAAsC,CAAC,CAAC;QACnE,CAAC;QAED,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAG7C,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,EAAE,CAAC;QAE9C,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,UAAgC;QAC3D,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,OAAO,SAAS,CAAC;QAClB,CAAC;QAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO,EAAE,CAAC;QACX,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACjE,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;YACzC,MAAM,aAAa,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC;YACxF,MAAM,IAAI,KAAK,CAAC,qCAAqC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAClF,CAAC;QAED,OAAO,MAAM,CAAC;IACf,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,IAAY,EAAE,OAAsB;QAC1D,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QAEjE,IAAI,CAAC;YACJ,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,EAAE;gBAC9D,WAAW;gBACX,WAAW;gBACX,MAAM,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;aAC5C,CAAC,CAAC;YAGH,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,EAAE,CAAC;YAE9C,OAAO,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,KAAK,YAAY,wBAAS,IAAI,KAAK,CAAC,OAAO,KAAK,gBAAgB,EAAE,CAAC;gBACtE,MAAM,IAAI,+BAAa,CAAC,gBAAgB,CAAC,CAAC;YAC3C,CAAC;YAED,IAAI,KAAK,YAAY,wBAAS,IAAI,KAAK,CAAC,OAAO,KAAK,4BAA4B,EAAE,CAAC;gBAClF,MAAM,IAAI,mCAAe,CAAC,4BAA4B,CAAC,CAAC;YACzD,CAAC;YAED,IAAI,KAAK,YAAY,KAAK,IAAI,IAAA,yCAAuB,EAAC,KAAK,CAAC,EAAE,CAAC;gBAC9D,MAAM,IAAI,mCAAe,CAAC,yBAAyB,WAAW,kBAAkB,CAAC,CAAC;YACnF,CAAC;YAED,MAAM,KAAK,CAAC;QACb,CAAC;IACF,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,OAAsB;QAC5C,MAAM,IAAI,GAAG,IAAI,SAAI,EAAE,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACvC,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACzB,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACxC,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACxD,IAAI,MAAM,KAAK,SAAS;YAAE,MAAM,IAAI,mCAAe,CAAC,qBAAqB,CAAC,CAAC;QAC3E,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,IAAI,GAAG,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QAEjJ,IAAI,CAAC;YACJ,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAGzD,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,EAAE,CAAC;YAE9C,OAAO,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,KAAK,YAAY,KAAK,IAAI,IAAA,yCAAuB,EAAC,KAAK,CAAC,EAAE,CAAC;gBAC9D,MAAM,IAAI,mCAAe,CAAC,yBAAyB,OAAO,CAAC,WAAW,kBAAkB,CAAC,CAAC;YAC3F,CAAC;YACD,MAAM,KAAK,CAAC;QACb,CAAC;IACF,CAAC;IAED,KAAK,CAAC,eAAe,CACpB,SAAmB,EACnB,QAA0D;QAE1D,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,CAAC;QAE3F,IAAI,KAAK,CAAC,MAAM,GAAG,eAAe,CAAC,IAAI,EAAE,CAAC;YACzC,MAAM,gBAAgB,GAAG,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,CAC1D,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CACnD,CAAC;YACF,MAAM,IAAI,mCAAe,CACxB,gBAAgB,CAAC,MAAM,KAAK,CAAC;gBAC5B,CAAC,CAAC,QAAQ,gBAAgB,CAAC,CAAC,CAAC,iBAAiB;gBAC9C,CAAC,CAAC,SAAS,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CACtD,CAAC;QACH,CAAC;IACF,CAAC;IAmBD,SAAS,CACR,SAKgD,EAChD,IAAU,EACV,oBAAuC;QAKvC,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;QAChC,MAAM,MAAM,GAAG,SAGsB,CAAC;QAEtC,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC;QAEnB,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,MAAM,CAAC;QACf,CAAC;QAED,IAAI,CAAC,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,EAAE,CAAC;YAClD,MAAM,IAAI,8BAAe,CAAC,sDAAsD,CAAC,CAAC;QACnF,CAAC;QAED,MAAM,UAAU,GAAG,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC;QAClE,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,oBAAoB,CAAC,CAAC;QAE3F,IACC,UAAU,KAAK,YAAY;YAC3B,UAAU,IAAI,MAAM;YACpB,MAAM,CAAC,QAAQ;YACf,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EACzC,CAAC;YACF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACvC,CAAC;QAED,OAAO,MAAM,CAAC;IACf,CAAC;IAED,qBAAqB,CACpB,IAA+B,EAC/B,IAAU,EACV,MAA8C,EAC9C,oBAAuC;QAEvC,MAAM,YAAY,GAAG,IAAA,oCAAsB,EAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAe,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;QACpD,KAAK,MAAM,YAAY,IAAI,MAAM,EAAE,CAAC;YACnC,MAAM,EAAE,GAAG,oBAAoB,CAAC,IAAI,CACnC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,YAAY,CAAC,SAAS,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,CAC1E,CAAC;YACF,IAAI,aAAa,GAAY,EAAE,CAAC;YAChC,IAAI,EAAE,EAAE,CAAC;gBACR,aAAa,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACnD,CAAC;YACD,MAAM,YAAY,GAAG,IAAA,2BAAa,EAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACtD,MAAM,YAAY,GAAG,IAAA,2BAAa,EACjC;gBACC,MAAM,EAAE,YAAY;gBACpB,OAAO,EAAE,aAAa;aACtB,EACD,EAAE,OAAO,EAAE,YAAY,EAAE,CACzB,CAAC;YACF,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,CAAC,GAAG,SAAS,CAAC,CAAC,IAAI,EAAE,CAAC;IAC9B,CAAC;IAMD,KAAK,CAAC,cAAc,CAAC,SAAwB,EAAE,MAAuB;QACrE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5B,MAAM,GAAG,CAAC,MAAM,CAAC,CAAC;QACnB,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAC7E,CAAC;IAED,cAAc,CAAC,IAA2B;QAGzC,IAAI,CAAC,IAAA,2BAAa,EAAC,IAAI,CAAC,EAAE,CAAC;YAG1B,OAAO,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;QAC7C,CAAC;QAED,QAAQ,IAAI,EAAE,CAAC;YACd,KAAK,qCAAuB;gBAC3B,OAAO,IAAI,CAAC,OAAO,CAAC,0BAA0B,EAAE,CAAC;YAClD,KAAK,sCAAwB;gBAC5B,OAAO,IAAI,CAAC,OAAO,CAAC,2BAA2B,EAAE,CAAC;YACnD,KAAK,sCAAwB;gBAC5B,OAAO,IAAI,CAAC,OAAO,CAAC,2BAA2B,EAAE,CAAC;YACnD,KAAK,sBAAiB,CAAC,IAAI;gBAC1B,OAAO,IAAI,CAAC,OAAO,CAAC,6BAA6B,EAAE,CAAC;YACrD;gBAEC,OAAO,IAAI,CAAC;QACd,CAAC;IACF,CAAC;CACD,CAAA;AA/RY,kCAAW;sBAAX,WAAW;IADvB,IAAA,YAAO,GAAE;qCAGkB,6BAAY;QACL,mBAAc;QACb,oBAAe;QACd,qCAAgB;GALxC,WAAW,CA+RvB"}
+{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../src/services/role.service.ts"],"names":[],"mappings":"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"}

package/dist/services/user.service.d.ts

@@ -1,7 +1,7 @@
 import type { RoleChangeRequestDto } from '@n8n/api-types';
 import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
-import type { PublicUser } from '@n8n/db';
+import type { AuthIdentity, PublicUser } from '@n8n/db';
 import { User, UserRepository, ProjectRepository } from '@n8n/db';
 import type { IUserSettings } from 'n8n-workflow';
 import { EventService } from '../events/event.service';
@@ -10,9 +10,9 @@ import { PostHogClient } from '../posthog';
 import type { UserRequest } from '../requests';
 import { UrlService } from '../services/url.service';
 import { UserManagementMailer } from '../user-management/email';
+import { JwtService } from './jwt.service';
 import { PublicApiKeyService } from './public-api-key.service';
 import { RoleService } from './role.service';
-import { JwtService } from './jwt.service';
 export declare class UserService {
     private readonly logger;
     private readonly userRepository;
@@ -27,8 +27,10 @@ export declare class UserService {
     private readonly postHog;
     constructor(logger: Logger, userRepository: UserRepository, projectRepository: ProjectRepository, mailer: UserManagementMailer, urlService: UrlService, eventService: EventService, publicApiKeyService: PublicApiKeyService, roleService: RoleService, globalConfig: GlobalConfig, jwtService: JwtService, postHog: PostHogClient);
     update(userId: string, data: Partial<User>): Promise<void>;
-    getManager(): import("@n8n/typeorm").EntityManager;
+    getManager(): import("@n8n/db").EntityManager;
     updateSettings(userId: string, newSettings: Partial<IUserSettings>): Promise<void>;
+    findUserWithAuthIdentities(userId: string): Promise<User>;
+    findSsoIdentity(userId: string): Promise<AuthIdentity | undefined>;
     toPublic(user: User, options?: {
         withInviteUrl?: boolean;
         inviterId?: string;

package/dist/services/user.service.js

@@ -22,9 +22,9 @@ const event_service_1 = require("../events/event.service");
 const posthog_1 = require("../posthog");
 const url_service_1 = require("../services/url.service");
 const email_1 = require("../user-management/email");
+const jwt_service_1 = require("./jwt.service");
 const public_api_key_service_1 = require("./public-api-key.service");
 const role_service_1 = require("./role.service");
-const jwt_service_1 = require("./jwt.service");
 const TAMPER_PROOF_INVITE_LINKS_EXPERIMENT = '061_tamper_proof_invite_links';
 let UserService = class UserService {
     constructor(logger, userRepository, projectRepository, mailer, urlService, eventService, publicApiKeyService, roleService, globalConfig, jwtService, postHog) {
@@ -60,6 +60,20 @@ let UserService = class UserService {
         }
         await this.userRepository.save(user);
     }
+    async findUserWithAuthIdentities(userId) {
+        return await this.userRepository.findOneOrFail({
+            where: { id: userId },
+            relations: ['role', 'authIdentities'],
+        });
+    }
+    async findSsoIdentity(userId) {
+        const user = await this.userRepository.findOne({
+            where: { id: userId },
+            relations: ['authIdentities'],
+        });
+        const ssoIdentity = user?.authIdentities?.find((identity) => identity.providerType !== 'email');
+        return ssoIdentity;
+    }
     async toPublic(user, options) {
         const { password, updatedAt, authIdentities, mfaRecoveryCodes, mfaSecret, role, ...rest } = user;
         const providerType = authIdentities?.[0]?.providerType;

package/dist/services/user.service.js.map

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

package/dist/services/workflow-statistics.service.d.ts

@@ -1,5 +1,5 @@
 import { Logger } from '@n8n/backend-common';
-import { WorkflowStatisticsRepository } from '@n8n/db';
+import { SettingsRepository, WorkflowRepository, WorkflowStatisticsRepository } from '@n8n/db';
 import type { INode, IRun, IWorkflowBase } from 'n8n-workflow';
 import { EventService } from '../events/event.service';
 import { UserService } from '../services/user.service';
@@ -33,7 +33,9 @@ export declare class WorkflowStatisticsService extends TypedEmitter<WorkflowStat
     private readonly ownershipService;
     private readonly userService;
     private readonly eventService;
-    constructor(logger: Logger, repository: WorkflowStatisticsRepository, ownershipService: OwnershipService, userService: UserService, eventService: EventService);
+    private readonly settingsRepository;
+    private readonly workflowRepository;
+    constructor(logger: Logger, repository: WorkflowStatisticsRepository, ownershipService: OwnershipService, userService: UserService, eventService: EventService, settingsRepository: SettingsRepository, workflowRepository: WorkflowRepository);
     workflowExecutionCompleted(workflowData: IWorkflowBase, runData: IRun): Promise<void>;
     nodeFetchedData(workflowId: string | undefined | null, node: INode): Promise<void>;
 }

package/dist/services/workflow-statistics.service.js

@@ -40,13 +40,15 @@ const isModeRootExecution = {
     chat: false,
 };
 let WorkflowStatisticsService = class WorkflowStatisticsService extends typed_emitter_1.TypedEmitter {
-    constructor(logger, repository, ownershipService, userService, eventService) {
+    constructor(logger, repository, ownershipService, userService, eventService, settingsRepository, workflowRepository) {
         super({ captureRejections: true });
         this.logger = logger;
         this.repository = repository;
         this.ownershipService = ownershipService;
         this.userService = userService;
         this.eventService = eventService;
+        this.settingsRepository = settingsRepository;
+        this.workflowRepository = workflowRepository;
         if ('SKIP_STATISTICS_EVENTS' in process.env)
             return;
         this.on('nodeFetchedData', async ({ workflowId, node }) => await this.nodeFetchedData(workflowId, node));
@@ -77,7 +79,7 @@ let WorkflowStatisticsService = class WorkflowStatisticsService extends typed_em
         if (!workflowId)
             return;
         try {
-            const upsertResult = await this.repository.upsertWorkflowStatistics(name, workflowId, isRootExecution);
+            const upsertResult = await this.repository.upsertWorkflowStatistics(name, workflowId, isRootExecution, workflowData.name);
             if (name === "production_success" && upsertResult === 'insert') {
                 const project = await this.ownershipService.getWorkflowProjectCached(workflowId);
                 let userId = null;
@@ -98,9 +100,36 @@ let WorkflowStatisticsService = class WorkflowStatisticsService extends typed_em
                     userId,
                 });
             }
+            if (name === "production_error" && upsertResult === 'insert') {
+                const instanceHadProductionFailure = await this.settingsRepository.findByKey('instance.firstProductionFailure');
+                if (!instanceHadProductionFailure &&
+                    !(await this.workflowRepository.hasAnyWorkflowsWithErrorWorkflow())) {
+                    const project = await this.ownershipService.getWorkflowProjectCached(workflowId);
+                    let owner = project.type === 'personal'
+                        ? await this.ownershipService.getPersonalProjectOwnerCached(project.id)
+                        : null;
+                    owner ??= await this.ownershipService.getInstanceOwner();
+                    await this.settingsRepository.save({
+                        key: 'instance.firstProductionFailure',
+                        value: JSON.stringify({
+                            workflowId,
+                            projectId: project.id,
+                            userId: owner.id,
+                            timestamp: runData.startedAt.getTime(),
+                        }),
+                        loadOnStartup: false,
+                    });
+                    this.eventService.emit('instance-first-production-workflow-failed', {
+                        projectId: project.id,
+                        workflowId,
+                        workflowName: workflowData.name,
+                        userId: owner.id,
+                    });
+                }
+            }
         }
         catch (error) {
-            this.logger.debug('Unable to fire first workflow success telemetry event');
+            this.logger.debug('Unable to fire first workflow telemetry event');
         }
     }
     async nodeFetchedData(workflowId, node) {
@@ -136,6 +165,8 @@ exports.WorkflowStatisticsService = WorkflowStatisticsService = __decorate([
         db_1.WorkflowStatisticsRepository,
         ownership_service_1.OwnershipService,
         user_service_1.UserService,
-        event_service_1.EventService])
+        event_service_1.EventService,
+        db_1.SettingsRepository,
+        db_1.WorkflowRepository])
 ], WorkflowStatisticsService);
 //# sourceMappingURL=workflow-statistics.service.js.map

package/dist/services/workflow-statistics.service.js.map

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