npm - n8n - Versions diffs - 2.25.6 → 2.26.0 - Mend

n8n 2.25.6 → 2.26.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (641) hide show

package/dist/controllers/e2e.controller.js CHANGED Viewed

@@ -105,6 +105,7 @@ let E2EController = E2EController_1 = class E2EController {
             [constants_1.LICENSE_FEATURES.TOKEN_EXCHANGE]: false,
             [constants_1.LICENSE_FEATURES.DATA_REDACTION]: false,
             [constants_1.LICENSE_FEATURES.N8N_PACKAGES]: false,
+            [constants_1.LICENSE_FEATURES.OTEL_CUSTOM_SPAN_ATTRIBUTES]: false,
         };
         this.numericFeatures = {
             [constants_1.LICENSE_QUOTAS.TRIGGER_LIMIT]: E2EController_1.numericFeaturesDefaults[constants_1.LICENSE_QUOTAS.TRIGGER_LIMIT],
@@ -121,6 +122,7 @@ let E2EController = E2EController_1 = class E2EController {
             [constants_1.LICENSE_QUOTAS.EVALUATION_CONCURRENCY_LIMIT]: E2EController_1.numericFeaturesDefaults[constants_1.LICENSE_QUOTAS.EVALUATION_CONCURRENCY_LIMIT],
         };
         this.heapSnapshotPaths = new Map();
+        this.coverageBaseline = new Map();
         license.isLicensed = (feature) => this.enabledFeatures[feature] ?? false;
         const getFeatureValue = (feature) => {
             if (feature in this.numericFeatures) {
@@ -232,6 +234,52 @@ let E2EController = E2EController_1 = class E2EController {
         }
         return fs.createReadStream(filePath);
     }
+    async ensureCoverageSession() {
+        if (!this.coverageSession) {
+            const inspector = require('node:inspector/promises');
+            this.coverageSession = new inspector.Session();
+            this.coverageSession.connect();
+            await this.coverageSession.post('Profiler.enable');
+        }
+        return this.coverageSession;
+    }
+    static coverageKey(url, fn) {
+        return `${url}${fn.functionName}${fn.ranges[0]?.startOffset ?? 0}`;
+    }
+    static coverageCount(fn) {
+        return fn.ranges.reduce((sum, range) => sum + range.count, 0);
+    }
+    static indexCoverage(scripts) {
+        const index = new Map();
+        for (const script of scripts) {
+            for (const fn of script.functions) {
+                index.set(E2EController_1.coverageKey(script.url, fn), E2EController_1.coverageCount(fn));
+            }
+        }
+        return index;
+    }
+    static deltaCoverage(scripts, baseline) {
+        const delta = [];
+        for (const script of scripts) {
+            const functions = script.functions.filter((fn) => E2EController_1.coverageCount(fn) >
+                (baseline.get(E2EController_1.coverageKey(script.url, fn)) ?? 0));
+            if (functions.length)
+                delta.push({ ...script, functions });
+        }
+        return delta;
+    }
+    async startCoverage() {
+        const session = await this.ensureCoverageSession();
+        const { result } = await session.post('Profiler.getBestEffortCoverage');
+        this.coverageBaseline = E2EController_1.indexCoverage(result);
+        return { success: true };
+    }
+    async takeCoverage() {
+        if (!this.coverageSession)
+            return { success: false, result: [] };
+        const { result } = await this.coverageSession.post('Profiler.getBestEffortCoverage');
+        return { success: true, result: E2EController_1.deltaCoverage(result, this.coverageBaseline) };
+    }
     getMemoryMaps() {
         const fs = require('node:fs');
         const memUsage = process.memoryUsage();
@@ -476,6 +524,18 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
 ], E2EController.prototype, "downloadHeapSnapshot", null);
+__decorate([
+    (0, decorators_1.Post)('/coverage/start', { skipAuth: true }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], E2EController.prototype, "startCoverage", null);
+__decorate([
+    (0, decorators_1.Post)('/coverage/take', { skipAuth: true }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], E2EController.prototype, "takeCoverage", null);
 __decorate([
     (0, decorators_1.Get)('/memory-maps', { skipAuth: true }),
     __metadata("design:type", Function),

package/dist/controllers/e2e.controller.js.map CHANGED Viewed

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

package/dist/controllers/oauth/oauth1-credential.controller.js CHANGED Viewed

@@ -8,14 +8,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuth1CredentialController = void 0;
 const backend_common_1 = require("@n8n/backend-common");
 const decorators_1 = require("@n8n/decorators");
-const axios_1 = __importDefault(require("axios"));
 const n8n_workflow_1 = require("n8n-workflow");
 const event_service_1 = require("../../events/event.service");
 const oauth_service_1 = require("../../oauth/oauth.service");
@@ -41,12 +37,14 @@ let OAuth1CredentialController = class OAuth1CredentialController {
             if (!oauth_verifier || !oauth_token || !encodedState) {
                 return this.oauthService.renderCallbackError(res, 'Insufficient parameters for OAuth1 callback.', `Received following query parameters: ${JSON.stringify(req.query)}`);
             }
-            const [credential, _, oauthCredentials, state] = await this.oauthService.resolveCredential(req);
-            const oauthToken = await axios_1.default.post(oauthCredentials.accessTokenUrl, { oauth_token, oauth_verifier }, { headers: { 'content-type': 'application/x-www-form-urlencoded' } });
-            const paramParser = new URLSearchParams(oauthToken.data);
-            const oauthTokenData = Object.fromEntries(paramParser.entries());
+            const [credential, , oauthCredentials, state, flowState] = await this.oauthService.resolveCredential(req);
+            const oauthTokenData = await this.oauthService.getOAuth1AccessToken(oauthCredentials, {
+                oauthToken: oauth_token,
+                oauthVerifier: oauth_verifier,
+                oauthTokenSecret: flowState.oauthTokenSecret ?? '',
+            });
             if (!state.origin || state.origin === 'static-credential') {
-                await this.oauthService.encryptAndSaveData(credential, { oauthTokenData }, ['csrfSecret']);
+                await this.oauthService.encryptAndSaveData(credential, { oauthTokenData });
                 this.logger.debug('OAuth1 callback successful for new credential', {
                     credentialId: credential.id,
                 });

package/dist/controllers/oauth/oauth1-credential.controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"oauth1-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth1-credential.controller.ts"],"names":[],"mappings":"~~;;;;;;;;;;;;;;;~~AAAA,wDAA6C;AAC7C,gDAAsD;~~AACtD,kDAA0B;AAE1B~~,+CAA0D;AAE1D,0DAAsD;AAGtD,yDAAgF;AAGzE,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IACtC,YACkB,YAA0B,EAC1B,MAAc,EACd,YAA0B;QAF1B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,WAAM,GAAN,MAAM,CAAQ;QACd,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAIE,AAAN,KAAK,CAAC,UAAU,CAAC,GAAuC,EAAE,GAAa;QACtE,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC7E,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAE3F,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oDAAoD,EAAE;YACvE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACnB,YAAY,EAAE,UAAU,CAAC,EAAE;SAC3B,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC;IACZ,CAAC;IAIK,AAAN,KAAK,CAAC,cAAc,CAAC,GAA2C,EAAE,GAAa;QAC9E,IAAI,CAAC;YACJ,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;YAEvE,IAAI,CAAC,cAAc,IAAI,CAAC,WAAW,IAAI,CAAC,YAAY,EAAE,CAAC;gBACtD,OAAO,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAC3C,GAAG,EACH,8CAA8C,EAC9C,wCAAwC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CACnE,CAAC;YACH,CAAC;YAED,MAAM,CAAC,UAAU,EAAE,~~CAAC~~,~~EAAE~~,gBAAgB,EAAE,KAAK,CAAC,~~GAC7C~~,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAuB,GAAG,CAAC,CAAC;~~YAGtE~~,MAAM,~~UAAU~~,GAAG,MAAM,~~eAAK~~,CAAC,~~IAAI~~,~~CAClC~~,~~gBAAgB~~,CAAC,~~cAAc~~,~~EAC/B,~~EAAE,~~WAAW~~,EAAE,~~cAAc~~,~~EAAE~~,~~EAC/B,~~EAAE,~~OAAO,EAAE,EAAE,~~cAAc,~~EAAE~~,~~mCAAmC,~~EAAE,~~EAAE~~,~~CACpE,~~CAAC~~;YAIF~~,~~MAAM~~,~~WAAW,GAAG,~~IAAI,~~eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC~~;~~YAEzD~~,~~MAAM,cAAc,GAAG,MAAM,~~CAAC,~~WAAW,~~CAAC~~,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC~~;~~YAEjE~~,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,KAAK,mBAAmB,EAAE,CAAC;gBAC3D,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,UAAU,EAAE,EAAE,cAAc,EAAE,~~EAAE,~~CAAC,~~YAAY,~~CAAC~~,CAAC,CAAC~~;~~gBAE3F~~,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,EAAE;oBAClE,YAAY,EAAE,UAAU,CAAC,EAAE;iBAC3B,CAAC,CAAC;gBACH,OAAO,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;YACrC,CAAC;YAED,IAAI,KAAK,CAAC,MAAM,KAAK,oBAAoB,EAAE,CAAC;gBAC3C,IAAI,CAAC,KAAK,CAAC,oBAAoB,IAAI,OAAO,KAAK,CAAC,oBAAoB,KAAK,QAAQ,EAAE,CAAC;oBACnF,OAAO,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,GAAG,EAAE,oCAAoC,CAAC,CAAC;gBACzF,CAAC;gBAED,IACC,CAAC,KAAK,CAAC,mBAAmB;oBAC1B,OAAO,KAAK,CAAC,mBAAmB,KAAK,QAAQ;oBAC7C,CAAC,KAAK,CAAC,mBAAmB,CAAC,UAAU,CAAC,SAAS,CAAC,EAC/C,CAAC;oBACF,OAAO,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,GAAG,EAAE,kCAAkC,CAAC,CAAC;gBACvF,CAAC;gBAED,MAAM,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAC5C,UAAU,EACV,cAAc,EACd,KAAK,CAAC,mBAAmB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAC7C,KAAK,CAAC,oBAAoB,EACzB,KAAK,CAAC,YAAwC,IAAI,EAAE,CACrD,CAAC;gBAEF,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;oBACtC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,mCAAmC,EAAE;wBAC3D,IAAI,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE;wBAC1B,cAAc,EAAE,UAAU,CAAC,IAAI;wBAC/B,YAAY,EAAE,UAAU,CAAC,EAAE;qBAC3B,CAAC,CAAC;gBACJ,CAAC;gBAED,OAAO,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;YACrC,CAAC;QACF,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,MAAM,KAAK,GAAG,IAAA,0BAAW,EAAC,CAAC,CAAC,CAAC;YAC7B,OAAO,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAC3C,GAAG,EACH,KAAK,CAAC,OAAO,EACb,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,IAAA,4BAAa,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CACvD,CAAC;QACH,CAAC;IACF,CAAC;CACD,CAAA;~~AArGY~~,gEAA0B;AAShC;IADL,IAAA,gBAAG,EAAC,OAAO,CAAC;;;;4DAYZ;AAIK;IADL,IAAA,gBAAG,EAAC,WAAW,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC;;;;~~gEA6ErE~~;~~qCApGW~~,0BAA0B;IADtC,IAAA,2BAAc,EAAC,oBAAoB,CAAC;qCAGJ,4BAAY;QAClB,uBAAM;QACA,4BAAY;GAJhC,0BAA0B,~~CAqGtC~~"}
1	+ {"version":3,"file":"oauth1-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth1-credential.controller.ts"],"names":[],"mappings":"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"}

package/dist/controllers/oauth/oauth2-credential.controller.js CHANGED Viewed

@@ -43,13 +43,13 @@ let OAuth2CredentialController = class OAuth2CredentialController {
             if (!code || !encodedState) {
                 return this.oauthService.renderCallbackError(res, 'Insufficient parameters for OAuth2 callback.', `Received following query parameters: ${JSON.stringify(req.query)}`);
             }
-            const [credential, decryptedDataOriginal, oauthCredentials, state] = await this.oauthService.resolveCredential(req);
+            const [credential, decryptedDataOriginal, oauthCredentials, state, flowState] = await this.oauthService.resolveCredential(req);
             const oAuthOptions = this.convertCredentialToOptions(oauthCredentials);
             const isPkce = oauthCredentials.grantType === 'pkce';
             const isBodyAuth = oauthCredentials.authentication === 'body';
             const body = { ...(oAuthOptions.body ?? {}) };
             if (isPkce) {
-                body.code_verifier = decryptedDataOriginal.codeVerifier;
+                body.code_verifier = flowState.codeVerifier;
             }
             if (isBodyAuth) {
                 body.client_id = oAuthOptions.clientId;
@@ -79,7 +79,7 @@ let OAuth2CredentialController = class OAuth2CredentialController {
                 ...tokenResponse,
             };
             if (!state.origin || state.origin === 'static-credential') {
-                await this.oauthService.encryptAndSaveData(credential, { oauthTokenData }, ['csrfSecret']);
+                await this.oauthService.encryptAndSaveData(credential, { oauthTokenData });
                 this.logger.debug('OAuth2 callback successful for credential', {
                     credentialId: credential.id,
                 });

package/dist/controllers/oauth/oauth2-credential.controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"oauth2-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth2-credential.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA6C;AAE7C,sDAAkD;AAClD,gDAAsD;AAEtD,uDAA+B;AAC/B,qDAA6B;AAC7B,yDAAiC;AAEjC,+CAAqE;AAErE,0DAAsD;AACtD,qDAAiD;AACjD,6EAAuE;AACvE,yDAAmE;AAI5D,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IACtC,YACkB,YAA0B,EAC1B,MAAc,EACd,aAA4B,EAC5B,oBAA0C,EAC1C,YAA0B;QAJ1B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAe;QAC5B,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAIE,AAAN,KAAK,CAAC,UAAU,CAAC,GAAuC,EAAE,GAAa;QACtE,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC7E,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACvF,CAAC;IAIK,AAAN,KAAK,CAAC,cAAc,CAAC,GAA2C,EAAE,GAAa;QAC9E,IAAI,CAAC;YACJ,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;YAChD,IAAI,CAAC,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBAC5B,OAAO,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAC3C,GAAG,EACH,8CAA8C,EAC9C,wCAAwC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CACnE,CAAC;YACH,CAAC;YAED,MAAM,CAAC,UAAU,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,KAAK,CAAC,~~GACjE~~,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAuB,GAAG,CAAC,CAAC;YAEtE,MAAM,YAAY,GAAG,IAAI,CAAC,0BAA0B,CAAC,gBAAgB,CAAC,CAAC;YAEvE,MAAM,MAAM,GAAG,gBAAgB,CAAC,SAAS,KAAK,MAAM,CAAC;YACrD,MAAM,UAAU,GAAG,gBAAgB,CAAC,cAAc,KAAK,MAAM,CAAC;YAE9D,MAAM,IAAI,GAA2B,EAAE,GAAG,CAAC,YAAY,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,CAAC;YAEtE,IAAI,MAAM,EAAE,CAAC;gBACZ,IAAI,CAAC,aAAa,GAAG,~~qBAAqB~~,CAAC,YAAsB,CAAC;~~YACnE~~,CAAC;YAED,IAAI,UAAU,EAAE,CAAC;gBAChB,IAAI,CAAC,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC;gBACvC,IAAI,YAAY,CAAC,YAAY,EAAE,CAAC;oBAC/B,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC,YAAY,CAAC;gBAChD,CAAC;gBAGD,OAAO,YAAY,CAAC,YAAY,CAAC;YAClC,CAAC;YAED,IAAI,OAAO,GAAiC,EAAE,CAAC;YAC/C,IAAI,MAAM,IAAI,UAAU,EAAE,CAAC;gBAC1B,OAAO,GAAG,EAAE,IAAI,EAAE,CAAC;YACpB,CAAC;YAED,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;YAEhE,MAAM,QAAQ,GAAG,IAAI,4BAAY,CAAC,YAAY,CAAC,CAAC;YAEhD,MAAM,eAAe,GAAG,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAEzE,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAC9C,GAAG,YAAY,CAAC,WAAqB,IAAI,eAAe,EAAE,EAC1D,OAAO,CACP,CAAC;YAEF,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvC,IAAA,aAAG,EAAC,UAAU,CAAC,IAAI,EAAE,qBAAqB,EAAE,IAAA,cAAI,EAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;YAC/E,CAAC;YAED,MAAM,gBAAgB,GAAG,UAAU,CAAC,IAA8B,CAAC;YACnE,MAAM,aAAa,GAClB,gBAAgB,CAAC,UAAU,KAAK,IAAI;gBACnC,CAAC,CAAC,MAAM,IAAI,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,gBAAgB,CAAC;gBAC1E,CAAC,CAAC,gBAAgB,CAAC;YAIrB,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,qBAAqB,CAAC;YAC5D,MAAM,cAAc,GAAmC;gBACtD,GAAG,CAAC,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnD,GAAG,aAAa;aACkB,CAAC;YAEpC,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,KAAK,mBAAmB,EAAE,CAAC;gBAC3D,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,UAAU,EAAE,EAAE,cAAc,EAAE,~~EAAE,~~CAAC,~~YAAY,~~CAAC~~,CAAC,CAAC~~;~~gBAE3F~~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"}
1	+ {"version":3,"file":"oauth2-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth2-credential.controller.ts"],"names":[],"mappings":"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"}

package/dist/controllers/project.controller.d.ts CHANGED Viewed

@@ -74,7 +74,7 @@ export declare class ProjectController {
         setUpdateDate(): void;
     }>;
     getProject(req: AuthenticatedRequest, _res: Response, projectId: string): Promise<ProjectRequest.ProjectWithRelations>;
-    updateProject(_req: AuthenticatedRequest, _res: Response, payload: UpdateProjectDto, projectId: string): Promise<void>;
+    updateProject(req: AuthenticatedRequest, _res: Response, payload: UpdateProjectDto, projectId: string): Promise<void>;
     addProjectUsers(req: AuthenticatedRequest, res: Response, projectId: string, payload: AddUsersToProjectDto): Promise<Response<any, Record<string, any>>>;
     changeProjectUserRole(req: AuthenticatedRequest, res: Response, projectId: string, userId: string, body: ChangeUserRoleInProject): Promise<Response<any, Record<string, any>>>;
     deleteProjectUser(req: AuthenticatedRequest, res: Response, projectId: string, userId: string): Promise<Response<any, Record<string, any>>>;

package/dist/controllers/project.controller.js CHANGED Viewed

@@ -157,8 +157,16 @@ let ProjectController = class ProjectController {
             ],
         };
     }
-    async updateProject(_req, _res, payload, projectId) {
+    async updateProject(req, _res, payload, projectId) {
         await this.projectsService.updateProject(projectId, payload);
+        this.eventService.emit('team-project-updated', {
+            userId: req.user.id,
+            role: req.user.role.slug,
+            projectId,
+            ...(payload.customTelemetryTags !== undefined
+                ? { otelProjectCustomTagsCount: payload.customTelemetryTags.length }
+                : {}),
+        });
     }
     async addProjectUsers(req, res, projectId, payload) {
         try {

package/dist/controllers/project.controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"project.controller.js","sourceRoot":"","sources":["../../src/controllers/project.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAOwB;AACxB,gCAAkE;AAClE,gDAYyB;AACzB,kDAAyF;AAGzF,0CAAuC;AAGvC,kFAA6E;AAC7E,8EAA0E;AAC1E,8EAAyE;AACzE,0DAAsD;AACtD,+FAAwF;AAExF,sEAIuC;AACvC,mDAA+D;AAGxD,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC7B,YACkB,eAA+B,EAC/B,iBAAoC,EACpC,YAA0B,EAC1B,oBAA0C,EAC1C,mBAAwC;QAJxC,oBAAe,GAAf,eAAe,CAAgB;QAC/B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,wBAAmB,GAAnB,mBAAmB,CAAqB;IACvD,CAAC;IAGE,AAAN,KAAK,CAAC,cAAc,CACnB,GAAyB,EACzB,GAAa,EACN,OAA6B;QAEpC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,6BAA6B,CAC7E,GAAG,CAAC,IAAI,EACR,OAAO,CACP,CAAC;QAKF,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC9D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC1E,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC5C,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAGK,AAAN,KAAK,CAAC,gBAAgB;QACrB,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC;IACtD,CAAC;IASK,AAAN,KAAK,CAAC,oBAAoB,CACzB,GAAyB,EACzB,GAAa,EACN,OAA6B;QAEpC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,4BAA4B,CAC5E,GAAG,CAAC,IAAI,EACR,OAAO,CACP,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC1E,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC5C,CAAC;IAMK,AAAN,KAAK,CAAC,aAAa,CAAC,GAAyB,EAAE,IAAc,EAAQ,OAAyB;QAC7F,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAEhF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,sBAAsB,EAAE;gBAC9C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;gBACnB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;gBACxB,SAAS,EAAE,OAAO,CAAC,SAAS;aAC5B,CAAC,CAAC;YAEH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,mCAAmC,CAC9E,GAAG,CAAC,IAAI,CAAC,EAAE,EACX,OAAO,CAAC,EAAE,CACV,CAAC;YAEF,OAAO;gBACN,GAAG,OAAO;gBACV,IAAI,EAAE,eAAe;gBACrB,MAAM,EAAE;oBACP,GAAG,IAAA,2BAAa,EAAC;wBAChB,MAAM,EAAE,IAAA,oCAAsB,EAAC,GAAG,CAAC,IAAI,CAAC;wBACxC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE;qBAC/D,CAAC;iBACF;aACD,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAI,CAAC,YAAY,8CAAyB,EAAE,CAAC;gBAC5C,MAAM,IAAI,mCAAe,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACtC,CAAC;YACD,MAAM,CAAC,CAAC;QACT,CAAC;IACF,CAAC;IAGK,AAAN,KAAK,CAAC,aAAa,CAClB,GAAyB,EACzB,IAAc;QAEd,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClF,MAAM,gBAAgB,GAAG,IAAA,4BAAc,EAAC,GAAG,CAAC,IAAI,EAAE,cAAc,CAAC;YAChE,CAAC,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;gBACpC,IAAI,EAAE,MAAM;gBACZ,EAAE,EAAE,IAAA,aAAG,EAAC,IAAA,YAAE,EAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;aAChD,CAAC;YACH,CAAC,CAAC,EAAE,CAAC;QAEN,MAAM,OAAO,GAAyC,EAAE,CAAC;QAEzD,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;YAC5B,MAAM,MAAM,GAAiD,MAAM,CAAC,MAAM,CACzE,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,EACzC,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAClC,CAAC;YAEF,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBACnB,MAAM,CAAC,MAAM,CAAC,IAAI,CACjB,GAAG,IAAA,2BAAa,EAAC;oBAChB,MAAM,EAAE,IAAA,oCAAsB,EAAC,GAAG,CAAC,IAAI,CAAC;oBACxC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;iBAClD,CAAC,CACF,CAAC;YACH,CAAC;YAED,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;QAED,KAAK,MAAM,OAAO,IAAI,gBAAgB,EAAE,CAAC;YACxC,MAAM,MAAM,GAAiD,MAAM,CAAC,MAAM,CACzE,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAC,EACtC;gBAIC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;gBACxB,MAAM,EAAE,EAAE;aACV,CACD,CAAC;YAEF,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBACnB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,2BAAa,EAAC,EAAE,MAAM,EAAE,IAAA,oCAAsB,EAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YACpF,CAAC;YAED,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;QAGD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC9B,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBACnB,MAAM,CAAC,MAAM,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACpD,CAAC;QACF,CAAC;QAED,OAAO,OAAO,CAAC;IAChB,CAAC;IAGK,AAAN,KAAK,CAAC,kBAAkB,CAAC,GAAyB;QACjD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACxE,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,MAAM,IAAI,+BAAa,CAAC,iDAAiD,CAAC,CAAC;QAC5E,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,mCAAmC,CAC9E,GAAG,CAAC,IAAI,CAAC,EAAE,EACX,OAAO,CAAC,EAAE,CACV,CAAC;QACF,MAAM,MAAM,GAAY;YACvB,GAAG,IAAA,2BAAa,EAAC;gBAChB,MAAM,EAAE,IAAA,oCAAsB,EAAC,GAAG,CAAC,IAAI,CAAC;gBACxC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE;aAC/D,CAAC;SACF,CAAC;QACF,OAAO;YACN,GAAG,OAAO;YACV,MAAM;SACN,CAAC;IACH,CAAC;IAIK,AAAN,KAAK,CAAC,UAAU,CACf,GAAyB,EACzB,IAAc,EACM,SAAiB;QAErC,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,mBAAmB,EAAE,EAAE,SAAS,CAAC,GAC5E,MAAM,OAAO,CAAC,GAAG,CAAC;YACjB,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,SAAS,CAAC;YAC1C,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,SAAS,CAAC;SACnD,CAAC,CAAC;QACJ,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEnE,OAAO;YACN,EAAE;YACF,IAAI;YACJ,IAAI;YACJ,IAAI;YACJ,WAAW;YACX,mBAAmB;YACnB,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAChC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE;gBACb,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK;gBACnB,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS;gBAC3B,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ;gBACzB,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI;aACjB,CAAC,CAAC;YACH,MAAM,EAAE;gBACP,GAAG,IAAA,2BAAa,EAAC;oBAChB,MAAM,EAAE,IAAA,oCAAsB,EAAC,GAAG,CAAC,IAAI,CAAC;oBACxC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACrF,CAAC;aACF;SACD,CAAC;IACH,CAAC;IAIK,AAAN,KAAK,CAAC,aAAa,CAClB,IAA0B,EAC1B,IAAc,EACR,OAAyB,EACX,SAAiB;QAErC,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;IAIK,AAAN,KAAK,CAAC,eAAe,CACpB,GAAyB,EACzB,GAAa,EACO,SAAiB,EAC/B,OAA6B;QAEnC,IAAI,CAAC;YACJ,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,GAClC,MAAM,IAAI,CAAC,eAAe,CAAC,6BAA6B,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;YAExF,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,MAAM,IAAI,CAAC,oBAAoB,CAAC,mBAAmB,CAAC;oBACnD,MAAM,EAAE,GAAG,CAAC,IAAI;oBAChB,UAAU,EAAE,KAAK;oBACjB,OAAO,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;iBAC/C,CAAC,CAAC;YACJ,CAAC;YAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;YAC5E,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,sBAAsB,EAAE;gBAC9C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;gBACnB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;gBACxB,OAAO,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBACxE,SAAS;aACT,CAAC,CAAC;YAKH,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,OAAO,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAC5F,CAAC;YACD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;gBAAE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;YACrE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAC/B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAI,CAAC,YAAY,+CAA0B,EAAE,CAAC;gBAC7C,MAAM,IAAI,mCAAe,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACtC,CAAC;YACD,MAAM,CAAC,CAAC;QACT,CAAC;IACF,CAAC;IAIK,AAAN,KAAK,CAAC,qBAAqB,CAC1B,GAAyB,EACzB,GAAa,EACO,SAAiB,EACpB,MAAc,EACzB,IAA6B;QAEnC,IAAI,MAAM,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,EAAE,EAAE,CAAC;YAC3D,MAAM,IAAI,gCAAc,CACvB,wEAAwE,CACxE,CAAC;QACH,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACjF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;YAC5E,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,sBAAsB,EAAE;gBAC9C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;gBACnB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;gBACxB,OAAO,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBACxE,SAAS;aACT,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAC/B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAI,CAAC,YAAY,+CAA0B,EAAE,CAAC;gBAC7C,MAAM,IAAI,mCAAe,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACtC,CAAC;YACD,MAAM,CAAC,CAAC;QACT,CAAC;IACF,CAAC;IAIK,AAAN,KAAK,CAAC,iBAAiB,CACtB,GAAyB,EACzB,GAAa,EACO,SAAiB,EACpB,MAAc;QAE/B,MAAM,IAAI,CAAC,eAAe,CAAC,qBAAqB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACpE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;QAC5E,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAC9C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACnB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;YACxB,OAAO,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,SAAS;SACT,CAAC,CAAC;QACH,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IAC/B,CAAC;IAIK,AAAN,KAAK,CAAC,aAAa,CAClB,GAAyB,EACzB,IAAc,EACP,KAAuB,EACV,SAAiB;QAErC,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE;YAC7D,gBAAgB,EAAE,KAAK,CAAC,UAAU;SAClC,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAC9C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACnB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;YACxB,SAAS;YACT,WAAW,EAAE,KAAK,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ;YACnE,eAAe,EAAE,KAAK,CAAC,UAAU;SACjC,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AArVY,8CAAiB;AAUvB;IADL,IAAA,gBAAG,EAAC,GAAG,CAAC;IAIP,WAAA,kBAAK,CAAA;;qDAAU,gCAAoB;;uDAepC;AAGK;IADL,IAAA,gBAAG,EAAC,QAAQ,CAAC;;;;yDAGb;AASK;IAFL,IAAA,gBAAG,EAAC,qBAAqB,CAAC;IAC1B,IAAA,wBAAW,EAAC,WAAW,CAAC;IAIvB,WAAA,kBAAK,CAAA;;qDAAU,gCAAoB;;6DAQpC;AAMK;IAJL,IAAA,iBAAI,EAAC,GAAG,CAAC;IACT,IAAA,wBAAW,EAAC,gBAAgB,CAAC;IAE7B,IAAA,qBAAQ,EAAC,wBAAwB,CAAC;IAC6B,WAAA,iBAAI,CAAA;;qDAAU,4BAAgB;;sDA+B7F;AAGK;IADL,IAAA,gBAAG,EAAC,cAAc,CAAC;;;;sDA4DnB;AAGK;IADL,IAAA,gBAAG,EAAC,WAAW,CAAC;;;;2DAqBhB;AAIK;IAFL,IAAA,gBAAG,EAAC,aAAa,CAAC;IAClB,IAAA,yBAAY,EAAC,cAAc,CAAC;IAI3B,WAAA,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAA;;;;mDA8BnB;AAIK;IAFL,IAAA,kBAAK,EAAC,aAAa,CAAC;IACpB,IAAA,yBAAY,EAAC,gBAAgB,CAAC;IAI7B,WAAA,iBAAI,CAAA;IACJ,WAAA,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAA;;qDADJ,4BAAgB;;sDAI/B;AAIK;IAFL,IAAA,iBAAI,EAAC,mBAAmB,CAAC;IACzB,IAAA,yBAAY,EAAC,gBAAgB,CAAC;IAI7B,WAAA,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAA;IAClB,WAAA,iBAAI,CAAA;;6DAAU,gCAAoB;;wDAoCnC;AAIK;IAFL,IAAA,kBAAK,EAAC,2BAA2B,CAAC;IAClC,IAAA,yBAAY,EAAC,gBAAgB,CAAC;IAI7B,WAAA,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAA;IAClB,WAAA,IAAA,kBAAK,EAAC,QAAQ,CAAC,CAAA;IACf,WAAA,iBAAI,CAAA;;qEAAO,mCAAuB;;8DAwBnC;AAIK;IAFL,IAAA,mBAAM,EAAC,2BAA2B,CAAC;IACnC,IAAA,yBAAY,EAAC,gBAAgB,CAAC;IAI7B,WAAA,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAA;IAClB,WAAA,IAAA,kBAAK,EAAC,QAAQ,CAAC,CAAA;;;;0DAWhB;AAIK;IAFL,IAAA,mBAAM,EAAC,aAAa,CAAC;IACrB,IAAA,yBAAY,EAAC,gBAAgB,CAAC;IAI7B,WAAA,kBAAK,CAAA;IACL,WAAA,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAA;;qDADL,4BAAgB;;sDAc9B;4BApVW,iBAAiB;IAD7B,IAAA,2BAAc,EAAC,WAAW,CAAC;qCAGQ,mCAAc;QACZ,sBAAiB;QACtB,4BAAY;QACJ,4BAAoB;QACrB,6CAAmB;GAN9C,iBAAiB,CAqV7B"}
1	+ {"version":3,"file":"project.controller.js","sourceRoot":"","sources":["../../src/controllers/project.controller.ts"],"names":[],"mappings":"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"}

package/dist/controllers/security-settings.controller.d.ts CHANGED Viewed

@@ -13,7 +13,7 @@ export declare class SecuritySettingsController {
     constructor(securitySettingsService: SecuritySettingsService, eventService: EventService, instanceSettingsLoaderConfig: InstanceSettingsLoaderConfig, instanceRedactionEnforcementService: InstanceRedactionEnforcementService);
     getSecuritySettings(_req: AuthenticatedRequest, _res: Response): Promise<{
         redactionEnforcement?: {
-            floor: "off" | "production" | "all";
+            floor: "off" | "all" | "production";
         } | undefined;
         publishedPersonalWorkflowsCount: number;
         sharedPersonalWorkflowsCount: number;

package/dist/controllers/security-settings.controller.js CHANGED Viewed

@@ -22,7 +22,6 @@ const event_service_1 = require("../events/event.service");
 const instance_redaction_enforcement_service_1 = require("../modules/redaction/instance-redaction-enforcement.service");
 const redaction_enforcement_feature_flag_1 = require("../modules/redaction/redaction-enforcement.feature-flag");
 const security_settings_service_1 = require("../services/security-settings.service");
-const redaction_enforcement_mapper_1 = require("./redaction-enforcement-mapper");
 let SecuritySettingsController = class SecuritySettingsController {
     constructor(securitySettingsService, eventService, instanceSettingsLoaderConfig, instanceRedactionEnforcementService) {
         this.securitySettingsService = securitySettingsService;
@@ -41,9 +40,7 @@ let SecuritySettingsController = class SecuritySettingsController {
                 ? this.instanceRedactionEnforcementService.get()
                 : Promise.resolve(undefined),
         ]);
-        const redactionEnforcement = redactionSettings
-            ? { floor: (0, redaction_enforcement_mapper_1.settingsToFloor)(redactionSettings) }
-            : undefined;
+        const redactionEnforcement = redactionSettings ? { floor: redactionSettings } : undefined;
         return {
             ...settings,
             publishedPersonalWorkflowsCount,
@@ -61,20 +58,24 @@ let SecuritySettingsController = class SecuritySettingsController {
         if (dto.personalSpacePublishing !== undefined) {
             await this.securitySettingsService.setPersonalSpaceSetting(permissions_1.PERSONAL_SPACE_PUBLISHING_SETTING, dto.personalSpacePublishing);
             updatedSettings.personalSpacePublishing = dto.personalSpacePublishing;
-            this.emitInstancePolicyUpdated(req, 'workflow_publishing', dto.personalSpacePublishing);
+            this.emitInstancePolicyUpdated(req, {
+                settingName: 'workflow_publishing',
+                value: dto.personalSpacePublishing,
+            });
         }
         if (dto.personalSpaceSharing !== undefined) {
             await this.securitySettingsService.setPersonalSpaceSetting(permissions_1.PERSONAL_SPACE_SHARING_SETTING, dto.personalSpaceSharing);
             updatedSettings.personalSpaceSharing = dto.personalSpaceSharing;
-            this.emitInstancePolicyUpdated(req, 'workflow_sharing', dto.personalSpaceSharing);
+            this.emitInstancePolicyUpdated(req, {
+                settingName: 'workflow_sharing',
+                value: dto.personalSpaceSharing,
+            });
         }
         if (dto.redactionEnforcement !== undefined && (0, redaction_enforcement_feature_flag_1.isRedactionEnforcementEnabled)()) {
             const before = await this.instanceRedactionEnforcementService.get();
-            const after = (0, redaction_enforcement_mapper_1.floorToSettings)(dto.redactionEnforcement.floor);
-            updatedSettings.redactionEnforcement = { floor: dto.redactionEnforcement.floor };
-            if (before.enforced !== after.enforced ||
-                before.manual !== after.manual ||
-                before.production !== after.production) {
+            const after = dto.redactionEnforcement.floor;
+            updatedSettings.redactionEnforcement = { floor: after };
+            if (before !== after) {
                 await this.instanceRedactionEnforcementService.set(after);
                 this.eventService.emit('redaction-enforcement-updated', {
                     user: {
@@ -87,11 +88,15 @@ let SecuritySettingsController = class SecuritySettingsController {
                     before,
                     after,
                 });
+                this.emitInstancePolicyUpdated(req, {
+                    settingName: 'data_redaction_enforcement_floor',
+                    value: after,
+                });
             }
         }
         return updatedSettings;
     }
-    emitInstancePolicyUpdated(req, settingName, value) {
+    emitInstancePolicyUpdated(req, update) {
         this.eventService.emit('instance-policies-updated', {
             user: {
                 id: req.user.id,
@@ -100,8 +105,7 @@ let SecuritySettingsController = class SecuritySettingsController {
                 lastName: req.user.lastName,
                 role: req.user.role,
             },
-            settingName,
-            value,
+            ...update,
         });
     }
 };

package/dist/controllers/security-settings.controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"security-settings.controller.js","sourceRoot":"","sources":["../../src/controllers/security-settings.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAA2D;AAC3D,wCAA2D;AAE3D,gDAAyF;AACzF,kDAG0B;~~AAG1B~~,8EAA0E;AAC1E,0DAAsD;~~AACtD~~,uHAAiH;AACjH,+GAAuG;AACvG,oFAA+E;~~AAE/E~~,~~iFAAkF;AAG3E,~~IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IACtC,YACkB,uBAAgD,EAChD,YAA0B,EAC1B,4BAA0D,EAC1D,mCAAwE;QAHxE,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,iBAAY,GAAZ,YAAY,CAAc;QAC1B,iCAA4B,GAA5B,4BAA4B,CAA8B;QAC1D,wCAAmC,GAAnC,mCAAmC,CAAqC;IACvF,CAAC;IAKE,AAAN,KAAK,CAAC,mBAAmB,CAAC,IAA0B,EAAE,IAAc;QACnE,MAAM,2BAA2B,GAAG,IAAA,kEAA6B,GAAE,CAAC;QAEpE,MAAM,CACL,QAAQ,EACR,+BAA+B,EAC/B,4BAA4B,EAC5B,8BAA8B,EAC9B,iBAAiB,EACjB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACrB,IAAI,CAAC,uBAAuB,CAAC,+BAA+B,EAAE;YAC9D,IAAI,CAAC,uBAAuB,CAAC,kCAAkC,EAAE;YACjE,IAAI,CAAC,uBAAuB,CAAC,+BAA+B,EAAE;YAC9D,IAAI,CAAC,uBAAuB,CAAC,iCAAiC,EAAE;YAChE,2BAA2B;gBAC1B,CAAC,CAAC,IAAI,CAAC,mCAAmC,CAAC,GAAG,EAAE;gBAChD,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC;SAC7B,CAAC,CAAC;~~QAIH~~,MAAM,oBAAoB,GAAG,iBAAiB~~;YAC7C~~,CAAC,CAAC,EAAE,KAAK,EAAE,~~IAAA,8CAAe,EAAC,~~iBAAiB,~~CAAC,~~EAAE~~;YAC/C~~,CAAC,CAAC,SAAS,CAAC;~~QAEb~~,OAAO;YACN,GAAG,QAAQ;YACX,+BAA+B;YAC/B,4BAA4B;YAC5B,8BAA8B;YAC9B,YAAY,EAAE,IAAI,CAAC,4BAA4B,CAAC,0BAA0B;YAC1E,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,oBAAoB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzD,CAAC;IACH,CAAC;IAKK,AAAN,KAAK,CAAC,sBAAsB,CAC3B,GAAyB,EACzB,IAAc,EACR,GAA8B;QAEpC,IAAI,IAAI,CAAC,4BAA4B,CAAC,0BAA0B,EAAE,CAAC;YAClE,MAAM,IAAI,gCAAc,CACvB,gGAAgG,CAChG,CAAC;QACH,CAAC;QAED,MAAM,eAAe,GAAuC,EAAE,CAAC;QAC/D,IAAI,GAAG,CAAC,uBAAuB,KAAK,SAAS,EAAE,CAAC;YAC/C,MAAM,IAAI,CAAC,uBAAuB,CAAC,uBAAuB,CACzD,+CAAiC,EACjC,GAAG,CAAC,uBAAuB,CAC3B,CAAC;YACF,eAAe,CAAC,uBAAuB,GAAG,GAAG,CAAC,uBAAuB,CAAC;YACtE,IAAI,CAAC,yBAAyB,CAAC,GAAG,EAAE,qBAAqB,EAAE,GAAG,CAAC,uBAAuB,CAAC,CAAC;~~QACzF~~,CAAC;QACD,IAAI,GAAG,CAAC,oBAAoB,KAAK,SAAS,EAAE,CAAC;YAC5C,MAAM,IAAI,CAAC,uBAAuB,CAAC,uBAAuB,CACzD,4CAA8B,EAC9B,GAAG,CAAC,oBAAoB,CACxB,CAAC;YACF,eAAe,CAAC,oBAAoB,GAAG,GAAG,CAAC,oBAAoB,CAAC;YAChE,IAAI,CAAC,yBAAyB,CAAC,GAAG,EAAE,kBAAkB,EAAE,GAAG,CAAC,oBAAoB,CAAC,CAAC;~~QACnF~~,CAAC;QAED,IAAI,GAAG,CAAC,oBAAoB,KAAK,SAAS,IAAI,IAAA,kEAA6B,GAAE,EAAE,CAAC;YAC/E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mCAAmC,CAAC,GAAG,EAAE,CAAC;YACpE,MAAM,KAAK,GAAG,~~IAAA,8CAAe,EAAC,~~GAAG,CAAC,oBAAoB,CAAC,KAAK,CAAC~~,CAAC~~;~~YAC9D~~,eAAe,CAAC,oBAAoB,GAAG,EAAE,KAAK,EAAE,~~GAAG,CAAC,oBAAoB,CAAC,~~KAAK,EAAE,CAAC;~~YACjF~~,~~IACC~~,MAAM,~~CAAC,QAAQ,~~KAAK,KAAK,~~CAAC~~,~~QAAQ;gBAClC,MAAM,~~CAAC~~,MAAM,KAAK,KAAK,CAAC,MAAM~~;~~gBAC9B~~,MAAM,~~CAAC,UAAU,KAAK,KAAK,CAAC,UAAU,EACrC,CAAC;gBACF,MAAM,~~IAAI,CAAC,mCAAmC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAC1D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,+BAA+B,EAAE;oBACvD,IAAI,EAAE;wBACL,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;wBACf,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK;wBACrB,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,SAAS;wBAC7B,QAAQ,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ;wBAC3B,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI;qBACnB;oBACD,MAAM;oBACN,KAAK;iBACL,CAAC,CAAC;YACJ,CAAC;QACF,CAAC;QAED,OAAO,eAAe,CAAC;IACxB,CAAC;IAEO,yBAAyB,~~CAChC~~,GAAyB,~~EACzB~~,~~WAA2E,EAC3E,KAAc~~;~~QAEd~~,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,2BAA2B,EAAE;YACnD,IAAI,EAAE;gBACL,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;gBACf,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK;gBACrB,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,SAAS;gBAC7B,QAAQ,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ;gBAC3B,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI;aACnB;YACD,~~WAAW;YACX~~,~~KAAK~~;~~SACL~~,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AA1HY,gEAA0B;AAWhC;IAHL,IAAA,qBAAQ,EAAC,0BAA0B,CAAC;IACpC,IAAA,wBAAW,EAAC,yBAAyB,CAAC;IACtC,IAAA,gBAAG,EAAC,GAAG,CAAC;;;;~~qEAkCR~~;AAKK;IAHL,IAAA,qBAAQ,EAAC,0BAA0B,CAAC;IACpC,IAAA,wBAAW,EAAC,yBAAyB,CAAC;IACtC,IAAA,iBAAI,EAAC,GAAG,CAAC;IAIR,WAAA,iBAAI,CAAA;;qDAAM,qCAAyB;;~~wEAmDpC~~;~~qCAvGW~~,0BAA0B;IADtC,IAAA,2BAAc,EAAC,oBAAoB,CAAC;qCAGO,mDAAuB;QAClC,4BAAY;QACI,qCAA4B;QACrB,4EAAmC;GAL9E,0BAA0B,CA0HtC"}
1	+ {"version":3,"file":"security-settings.controller.js","sourceRoot":"","sources":["../../src/controllers/security-settings.controller.ts"],"names":[],"mappings":"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"}

package/dist/controllers/telemetry.controller.d.ts CHANGED Viewed

@@ -5,8 +5,11 @@ export declare class TelemetryController {
     private readonly globalConfig;
     proxy: import("http-proxy-middleware").RequestHandler<import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, (err?: any) => void>;
     constructor(globalConfig: GlobalConfig);
+    private applyCors;
+    proxyPreflight(req: AuthenticatedRequest, res: Response): void;
     track(req: AuthenticatedRequest, res: Response, next: NextFunction): Promise<void>;
     identify(req: AuthenticatedRequest, res: Response, next: NextFunction): Promise<void>;
     page(req: AuthenticatedRequest, res: Response, next: NextFunction): Promise<void>;
-    sourceConfig(_: Request, res: Response): Promise<void>;
+    sourceConfigPreflight(req: AuthenticatedRequest, res: Response): void;
+    sourceConfig(req: AuthenticatedRequest, res: Response): Promise<void>;
 }

package/dist/controllers/telemetry.controller.js CHANGED Viewed

@@ -28,19 +28,59 @@ let TelemetryController = class TelemetryController {
                     (0, http_proxy_middleware_1.fixRequestBody)(proxyReq, req);
                     return;
                 },
+                proxyRes: (proxyRes) => {
+                    for (const header of [
+                        'access-control-allow-origin',
+                        'access-control-allow-credentials',
+                        'access-control-allow-methods',
+                        'access-control-allow-headers',
+                        'access-control-expose-headers',
+                    ]) {
+                        delete proxyRes.headers[header];
+                    }
+                    proxyRes.headers['access-control-allow-origin'] = '*';
+                },
+                error: (_error, _req, res) => {
+                    if ('writeHead' in res && !res.headersSent) {
+                        res.writeHead(502, { 'Access-Control-Allow-Origin': '*' });
+                        res.end('Bad Gateway');
+                    }
+                },
             },
         });
     }
+    applyCors(req, res) {
+        res.setHeader('Access-Control-Allow-Origin', '*');
+        res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
+        const requestedHeaders = req.headers['access-control-request-headers'];
+        res.setHeader('Access-Control-Allow-Headers', typeof requestedHeaders === 'string' && requestedHeaders.length > 0
+            ? requestedHeaders
+            : 'Content-Type, Authorization, anonymousId');
+        res.setHeader('Access-Control-Max-Age', '600');
+        res.removeHeader('Access-Control-Allow-Credentials');
+    }
+    proxyPreflight(req, res) {
+        this.applyCors(req, res);
+        res.status(204).end();
+    }
     async track(req, res, next) {
+        this.applyCors(req, res);
         await this.proxy(req, res, next);
     }
     async identify(req, res, next) {
+        this.applyCors(req, res);
         await this.proxy(req, res, next);
     }
     async page(req, res, next) {
+        this.applyCors(req, res);
         await this.proxy(req, res, next);
     }
-    async sourceConfig(_, res) {
+    sourceConfigPreflight(req, res) {
+        this.applyCors(req, res);
+        res.status(204).end();
+    }
+    async sourceConfig(req, res) {
+        this.applyCors(req, res);
         const response = await fetch('https://api-rs.n8n.io/sourceConfig', {
             headers: {
                 authorization: 'Basic ' + btoa(`${this.globalConfig.diagnostics.frontendConfig.split(';')[0]}:`),
@@ -54,6 +94,15 @@ let TelemetryController = class TelemetryController {
     }
 };
 exports.TelemetryController = TelemetryController;
+__decorate([
+    (0, decorators_1.Options)('/proxy/:version/:action', {
+        skipAuth: true,
+        ipRateLimit: { limit: 100, windowMs: 60_000 },
+    }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:returntype", void 0)
+], TelemetryController.prototype, "proxyPreflight", null);
 __decorate([
     (0, decorators_1.Post)('/proxy/:version/track', { skipAuth: true, ipRateLimit: { limit: 100, windowMs: 60_000 } }),
     __metadata("design:type", Function),
@@ -75,6 +124,16 @@ __decorate([
     __metadata("design:paramtypes", [Object, Object, Function]),
     __metadata("design:returntype", Promise)
 ], TelemetryController.prototype, "page", null);
+__decorate([
+    (0, decorators_1.Options)('/rudderstack/sourceConfig', {
+        skipAuth: true,
+        ipRateLimit: { limit: 50, windowMs: 60_000 },
+        usesTemplates: true,
+    }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:returntype", void 0)
+], TelemetryController.prototype, "sourceConfigPreflight", null);
 __decorate([
     (0, decorators_1.Get)('/rudderstack/sourceConfig', {
         skipAuth: true,
@@ -82,7 +141,7 @@ __decorate([
         usesTemplates: true,
     }),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Request, Object]),
+    __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
 ], TelemetryController.prototype, "sourceConfig", null);
 exports.TelemetryController = TelemetryController = __decorate([

package/dist/controllers/telemetry.controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"telemetry.controller.js","sourceRoot":"","sources":["../../src/controllers/telemetry.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA2C;AAE3C,~~gDAA4D~~;~~AAE5D~~,iEAA8E;AAGvE,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAG/B,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;QACtD,IAAI,CAAC,KAAK,GAAG,IAAA,6CAAqB,EAAC;YAClC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAClE,YAAY,EAAE,IAAI;YAClB,WAAW,EAAE;gBACZ,UAAU,EAAE,GAAG;aACf;YACD,EAAE,EAAE;gBACH,QAAQ,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE;oBAC3B,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;oBAChC,IAAA,sCAAc,EAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;oBAC9B,OAAO;gBACR,CAAC;aACD;SACD,CAAC,CAAC;IACJ,CAAC;~~IAGK~~,AAAN,KAAK,CAAC,KAAK,CAAC,GAAyB,EAAE,GAAa,EAAE,IAAkB;QACvE,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;~~IAMK~~,AAAN,KAAK,CAAC,QAAQ,CAAC,GAAyB,EAAE,GAAa,EAAE,IAAkB;QAC1E,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;~~IAGK~~,AAAN,KAAK,CAAC,IAAI,CAAC,GAAyB,EAAE,GAAa,EAAE,IAAkB;QACtE,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;~~IAMK~~,AAAN,KAAK,CAAC,YAAY,CAAC,~~CAAU~~,EAAE,GAAa;~~QAC3C~~,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,oCAAoC,EAAE;YAClE,OAAO,EAAE;gBACR,aAAa,EACZ,QAAQ,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;aAClF;SACD,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,kCAAkC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;QAC1E,CAAC;QAED,MAAM,MAAM,GAAY,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAG9C,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC;CACD,CAAA;~~AA3DY~~,kDAAmB;~~AAqBzB~~;IADL,IAAA,iBAAI,EAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC;;;;~~gDAGhG~~;~~AAMK~~;IAJL,IAAA,iBAAI,EAAC,0BAA0B,EAAE;QACjC,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE;KAC7C,CAAC;;;;~~mDAGD~~;~~AAGK~~;IADL,IAAA,iBAAI,EAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC;;;;+~~CAG9F~~;~~AAMK~~;IALL,IAAA,gBAAG,EAAC,2BAA2B,EAAE;QACjC,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE;QAC5C,aAAa,EAAE,IAAI;KACnB,CAAC~~;;qCACoB,OAAO;;uDAgB5B~~;~~8BA1DW~~,mBAAmB;IAD/B,IAAA,2BAAc,EAAC,YAAY,CAAC;qCAIe,qBAAY;GAH3C,mBAAmB,~~CA2D~~/B"}
1	+ {"version":3,"file":"telemetry.controller.js","sourceRoot":"","sources":["../../src/controllers/telemetry.controller.ts"],"names":[],"mappings":"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"}