n8n 1.64.1 → 1.65.0

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

@@ -1,3 +1,4 @@
+import { GlobalConfig } from '@n8n/config';
 import { BinaryDataService, InstanceSettings } from 'n8n-core';
 import { ExecutionRepository } from '../databases/repositories/execution.repository';
 import { Logger } from '../logging/logger.service';
@@ -8,12 +9,13 @@ export declare class PruningService {
     private readonly executionRepository;
     private readonly binaryDataService;
     private readonly orchestrationService;
+    private readonly globalConfig;
     private hardDeletionBatchSize;
     private rates;
     softDeletionInterval: NodeJS.Timer | undefined;
     hardDeletionTimeout: NodeJS.Timeout | undefined;
     private isShuttingDown;
-    constructor(logger: Logger, instanceSettings: InstanceSettings, executionRepository: ExecutionRepository, binaryDataService: BinaryDataService, orchestrationService: OrchestrationService);
+    constructor(logger: Logger, instanceSettings: InstanceSettings, executionRepository: ExecutionRepository, binaryDataService: BinaryDataService, orchestrationService: OrchestrationService, globalConfig: GlobalConfig);
     init(): void;
     private isPruningEnabled;
     startPruning(): void;

package/dist/services/pruning.service.js

@@ -13,26 +13,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PruningService = void 0;
+const config_1 = require("@n8n/config");
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const typedi_1 = require("typedi");
-const config_1 = __importDefault(require("../config"));
+const config_2 = __importDefault(require("../config"));
 const constants_1 = require("../constants");
 const execution_repository_1 = require("../databases/repositories/execution.repository");
 const on_shutdown_1 = require("../decorators/on-shutdown");
 const logger_service_1 = require("../logging/logger.service");
 const orchestration_service_1 = require("./orchestration.service");
 let PruningService = class PruningService {
-    constructor(logger, instanceSettings, executionRepository, binaryDataService, orchestrationService) {
+    constructor(logger, instanceSettings, executionRepository, binaryDataService, orchestrationService, globalConfig) {
         this.logger = logger;
         this.instanceSettings = instanceSettings;
         this.executionRepository = executionRepository;
         this.binaryDataService = binaryDataService;
         this.orchestrationService = orchestrationService;
+        this.globalConfig = globalConfig;
         this.hardDeletionBatchSize = 100;
         this.rates = {
-            softDeletion: config_1.default.getEnv('executions.pruneDataIntervals.softDelete') * constants_1.TIME.MINUTE,
-            hardDeletion: config_1.default.getEnv('executions.pruneDataIntervals.hardDelete') * constants_1.TIME.MINUTE,
+            softDeletion: config_2.default.getEnv('executions.pruneDataIntervals.softDelete') * constants_1.TIME.MINUTE,
+            hardDeletion: config_2.default.getEnv('executions.pruneDataIntervals.hardDelete') * constants_1.TIME.MINUTE,
         };
         this.isShuttingDown = false;
     }
@@ -48,10 +50,10 @@ let PruningService = class PruningService {
     }
     isPruningEnabled() {
         const { instanceType, isFollower } = this.instanceSettings;
-        if (!config_1.default.getEnv('executions.pruneData') || constants_1.inTest || instanceType !== 'main') {
+        if (!config_2.default.getEnv('executions.pruneData') || constants_1.inTest || instanceType !== 'main') {
             return false;
         }
-        if (config_1.default.getEnv('multiMainSetup.enabled') && instanceType === 'main' && isFollower) {
+        if (this.globalConfig.multiMainSetup.enabled && instanceType === 'main' && isFollower) {
             return false;
         }
         return true;
@@ -143,6 +145,7 @@ exports.PruningService = PruningService = __decorate([
         n8n_core_1.InstanceSettings,
         execution_repository_1.ExecutionRepository,
         n8n_core_1.BinaryDataService,
-        orchestration_service_1.OrchestrationService])
+        orchestration_service_1.OrchestrationService,
+        config_1.GlobalConfig])
 ], PruningService);
 //# sourceMappingURL=pruning.service.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"pruning.service.js","sourceRoot":"","sources":["../../src/services/pruning.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uCAA+D;AAC/D,+CAA6C;AAC7C,mCAAiC;AAEjC,sDAA8B;AAC9B,2CAA2C;AAC3C,wFAAoF;AACpF,0DAAsD;AACtD,6DAAkD;AAElD,mEAA+D;AAGxD,IAAM,cAAc,GAApB,MAAM,cAAc;IAc1B,YACkB,MAAc,EACd,gBAAkC,EAClC,mBAAwC,EACxC,iBAAoC,EACpC,oBAA0C;QAJ1C,WAAM,GAAN,MAAM,CAAQ;QACd,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,yBAAoB,GAApB,oBAAoB,CAAsB;QAlBpD,0BAAqB,GAAG,GAAG,CAAC;QAE5B,UAAK,GAA2B;YACvC,YAAY,EAAE,gBAAM,CAAC,MAAM,CAAC,0CAA0C,CAAC,GAAG,gBAAI,CAAC,MAAM;YACrF,YAAY,EAAE,gBAAM,CAAC,MAAM,CAAC,0CAA0C,CAAC,GAAG,gBAAI,CAAC,MAAM;SACrF,CAAC;QAMM,mBAAc,GAAG,KAAK,CAAC;IAQ5B,CAAC;IAKJ,IAAI;QACH,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC3C,MAAM,EAAE,uBAAuB,EAAE,GAAG,IAAI,CAAC,oBAAoB,CAAC;QAE9D,IAAI,QAAQ;YAAE,IAAI,CAAC,YAAY,EAAE,CAAC;QAElC,IAAI,uBAAuB,EAAE,CAAC;YAC7B,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;YAC1F,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAC1F,CAAC;IACF,CAAC;IAEO,gBAAgB;QACvB,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC3D,IAAI,CAAC,gBAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,IAAI,kBAAM,IAAI,YAAY,KAAK,MAAM,EAAE,CAAC;YACjF,OAAO,KAAK,CAAC;QACd,CAAC;QAED,IAAI,gBAAM,CAAC,MAAM,CAAC,wBAAwB,CAAC,IAAI,YAAY,KAAK,MAAM,IAAI,UAAU,EAAE,CAAC;YACtF,OAAO,KAAK,CAAC;QACd,CAAC;QAED,OAAO,IAAI,CAAC;IACb,CAAC;IAKD,YAAY;QACX,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAAE,OAAO;QAErC,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;YACvE,OAAO;QACR,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2DAA2D,CAAC,CAAC;QAE/E,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC/B,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC7B,CAAC;IAED,WAAW;QACV,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAAE,OAAO;QAErC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2DAA2D,CAAC,CAAC;QAE/E,aAAa,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACzC,YAAY,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACxC,CAAC;IAEO,uBAAuB,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY;QAC/D,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,gBAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAErD,IAAI,CAAC,oBAAoB,GAAG,WAAW,CACtC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,wBAAwB,EAAE,EACjD,IAAI,CAAC,KAAK,CAAC,YAAY,CACvB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,IAAI,EAAE,CAAC,CAAC;IACtE,CAAC;IAEO,oBAAoB,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY;QAC5D,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,gBAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAErD,IAAI,CAAC,mBAAmB,GAAG,UAAU,CAAC,GAAG,EAAE;YAC1C,IAAI,CAAC,wBAAwB,EAAE;iBAC7B,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;iBAC/C,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBAChB,IAAI,CAAC,oBAAoB,CAAC,CAAC,GAAG,gBAAI,CAAC,MAAM,CAAC,CAAC;gBAE3C,MAAM,YAAY,GACjB,KAAK,YAAY,KAAK;oBACrB,CAAC,CAAC,KAAK,CAAC,OAAO;oBACf,CAAC,CAAC,IAAA,4BAAa,EAAC,KAAK,EAAE,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,CAAC;gBAExD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4CAA4C,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;YACnF,CAAC,CAAC,CAAC;QACL,CAAC,EAAE,MAAM,CAAC,CAAC;QAEX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,IAAI,EAAE,CAAC,CAAC;IACzE,CAAC;IAKD,KAAK,CAAC,wBAAwB;QAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;QAEpE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,4BAA4B,EAAE,CAAC;QAE7E,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;YAClE,OAAO;QACR,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpF,CAAC;IAGD,QAAQ;QACP,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,WAAW,EAAE,CAAC;IACpB,CAAC;IAMO,KAAK,CAAC,wBAAwB;QACrC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,+BAA+B,EAAE,CAAC;QAE7E,MAAM,YAAY,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QAEnD,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;YAElE,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;QAChC,CAAC;QAED,IAAI,CAAC;YACJ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gDAAgD,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;YAEtF,MAAM,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAE7C,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YAEzD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;QAC1E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4CAA4C,EAAE;gBAC/D,YAAY;gBACZ,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE;aAC1D,CAAC,CAAC;QACJ,CAAC;QAMD,MAAM,YAAY,GAAG,YAAY,CAAC,MAAM,IAAI,IAAI,CAAC,qBAAqB,CAAC;QAEvE,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,gBAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;IACjE,CAAC;CACD,CAAA;AAxKY,wCAAc;AA6H1B;IADC,IAAA,wBAAU,GAAE;;;;8CAIZ;yBAhIW,cAAc;IAD1B,IAAA,gBAAO,GAAE;qCAgBiB,uBAAM;QACI,2BAAgB;QACb,0CAAmB;QACrB,4BAAiB;QACd,4CAAoB;GAnBhD,cAAc,CAwK1B"}
+{"version":3,"file":"pruning.service.js","sourceRoot":"","sources":["../../src/services/pruning.service.ts"],"names":[],"mappings":"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"}

package/dist/services/public-api-key.service.d.ts

@@ -1,10 +1,17 @@
+import type { OpenAPIV3 } from 'openapi-types';
 import { ApiKey } from '../databases/entities/api-key';
 import type { User } from '../databases/entities/user';
 import { ApiKeyRepository } from '../databases/repositories/api-key.repository';
-export declare const API_KEY_PREFIX = "n8n_api_";
+import { UserRepository } from '../databases/repositories/user.repository';
+import { EventService } from '../events/event.service';
+import type { AuthenticatedRequest } from '../requests';
+import { JwtService } from './jwt.service';
 export declare class PublicApiKeyService {
     private readonly apiKeyRepository;
-    constructor(apiKeyRepository: ApiKeyRepository);
+    private readonly userRepository;
+    private readonly jwtService;
+    private readonly eventService;
+    constructor(apiKeyRepository: ApiKeyRepository, userRepository: UserRepository, jwtService: JwtService, eventService: EventService);
     createPublicApiKeyForUser(user: User): Promise<ApiKey>;
     getRedactedApiKeysForUser(user: User): Promise<{
         apiKey: string;
@@ -16,7 +23,8 @@ export declare class PublicApiKeyService {
         updatedAt: Date;
     }[]>;
     deleteApiKeyForUser(user: User, apiKeyId: string): Promise<void>;
-    getUserForApiKey(apiKey: string): Promise<User | null>;
+    private getUserForApiKey;
     redactApiKey(apiKey: string): string;
-    createApiKeyString: () => string;
+    getAuthMiddleware(version: string): (req: AuthenticatedRequest, _scopes: unknown, schema: OpenAPIV3.ApiKeySecurityScheme) => Promise<boolean>;
+    private generateApiKey;
 }

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

@@ -1,51 +1,35 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PublicApiKeyService = exports.API_KEY_PREFIX = void 0;
-const node_crypto_1 = require("node:crypto");
-const typedi_1 = __importStar(require("typedi"));
+exports.PublicApiKeyService = void 0;
+const typedi_1 = require("typedi");
 const api_key_1 = require("../databases/entities/api-key");
 const api_key_repository_1 = require("../databases/repositories/api-key.repository");
 const user_repository_1 = require("../databases/repositories/user.repository");
-exports.API_KEY_PREFIX = 'n8n_api_';
+const event_service_1 = require("../events/event.service");
+const jwt_service_1 = require("./jwt.service");
+const API_KEY_AUDIENCE = 'public-api';
+const API_KEY_ISSUER = 'n8n';
+const REDACT_API_KEY_REVEAL_COUNT = 15;
+const REDACT_API_KEY_MAX_LENGTH = 80;
 let PublicApiKeyService = class PublicApiKeyService {
-    constructor(apiKeyRepository) {
+    constructor(apiKeyRepository, userRepository, jwtService, eventService) {
         this.apiKeyRepository = apiKeyRepository;
-        this.createApiKeyString = () => `${exports.API_KEY_PREFIX}${(0, node_crypto_1.randomBytes)(40).toString('hex')}`;
+        this.userRepository = userRepository;
+        this.jwtService = jwtService;
+        this.eventService = eventService;
+        this.generateApiKey = (user) => this.jwtService.sign({ sub: user.id, iss: API_KEY_ISSUER, aud: API_KEY_AUDIENCE });
     }
     async createPublicApiKeyForUser(user) {
-        const apiKey = this.createApiKeyString();
+        const apiKey = this.generateApiKey(user);
         await this.apiKeyRepository.upsert(this.apiKeyRepository.create({
             userId: user.id,
             apiKey,
@@ -64,7 +48,7 @@ let PublicApiKeyService = class PublicApiKeyService {
         await this.apiKeyRepository.delete({ userId: user.id, id: apiKeyId });
     }
     async getUserForApiKey(apiKey) {
-        return await typedi_1.default.get(user_repository_1.UserRepository)
+        return await this.userRepository
             .createQueryBuilder('user')
             .innerJoin(api_key_1.ApiKey, 'apiKey', 'apiKey.userId = user.id')
             .where('apiKey.apiKey = :apiKey', { apiKey })
@@ -72,15 +56,34 @@ let PublicApiKeyService = class PublicApiKeyService {
             .getOne();
     }
     redactApiKey(apiKey) {
-        const keepLength = 5;
-        return (exports.API_KEY_PREFIX +
-            apiKey.slice(exports.API_KEY_PREFIX.length, exports.API_KEY_PREFIX.length + keepLength) +
-            '*'.repeat(apiKey.length - exports.API_KEY_PREFIX.length - keepLength));
+        const visiblePart = apiKey.slice(0, REDACT_API_KEY_REVEAL_COUNT);
+        const redactedPart = '*'.repeat(apiKey.length - REDACT_API_KEY_REVEAL_COUNT);
+        const completeRedactedApiKey = visiblePart + redactedPart;
+        return completeRedactedApiKey.slice(0, REDACT_API_KEY_MAX_LENGTH);
+    }
+    getAuthMiddleware(version) {
+        return async (req, _scopes, schema) => {
+            const providedApiKey = req.headers[schema.name.toLowerCase()];
+            const user = await this.getUserForApiKey(providedApiKey);
+            if (!user)
+                return false;
+            this.eventService.emit('public-api-invoked', {
+                userId: user.id,
+                path: req.path,
+                method: req.method,
+                apiVersion: version,
+            });
+            req.user = user;
+            return true;
+        };
     }
 };
 exports.PublicApiKeyService = PublicApiKeyService;
 exports.PublicApiKeyService = PublicApiKeyService = __decorate([
     (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [api_key_repository_1.ApiKeyRepository])
+    __metadata("design:paramtypes", [api_key_repository_1.ApiKeyRepository,
+        user_repository_1.UserRepository,
+        jwt_service_1.JwtService,
+        event_service_1.EventService])
 ], PublicApiKeyService);
 //# sourceMappingURL=public-api-key.service.js.map

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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA0C;AAC1C,iDAA4C;AAE5C,0DAAsD;AAEtD,oFAA+E;AAC/E,8EAA0E;AAE7D,QAAA,cAAc,GAAG,UAAU,CAAC;AAGlC,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC/B,YAA6B,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAkE/D,uBAAkB,GAAG,GAAG,EAAE,CAAC,GAAG,sBAAc,GAAG,IAAA,yBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;IAlEf,CAAC;IAOnE,KAAK,CAAC,yBAAyB,CAAC,IAAU;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CACjC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;YAC5B,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,MAAM;YACN,KAAK,EAAE,YAAY;SACnB,CAAC,EACF,CAAC,QAAQ,CAAC,CACV,CAAC;QAEF,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAChE,CAAC;IAOD,KAAK,CAAC,yBAAyB,CAAC,IAAU;QACzC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QACxE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;YACrC,GAAG,YAAY;YACf,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC;SAC9C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,IAAU,EAAE,QAAgB;QACrD,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,MAAc;QACpC,OAAO,MAAM,gBAAS,CAAC,GAAG,CAAC,gCAAc,CAAC;aACxC,kBAAkB,CAAC,MAAM,CAAC;aAC1B,SAAS,CAAC,gBAAM,EAAE,QAAQ,EAAE,yBAAyB,CAAC;aACtD,KAAK,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,CAAC;aAC5C,MAAM,CAAC,MAAM,CAAC;aACd,MAAM,EAAE,CAAC;IACZ,CAAC;IAYD,YAAY,CAAC,MAAc;QAC1B,MAAM,UAAU,GAAG,CAAC,CAAC;QACrB,OAAO,CACN,sBAAc;YACd,MAAM,CAAC,KAAK,CAAC,sBAAc,CAAC,MAAM,EAAE,sBAAc,CAAC,MAAM,GAAG,UAAU,CAAC;YACvE,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,sBAAc,CAAC,MAAM,GAAG,UAAU,CAAC,CAC9D,CAAC;IACH,CAAC;CAGD,CAAA;AApEY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,gBAAO,GAAE;qCAEsC,qCAAgB;GADnD,mBAAmB,CAoE/B"}
+{"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/redis-client.service.js

@@ -31,6 +31,7 @@ let RedisClientService = class RedisClientService extends typed_emitter_1.TypedE
             resetLength: 30_000,
         };
         this.lostConnection = false;
+        this.logger = this.logger.scoped(['redis', 'scaling']);
         this.registerListeners();
     }
     isConnected() {
@@ -68,17 +69,19 @@ let RedisClientService = class RedisClientService extends typed_emitter_1.TypedE
         const { host, port } = this.globalConfig.queue.bull.redis;
         options.host = host;
         options.port = port;
-        this.logger.debug('[Redis] Initializing regular client', { type, host, port });
-        return new ioredis_1.default(options);
+        const client = new ioredis_1.default(options);
+        this.logger.debug(`Started Redis client ${type}`, { type, host, port });
+        return client;
     }
     createClusterClient({ type, extraOptions, }) {
         const options = this.getOptions({ extraOptions });
         const clusterNodes = this.clusterNodes();
-        this.logger.debug('[Redis] Initializing cluster client', { type, clusterNodes });
-        return new ioredis_1.default.Cluster(clusterNodes, {
+        const clusterClient = new ioredis_1.default.Cluster(clusterNodes, {
             redisOptions: options,
             clusterRetryStrategy: this.retryStrategy(),
         });
+        this.logger.debug(`Started Redis cluster client ${type}`, { type, clusterNodes });
+        return clusterClient;
     }
     getOptions({ extraOptions }) {
         const { username, password, db, tls } = this.globalConfig.queue.bull.redis;

package/dist/services/redis-client.service.js.map

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

package/dist/services/user.service.js

@@ -97,6 +97,7 @@ let UserService = class UserService {
                     email,
                     inviteAcceptUrl,
                     emailSent: false,
+                    role,
                 },
                 error: '',
             };

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

@@ -1 +1 @@
-{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/services/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,+CAAqF;AACrF,mCAAiC;AAGjC,8EAA0E;AAC1E,0FAAqF;AACrF,0DAAsD;AAEtD,6DAAkD;AAGlD,wDAAoD;AACpD,mDAA+D;AAGxD,IAAM,WAAW,GAAjB,MAAM,WAAW;IACvB,YACkB,MAAc,EACd,cAA8B,EAC9B,MAA4B,EAC5B,UAAsB,EACtB,YAA0B;QAJ1B,WAAM,GAAN,MAAM,CAAQ;QACd,mBAAc,GAAd,cAAc,CAAgB;QAC9B,WAAM,GAAN,MAAM,CAAsB;QAC5B,eAAU,GAAV,UAAU,CAAY;QACtB,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,KAAK,CAAC,MAAM,CAAC,MAAc,EAAE,IAAmB;QAC/C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAEjE,IAAI,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7E,CAAC;QAED,OAAO;IACR,CAAC;IAED,UAAU;QACT,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,MAAc,EAAE,WAAmC;QACvE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QAEhF,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC3C,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC;QAC7B,CAAC;QAED,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,QAAQ,CACb,IAAU,EACV,OAKC;QAED,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;QAE9D,MAAM,YAAY,GAAG,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,MAAM,CAAC,CAAC;QAE5E,IAAI,UAAU,GAAe;YAC5B,GAAG,IAAI;YACP,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO;SAC3C,CAAC;QAEF,IAAI,OAAO,EAAE,aAAa,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC;YACnD,MAAM,IAAI,+BAAgB,CAAC,+CAA+C,CAAC,CAAC;QAC7E,CAAC;QAED,IAAI,OAAO,EAAE,aAAa,IAAI,OAAO,EAAE,SAAS,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;YAC1E,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAC/D,CAAC;QAED,IAAI,OAAO,EAAE,OAAO,EAAE,CAAC;YACtB,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,CAAC;QAED,IAAI,OAAO,EAAE,UAAU,EAAE,CAAC;YACzB,UAAU,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QAC7C,CAAC;QAED,OAAO,UAAU,CAAC;IACnB,CAAC;IAEO,YAAY,CAAC,SAAiB,EAAE,OAAmB;QAC1D,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAC1D,GAAG,CAAC,QAAQ,GAAG,SAAS,CAAC;QACzB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QAC7C,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QAE9C,OAAO,CAAC,eAAe,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QAEzC,OAAO,OAAO,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,UAAsB,EAAE,OAAsB;QAG3E,MAAM,cAAc,GAAG,IAAI,OAAO,CAAa,CAAC,OAAO,EAAE,EAAE;YAC1D,UAAU,CAAC,GAAG,EAAE;gBACf,OAAO,CAAC,UAAU,CAAC,CAAC;YACrB,CAAC,EAAE,IAAI,CAAC,CAAC;QACV,CAAC,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,IAAI,OAAO,CAAa,KAAK,EAAE,OAAO,EAAE,EAAE;YAC9D,UAAU,CAAC,YAAY,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACpE,OAAO,CAAC,UAAU,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC,CAAC;IAC3D,CAAC;IAEO,KAAK,CAAC,UAAU,CACvB,KAAW,EACX,aAAwC,EACxC,IAAoB;QAEpB,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC;QAEpD,OAAO,MAAM,OAAO,CAAC,GAAG,CACvB,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;YACvD,MAAM,eAAe,GAAG,GAAG,MAAM,qBAAqB,KAAK,CAAC,EAAE,cAAc,EAAE,EAAE,CAAC;YACjF,MAAM,WAAW,GAA+B;gBAC/C,IAAI,EAAE;oBACL,EAAE;oBACF,KAAK;oBACL,eAAe;oBACf,SAAS,EAAE,KAAK;iBAChB;gBACD,KAAK,EAAE,EAAE;aACT,CAAC;YAEF,IAAI,CAAC;gBACJ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;oBACvC,KAAK;oBACL,eAAe;iBACf,CAAC,CAAC;gBACH,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;oBACtB,WAAW,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;oBAClC,OAAO,WAAW,CAAC,IAAI,EAAE,eAAe,CAAC;oBAEzC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,+BAA+B,EAAE;wBACvD,MAAM,EAAE,EAAE;wBACV,WAAW,EAAE,iBAAiB;wBAC9B,SAAS,EAAE,KAAK;qBAChB,CAAC,CAAC;gBACJ,CAAC;gBAED,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,EAAE;oBACtC,IAAI,EAAE,KAAK;oBACX,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC;oBAC1C,SAAS,EAAE,KAAK;oBAChB,SAAS,EAAE,MAAM,CAAC,SAAS;oBAC3B,WAAW,EAAE,IAAI;iBACjB,CAAC,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;oBACxB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,EAAE;wBACtC,IAAI,EAAE,KAAK;wBACX,WAAW,EAAE,iBAAiB;wBAC9B,SAAS,EAAE,KAAK;qBAChB,CAAC,CAAC;oBACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE;wBACzC,MAAM,EAAE,KAAK,CAAC,EAAE;wBAChB,eAAe;wBACf,KAAK;qBACL,CAAC,CAAC;oBACH,WAAW,CAAC,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC;gBAC/B,CAAC;YACF,CAAC;YAED,OAAO,WAAW,CAAC;QACpB,CAAC,CAAC,CACF,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAW,EAAE,WAAyB;QACvD,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QAErD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAExE,MAAM,gBAAgB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEjE,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QAE3F,MAAM,oBAAoB,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAE9E,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;QAE/C,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,aAAa,CAAC,MAAM,GAAG,CAAC;YACvB,CAAC,CAAC,YAAY,aAAa,CAAC,MAAM,iBAAiB;YACnD,CAAC,CAAC,0BAA0B,CAC7B,CAAC;QAEF,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,WAAW,CAClC,KAAK,EAAE,kBAAkB,EAAE,EAAE,CAC5B,MAAM,OAAO,CAAC,GAAG,CAChB,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;gBAC3C,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAC1E,EAAE,KAAK,EAAE,IAAI,EAAE,EACf,kBAAkB,CAClB,CAAC;gBACF,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;gBACtC,OAAO,SAAS,CAAC;YAClB,CAAC,CAAC,CACF,CACF,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,iCAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC;YAChF,MAAM,IAAI,2CAAmB,CAAC,wCAAwC,CAAC,CAAC;QACzE,CAAC;QAED,oBAAoB,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;QAE7E,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,UAAU,CACzC,KAAK,EACL,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,EAChC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CACnB,CAAC;QAEF,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;IAChF,CAAC;CACD,CAAA;AArNY,kCAAW;sBAAX,WAAW;IADvB,IAAA,gBAAO,GAAE;qCAGiB,uBAAM;QACE,gCAAc;QACtB,4BAAoB;QAChB,wBAAU;QACR,4BAAY;GANhC,WAAW,CAqNvB"}
+{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/services/user.service.ts"],"names":[],"mappings":"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"}

package/dist/sso/saml/routes/saml.controller.ee.js

@@ -22,14 +22,13 @@ const decorators_1 = require("../../../decorators");
 const auth_error_1 = require("../../../errors/response-errors/auth.error");
 const bad_request_error_1 = require("../../../errors/response-errors/bad-request.error");
 const event_service_1 = require("../../../events/event.service");
+const response_helper_1 = require("../../../response-helper");
 const url_service_1 = require("../../../services/url.service");
 const saml_enabled_middleware_1 = require("../middleware/saml-enabled-middleware");
 const saml_helpers_1 = require("../saml-helpers");
 const saml_service_ee_1 = require("../saml.service.ee");
 const service_provider_ee_1 = require("../service-provider.ee");
 const init_sso_post_1 = require("../views/init-sso-post");
-const saml_connection_test_failed_1 = require("../views/saml-connection-test-failed");
-const saml_connection_test_success_1 = require("../views/saml-connection-test-success");
 let SamlController = class SamlController {
     constructor(authService, samlService, urlService, eventService) {
         this.authService = authService;
@@ -79,10 +78,13 @@ let SamlController = class SamlController {
             const loginResult = await this.samlService.handleSamlLogin(req, binding);
             if ((0, saml_helpers_1.isConnectionTestRequest)(req)) {
                 if (loginResult.authenticatedUser) {
-                    return res.send((0, saml_connection_test_success_1.getSamlConnectionTestSuccessView)(loginResult.attributes));
+                    return res.render('saml-connection-test-success', loginResult.attributes);
                 }
                 else {
-                    return res.send((0, saml_connection_test_failed_1.getSamlConnectionTestFailedView)('', loginResult.attributes));
+                    return res.render('saml-connection-test-failed', {
+                        message: '',
+                        attributes: loginResult.attributes,
+                    });
                 }
             }
             if (loginResult.authenticatedUser) {
@@ -108,17 +110,17 @@ let SamlController = class SamlController {
                 userEmail: loginResult.attributes.email ?? 'unknown',
                 authenticationMethod: 'saml',
             });
-            throw new auth_error_1.AuthError('SAML Authentication failed');
+            return (0, response_helper_1.sendErrorResponse)(res, new auth_error_1.AuthError('SAML Authentication failed'));
         }
         catch (error) {
             if ((0, saml_helpers_1.isConnectionTestRequest)(req)) {
-                return res.send((0, saml_connection_test_failed_1.getSamlConnectionTestFailedView)(error.message));
+                return res.render('saml-connection-test-failed', { message: error.message });
             }
             this.eventService.emit('user-login-failed', {
                 userEmail: 'unknown',
                 authenticationMethod: 'saml',
             });
-            throw new auth_error_1.AuthError('SAML Authentication failed: ' + error.message);
+            return (0, response_helper_1.sendErrorResponse)(res, new auth_error_1.AuthError('SAML Authentication failed: ' + error.message));
         }
     }
     async initSsoGet(req, res) {
@@ -183,13 +185,13 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], SamlController.prototype, "toggleEnabledPost", null);
 __decorate([
-    (0, decorators_1.Get)('/acs', { middlewares: [saml_enabled_middleware_1.samlLicensedMiddleware], skipAuth: true }),
+    (0, decorators_1.Get)('/acs', { middlewares: [saml_enabled_middleware_1.samlLicensedMiddleware], skipAuth: true, usesTemplates: true }),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
 ], SamlController.prototype, "acsGet", null);
 __decorate([
-    (0, decorators_1.Post)('/acs', { middlewares: [saml_enabled_middleware_1.samlLicensedMiddleware], skipAuth: true }),
+    (0, decorators_1.Post)('/acs', { middlewares: [saml_enabled_middleware_1.samlLicensedMiddleware], skipAuth: true, usesTemplates: true }),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)

package/dist/sso/saml/routes/saml.controller.ee.js.map

@@ -1 +1 @@
-{"version":3,"file":"saml.controller.ee.js","sourceRoot":"","sources":["../../../../src/sso/saml/routes/saml.controller.ee.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"saml.controller.ee.js","sourceRoot":"","sources":["../../../../src/sso/saml/routes/saml.controller.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qDAA2C;AAC3C,sDAA8B;AAC9B,8DAAsC;AAEtC,8CAAsB;AAEtB,sDAAkD;AAClD,6CAAsE;AACtE,oEAAgE;AAChE,kFAA6E;AAC7E,0DAAsD;AAEtD,uDAAsD;AACtD,wDAAoD;AAEpD,mFAG+C;AAC/C,kDAAoF;AACpF,wDAAiD;AACjD,gEAIgC;AAGhC,0DAA4D;AAGrD,IAAM,cAAc,GAApB,MAAM,cAAc;IAC1B,YACkB,WAAwB,EACxB,WAAwB,EACxB,UAAsB,EACtB,YAA0B;QAH1B,gBAAW,GAAX,WAAW,CAAa;QACxB,gBAAW,GAAX,WAAW,CAAa;QACxB,eAAU,GAAV,UAAU,CAAY;QACtB,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAGE,AAAN,KAAK,CAAC,0BAA0B,CAAC,CAAkB,EAAE,GAAqB;QACzE,OAAO,GAAG;aACR,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC;aAClC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,0BAA0B,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;IACrE,CAAC;IAMK,AAAN,KAAK,CAAC,SAAS;QACd,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC;QAC/C,OAAO;YACN,GAAG,KAAK;YACR,QAAQ,EAAE,IAAA,gDAA0B,GAAE;YACtC,SAAS,EAAE,IAAA,iDAA2B,GAAE;SACxC,CAAC;IACH,CAAC;IAOK,AAAN,KAAK,CAAC,UAAU,CAAC,GAA6B;QAC7C,MAAM,gBAAgB,GAAG,MAAM,IAAA,0BAAQ,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACnE,OAAO,MAAM,CAAC;QACf,CAAC;aAAM,CAAC;YACP,MAAM,IAAI,mCAAe,CACxB,8CAA8C;gBAC7C,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CACpD,CAAC;QACH,CAAC;IACF,CAAC;IAOK,AAAN,KAAK,CAAC,iBAAiB,CAAC,GAA6B,EAAE,GAAqB;QAC3E,IAAI,GAAG,CAAC,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACzC,MAAM,IAAI,mCAAe,CAAC,uDAAuD,CAAC,CAAC;QACpF,CAAC;QACD,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,YAAY,EAAE,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QACnF,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;IAMK,AAAN,KAAK,CAAC,MAAM,CAAC,GAAiC,EAAE,GAAqB;QACpE,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;IACpD,CAAC;IAMK,AAAN,KAAK,CAAC,OAAO,CAAC,GAAiC,EAAE,GAAqB;QACrE,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;IAChD,CAAC;IAOO,KAAK,CAAC,UAAU,CACvB,GAAiC,EACjC,GAAqB,EACrB,OAAyB;QAEzB,IAAI,CAAC;YACJ,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAEzE,IAAI,IAAA,sCAAuB,EAAC,GAAG,CAAC,EAAE,CAAC;gBAClC,IAAI,WAAW,CAAC,iBAAiB,EAAE,CAAC;oBACnC,OAAO,GAAG,CAAC,MAAM,CAAC,8BAA8B,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;gBAC3E,CAAC;qBAAM,CAAC;oBACP,OAAO,GAAG,CAAC,MAAM,CAAC,6BAA6B,EAAE;wBAChD,OAAO,EAAE,EAAE;wBACX,UAAU,EAAE,WAAW,CAAC,UAAU;qBAClC,CAAC,CAAC;gBACJ,CAAC;YACF,CAAC;YACD,IAAI,WAAW,CAAC,iBAAiB,EAAE,CAAC;gBACnC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,gBAAgB,EAAE;oBACxC,IAAI,EAAE,WAAW,CAAC,iBAAiB;oBACnC,oBAAoB,EAAE,MAAM;iBAC5B,CAAC,CAAC;gBAGH,IAAI,IAAA,uCAAwB,GAAE,EAAE,CAAC;oBAChC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,WAAW,CAAC,iBAAiB,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;oBAChF,IAAI,WAAW,CAAC,kBAAkB,EAAE,CAAC;wBACpC,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,GAAG,kBAAkB,CAAC,CAAC;oBAChF,CAAC;yBAAM,CAAC;wBACP,MAAM,WAAW,GAAG,GAAG,CAAC,IAAI,EAAE,UAAU,IAAI,GAAG,CAAC;wBAChD,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,GAAG,WAAW,CAAC,CAAC;oBACzE,CAAC;gBACF,CAAC;qBAAM,CAAC;oBACP,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;gBACrD,CAAC;YACF,CAAC;YACD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,mBAAmB,EAAE;gBAC3C,SAAS,EAAE,WAAW,CAAC,UAAU,CAAC,KAAK,IAAI,SAAS;gBACpD,oBAAoB,EAAE,MAAM;aAC5B,CAAC,CAAC;YAEH,OAAO,IAAA,mCAAiB,EAAC,GAAG,EAAE,IAAI,sBAAS,CAAC,4BAA4B,CAAC,CAAC,CAAC;QAC5E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,IAAA,sCAAuB,EAAC,GAAG,CAAC,EAAE,CAAC;gBAClC,OAAO,GAAG,CAAC,MAAM,CAAC,6BAA6B,EAAE,EAAE,OAAO,EAAG,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;YACzF,CAAC;YACD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,mBAAmB,EAAE;gBAC3C,SAAS,EAAE,SAAS;gBACpB,oBAAoB,EAAE,MAAM;aAC5B,CAAC,CAAC;YAEH,OAAO,IAAA,mCAAiB,EACvB,GAAG,EACH,IAAI,sBAAS,CAAC,8BAA8B,GAAI,KAAe,CAAC,OAAO,CAAC,CACxE,CAAC;QACH,CAAC;IACF,CAAC;IAOK,AAAN,KAAK,CAAC,UAAU,CAAC,GAAoB,EAAE,GAAqB;QAC3D,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC;YACJ,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC;YACvC,IAAI,UAAU,EAAE,CAAC;gBAChB,MAAM,SAAS,GAAG,aAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBACxC,IAAI,SAAS,EAAE,KAAK,EAAE,CAAC;oBACtB,MAAM,iBAAiB,GAAG,qBAAW,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBAC7D,IAAI,iBAAiB,CAAC,QAAQ,IAAI,OAAO,iBAAiB,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;wBAClF,WAAW,GAAG,qBAAW,CAAC,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;oBAChE,CAAC;gBACF,CAAC;YACF,CAAC;QACF,CAAC;QAAC,MAAM,CAAC;QAET,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IACnD,CAAC;IAQK,AAAN,KAAK,CAAC,aAAa,CAAC,CAAuB,EAAE,GAAqB;QACjE,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,IAAA,2DAAqC,GAAE,CAAC,CAAC;IAC/E,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,GAAqB,EAAE,UAAmB;QACrE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;QACrE,IAAI,MAAM,EAAE,OAAO,KAAK,UAAU,EAAE,CAAC;YACpC,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;QAC/B,CAAC;aAAM,IAAI,MAAM,EAAE,OAAO,KAAK,MAAM,EAAE,CAAC;YACvC,OAAO,GAAG,CAAC,IAAI,CAAC,IAAA,kCAAkB,EAAC,MAAM,CAAC,OAA6B,CAAC,CAAC,CAAC;QAC3E,CAAC;aAAM,CAAC;YACP,MAAM,IAAI,sBAAS,CAAC,6DAA6D,CAAC,CAAC;QACpF,CAAC;IACF,CAAC;CACD,CAAA;AAvLY,wCAAc;AASpB;IADL,IAAA,gBAAG,EAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;;;gEAKpC;AAMK;IADL,IAAA,gBAAG,EAAC,SAAS,EAAE,EAAE,WAAW,EAAE,CAAC,gDAAsB,CAAC,EAAE,CAAC;;;;+CAQzD;AAOK;IAFL,IAAA,iBAAI,EAAC,SAAS,EAAE,EAAE,WAAW,EAAE,CAAC,gDAAsB,CAAC,EAAE,CAAC;IAC1D,IAAA,wBAAW,EAAC,aAAa,CAAC;;;;gDAY1B;AAOK;IAFL,IAAA,iBAAI,EAAC,gBAAgB,EAAE,EAAE,WAAW,EAAE,CAAC,gDAAsB,CAAC,EAAE,CAAC;IACjE,IAAA,wBAAW,EAAC,aAAa,CAAC;;;;uDAO1B;AAMK;IADL,IAAA,gBAAG,EAAC,MAAM,EAAE,EAAE,WAAW,EAAE,CAAC,gDAAsB,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;;;;4CAG3F;AAMK;IADL,IAAA,iBAAI,EAAC,MAAM,EAAE,EAAE,WAAW,EAAE,CAAC,gDAAsB,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;;;;6CAG5F;AAuEK;IADL,IAAA,gBAAG,EAAC,UAAU,EAAE,EAAE,WAAW,EAAE,CAAC,0DAAgC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;;;gDAkBpF;AAQK;IAFL,IAAA,gBAAG,EAAC,cAAc,EAAE,EAAE,WAAW,EAAE,CAAC,gDAAsB,CAAC,EAAE,CAAC;IAC9D,IAAA,wBAAW,EAAC,aAAa,CAAC;;;;mDAG1B;yBA3KW,cAAc;IAD1B,IAAA,2BAAc,EAAC,WAAW,CAAC;qCAGI,0BAAW;QACX,6BAAW;QACZ,wBAAU;QACR,4BAAY;GALhC,cAAc,CAuL1B"}

package/dist/wait-tracker.js

@@ -27,7 +27,7 @@ let WaitTracker = class WaitTracker {
         this.orchestrationService = orchestrationService;
         this.instanceSettings = instanceSettings;
         this.waitingExecutions = {};
-        this.logger = this.logger.withScope('executions');
+        this.logger = this.logger.scoped('waiting-executions');
     }
     has(executionId) {
         return this.waitingExecutions[executionId] !== undefined;

package/dist/wait-tracker.js.map

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

package/dist/webhooks/test-webhooks.d.ts

@@ -4,6 +4,7 @@ import type { IWebhookData, IWorkflowExecuteAdditionalData, IHttpRequestMethods,
 import type { IWorkflowDb } from '../interfaces';
 import { NodeTypes } from '../node-types';
 import { Push } from '../push';
+import { Publisher } from '../scaling/pubsub/publisher.service';
 import { OrchestrationService } from '../services/orchestration.service';
 import { TestWebhookRegistrationsService } from '../webhooks/test-webhook-registrations.service';
 import type { IWebhookResponseCallbackData, IWebhookManager, WebhookAccessControlOptions, WebhookRequest } from './webhook.types';
@@ -12,7 +13,8 @@ export declare class TestWebhooks implements IWebhookManager {
     private readonly nodeTypes;
     private readonly registrations;
     private readonly orchestrationService;
-    constructor(push: Push, nodeTypes: NodeTypes, registrations: TestWebhookRegistrationsService, orchestrationService: OrchestrationService);
+    private readonly publisher;
+    constructor(push: Push, nodeTypes: NodeTypes, registrations: TestWebhookRegistrationsService, orchestrationService: OrchestrationService, publisher: Publisher);
     private timeouts;
     executeWebhook(request: WebhookRequest, response: express.Response): Promise<IWebhookResponseCallbackData>;
     clearTimeout(key: string): void;

package/dist/webhooks/test-webhooks.js

@@ -42,17 +42,19 @@ const webhook_not_found_error_1 = require("../errors/response-errors/webhook-not
 const workflow_missing_id_error_1 = require("../errors/workflow-missing-id.error");
 const node_types_1 = require("../node-types");
 const push_1 = require("../push");
+const publisher_service_1 = require("../scaling/pubsub/publisher.service");
 const orchestration_service_1 = require("../services/orchestration.service");
 const utils_1 = require("../utils");
 const test_webhook_registrations_service_1 = require("../webhooks/test-webhook-registrations.service");
 const WebhookHelpers = __importStar(require("../webhooks/webhook-helpers"));
 const WorkflowExecuteAdditionalData = __importStar(require("../workflow-execute-additional-data"));
 let TestWebhooks = class TestWebhooks {
-    constructor(push, nodeTypes, registrations, orchestrationService) {
+    constructor(push, nodeTypes, registrations, orchestrationService, publisher) {
         this.push = push;
         this.nodeTypes = nodeTypes;
         this.registrations = registrations;
         this.orchestrationService = orchestrationService;
+        this.publisher = publisher;
         this.timeouts = {};
     }
     async executeWebhook(request, response) {
@@ -112,8 +114,10 @@ let TestWebhooks = class TestWebhooks {
             if (this.orchestrationService.isMultiMainSetupEnabled &&
                 pushRef &&
                 !this.push.getBackend().hasPushRef(pushRef)) {
-                const payload = { webhookKey: key, workflowEntity, pushRef };
-                void this.orchestrationService.publish('clear-test-webhooks', payload);
+                void this.publisher.publishCommand({
+                    command: 'clear-test-webhooks',
+                    payload: { webhookKey: key, workflowEntity, pushRef },
+                });
                 return;
             }
             this.clearTimeout(key);
@@ -285,6 +289,7 @@ exports.TestWebhooks = TestWebhooks = __decorate([
     __metadata("design:paramtypes", [push_1.Push,
         node_types_1.NodeTypes,
         test_webhook_registrations_service_1.TestWebhookRegistrationsService,
-        orchestration_service_1.OrchestrationService])
+        orchestration_service_1.OrchestrationService,
+        publisher_service_1.Publisher])
 ], TestWebhooks);
 //# sourceMappingURL=test-webhooks.js.map

package/dist/webhooks/test-webhooks.js.map

@@ -1 +1 @@
-{"version":3,"file":"test-webhooks.js","sourceRoot":"","sources":["../../src/webhooks/test-webhooks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"test-webhooks.js","sourceRoot":"","sources":["../../src/webhooks/test-webhooks.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+DAAiD;AACjD,+CAA+D;AAO/D,mCAAiC;AAEjC,2CAAmD;AACnD,8EAAyE;AACzE,8FAAwF;AACxF,kFAA4E;AAE5E,6CAAyC;AACzC,iCAA8B;AAC9B,0EAA+D;AAC/D,4EAAwE;AACxE,mCAA8C;AAE9C,sGAAgG;AAChG,2EAA6D;AAC7D,kGAAoF;AAc7E,IAAM,YAAY,GAAlB,MAAM,YAAY;IACxB,YACkB,IAAU,EACV,SAAoB,EACpB,aAA8C,EAC9C,oBAA0C,EAC1C,SAAoB;QAJpB,SAAI,GAAJ,IAAI,CAAM;QACV,cAAS,GAAT,SAAS,CAAW;QACpB,kBAAa,GAAb,aAAa,CAAiC;QAC9C,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,cAAS,GAAT,SAAS,CAAW;QAG9B,aAAQ,GAA6C,EAAE,CAAC;IAF7D,CAAC;IAQJ,KAAK,CAAC,cAAc,CACnB,OAAuB,EACvB,QAA0B;QAE1B,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;QAElC,IAAI,IAAI,GAAG,IAAA,2BAAmB,EAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEpD,OAAO,CAAC,MAAM,GAAG,EAA8B,CAAC;QAEhD,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAE5D,IAAI,CAAC,OAAO,EAAE,CAAC;YAId,MAAM,CAAC,SAAS,EAAE,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAEjD,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,CAAC;YAEjF,IAAI,CAAC,OAAO;gBACX,MAAM,IAAI,8CAAoB,CAAC;oBAC9B,IAAI;oBACJ,UAAU;oBACV,cAAc,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;iBAClD,CAAC,CAAC;YAEJ,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAEpB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;gBAC1C,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC7B,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;gBACpD,CAAC;YACF,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAE9C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEvD,IAAI,CAAC,YAAY,EAAE,CAAC;YACnB,MAAM,IAAI,8CAAoB,CAAC;gBAC9B,IAAI;gBACJ,UAAU;gBACV,cAAc,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;aAClD,CAAC,CAAC;QACJ,CAAC;QAED,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,YAAY,CAAC;QAExF,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QAEjD,IAAI,WAAW,CAAC,UAAU;YAAE,QAAQ,CAAC,iBAAiB,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAE/E,MAAM,iBAAiB,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAEzD,IAAI,iBAAiB,KAAK,IAAI,EAAE,CAAC;YAChC,MAAM,IAAI,+BAAa,CAAC,yCAAyC,CAAC,CAAC;QACpE,CAAC;QAED,OAAO,MAAM,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YAClD,IAAI,CAAC;gBACJ,MAAM,aAAa,GAAG,QAAQ,CAAC;gBAC/B,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,cAAc,CACtD,QAAQ,EACR,OAAO,EACP,cAAc,EACd,iBAAiB,EACjB,aAAa,EACb,OAAO,EACP,SAAS,EACT,SAAS,EACT,OAAO,EACP,QAAQ,EACR,CAAC,KAAmB,EAAE,IAAkC,EAAE,EAAE;oBAC3D,IAAI,KAAK,KAAK,IAAI;wBAAE,MAAM,CAAC,KAAK,CAAC,CAAC;;wBAC7B,OAAO,CAAC,IAAI,CAAC,CAAC;gBACpB,CAAC,EACD,eAAe,CACf,CAAC;gBAKF,IAAI,WAAW,KAAK,SAAS;oBAAE,OAAO;gBAGtC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;oBAC3B,IAAI,CAAC,IAAI,CAAC,IAAI,CACb,qBAAqB,EACrB,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,EAChD,OAAO,CACP,CAAC;gBACH,CAAC;YACF,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;YAQV,IACC,IAAI,CAAC,oBAAoB,CAAC,uBAAuB;gBACjD,OAAO;gBACP,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAC1C,CAAC;gBACF,KAAK,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;oBAClC,OAAO,EAAE,qBAAqB;oBAC9B,OAAO,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE;iBACrD,CAAC,CAAC;gBACH,OAAO;YACR,CAAC;YAED,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YAEvB,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,GAAW;QACvB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAEnC,IAAI,OAAO;YAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,IAAY;QACnC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;QAEtD,MAAM,cAAc,GAAG,OAAO;aAC5B,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;aACnC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAwB,CAAC,CAAC;QAEzD,IAAI,CAAC,cAAc,CAAC,MAAM;YAAE,MAAM,IAAI,8CAAoB,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QAErE,OAAO,cAAc,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,IAAY,EAAE,UAA+B;QAC3E,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;QAEtD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;QAE3F,IAAI,CAAC,UAAU;YAAE,OAAO;QAExB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAE9D,IAAI,CAAC,YAAY;YAAE,OAAO;QAE1B,MAAM,EAAE,cAAc,EAAE,GAAG,YAAY,CAAC;QAExC,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QAEjD,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CACrD,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,EAAE,CACrC,UAAU,EAAE,IAAI,KAAK,IAAI;YACzB,CAAC,UAAU,EAAE,UAAU,IAAI,KAAK,CAAC,KAAK,UAAU;YAChD,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,WAAW,CAAC,CACnE,CAAC;QAEF,OAAO,WAAW,EAAE,UAAU,EAAE,OAAsC,CAAC;IACxE,CAAC;IAMD,KAAK,CAAC,YAAY,CACjB,MAAc,EACd,cAA2B,EAC3B,cAA8C,EAC9C,OAAkB,EAClB,OAAgB,EAChB,eAAwB;QAExB,IAAI,CAAC,cAAc,CAAC,EAAE;YAAE,MAAM,IAAI,kDAAsB,CAAC,cAAc,CAAC,CAAC;QAEzE,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QAEjD,MAAM,QAAQ,GAAG,cAAc,CAAC,mBAAmB,CAClD,QAAQ,EACR,cAAc,EACd,eAAe,EACf,IAAI,CACJ,CAAC;QAEF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,cAAc,KAAK,IAAI,CAAC,EAAE,CAAC;YACzE,OAAO,KAAK,CAAC;QACd,CAAC;QAED,MAAM,OAAO,GAAG,UAAU,CACzB,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC,EACjD,gCAAoB,CACpB,CAAC;QAEF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAChC,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC9C,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAE5D,IAAI,OAAO,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,EAAE,CAAC;gBACxC,OAAO,KAAK,CAAC;YACd,CAAC;YAGD,IACC,iBAAiB;gBACjB,CAAC,OAAO,CAAC,SAAS;gBAClB,CAAC,iBAAiB,CAAC,OAAO,CAAC,MAAM;gBACjC,iBAAiB,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM;gBAC3C,iBAAiB,CAAC,OAAO,CAAC,UAAU,KAAK,QAAQ,CAAC,EAAE,EACnD,CAAC;gBACF,MAAM,IAAI,oCAAqB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC/C,CAAC;YAED,OAAO,CAAC,IAAI,GAAG,IAAA,2BAAmB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACjD,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;YAMtB,MAAM,EAAE,6BAA6B,EAAE,CAAC,EAAE,GAAG,gBAAgB,EAAE,GAAG,OAAO,CAAC;YAE1E,gBAAgB,CAAC,MAAM,GAAG,MAAM,CAAC;YAEjC,MAAM,YAAY,GAA4B;gBAC7C,OAAO;gBACP,cAAc;gBACd,eAAe;gBACf,OAAO,EAAE,gBAAgC;aACzC,CAAC;YAEF,IAAI,CAAC;gBAKJ,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;gBAEhD,MAAM,QAAQ,CAAC,wBAAwB,CAAC,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;gBAE3F,gBAAgB,CAAC,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;gBAElD,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;gBAEhD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;YAC9B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;gBAExC,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBAE1B,MAAM,KAAK,CAAC;YACb,CAAC;QACF,CAAC;QAED,OAAO,IAAI,CAAC;IACb,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,UAAkB;QACrC,IAAI,YAAY,GAAG,KAAK,CAAC;QAEzB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;QAE7D,KAAK,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;YAClC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAEvD,IAAI,CAAC,YAAY;gBAAE,SAAS;YAE5B,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,YAAY,CAAC;YAEjD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YAEjD,IAAI,cAAc,CAAC,EAAE,KAAK,UAAU;gBAAE,SAAS;YAE/C,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YAEvB,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBAC3B,IAAI,CAAC;oBACJ,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,UAAU,EAAE,EAAE,OAAO,CAAC,CAAC;gBAC/D,CAAC;gBAAC,MAAM,CAAC;gBAET,CAAC;YACF,CAAC;YAED,IAAI,CAAC,YAAY,EAAE,CAAC;gBAEnB,KAAK,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YACxC,CAAC;YAED,YAAY,GAAG,IAAI,CAAC;QACrB,CAAC;QAED,OAAO,YAAY,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,UAA+B,EAAE,IAAY,EAAE,SAAkB;QACvF,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAEtE,IAAI,OAAiC,CAAC;QACtC,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QAGjD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEvD,IAAI,CAAC,YAAY;YAAE,OAAO;QAE1B,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,YAAY,CAAC;QAEjD,MAAM,cAAc,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5F,MAAM,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;QAE3F,IAAI,cAAc,IAAI,cAAc,CAAC,MAAM,GAAG,UAAU,EAAE,CAAC;YAC1D,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC;YACnC,OAAO,GAAG,cAAc,CAAC;QAC1B,CAAC;aAEI,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClD,OAAO,GAAG,cAAc,CAAC;QAC1B,CAAC;QAED,OAAO,OAAO,CAAC;IAChB,CAAC;IAKD,KAAK,CAAC,kBAAkB,CAAC,QAAkB;QAC1C,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,mBAAmB,EAAE,CAAC;QAExE,IAAI,CAAC,gBAAgB,CAAC,MAAM;YAAE,OAAO;QAIrC,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,MAAM,CAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACnF,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;YAEnC,GAAG,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YACvB,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAElC,OAAO,GAAG,CAAC;QACZ,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,MAAM,QAAQ,GAAG,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAEjD,IAAI,CAAC,QAAQ;YAAE,OAAO;QAEtB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAChC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;YAEvC,IAAI,MAAM,EAAE,CAAC;gBACZ,OAAO,CAAC,6BAA6B,GAAG,MAAM,6BAA6B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC7F,CAAC;YAED,IAAI,UAAU;gBAAE,QAAQ,CAAC,UAAU,GAAG,UAAU,CAAC;YAEjD,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QACnF,CAAC;QAED,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC;IAC1C,CAAC;IAKD,UAAU,CAAC,cAA2B;QACrC,OAAO,IAAI,uBAAQ,CAAC;YACnB,EAAE,EAAE,cAAc,CAAC,EAAE;YACrB,IAAI,EAAE,cAAc,CAAC,IAAI;YACzB,KAAK,EAAE,cAAc,CAAC,KAAK;YAC3B,WAAW,EAAE,cAAc,CAAC,WAAW;YACvC,MAAM,EAAE,KAAK;YACb,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,UAAU,EAAE,EAAE;YACd,QAAQ,EAAE,cAAc,CAAC,QAAQ;SACjC,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AAxYY,oCAAY;uBAAZ,YAAY;IADxB,IAAA,gBAAO,GAAE;qCAGe,WAAI;QACC,sBAAS;QACL,oEAA+B;QACxB,4CAAoB;QAC/B,6BAAS;GAN1B,YAAY,CAwYxB"}