n8n 1.89.2 → 1.90.1
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.
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/base-command.js +4 -4
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/worker.js +0 -3
- package/dist/commands/worker.js.map +1 -1
- package/dist/config/index.d.ts +0 -9
- package/dist/config/schema.d.ts +0 -34
- package/dist/config/schema.js +0 -46
- package/dist/config/schema.js.map +1 -1
- package/dist/config/types.d.ts +0 -2
- package/dist/constants.d.ts +1 -0
- package/dist/constants.js +1 -0
- package/dist/constants.js.map +1 -1
- package/dist/controllers/api-keys.controller.d.ts +7 -4
- package/dist/controllers/api-keys.controller.js +30 -16
- package/dist/controllers/api-keys.controller.js.map +1 -1
- package/dist/controllers/binary-data.controller.d.ts +6 -3
- package/dist/controllers/binary-data.controller.js +64 -34
- package/dist/controllers/binary-data.controller.js.map +1 -1
- package/dist/controllers/oauth/abstract-oauth.controller.d.ts +1 -1
- package/dist/controllers/oauth/abstract-oauth.controller.js +3 -3
- package/dist/controllers/oauth/abstract-oauth.controller.js.map +1 -1
- package/dist/controllers/oauth/oauth1-credential.controller.js +1 -1
- package/dist/controllers/oauth/oauth1-credential.controller.js.map +1 -1
- package/dist/controllers/oauth/oauth2-credential.controller.js +1 -1
- package/dist/controllers/oauth/oauth2-credential.controller.js.map +1 -1
- package/dist/controllers/users.controller.js +1 -1
- package/dist/controllers/users.controller.js.map +1 -1
- package/dist/credentials-helper.d.ts +1 -1
- package/dist/credentials-helper.js +4 -4
- package/dist/credentials-helper.js.map +1 -1
- package/dist/databases/entities/api-key.d.ts +2 -0
- package/dist/databases/entities/api-key.js +4 -0
- package/dist/databases/entities/api-key.js.map +1 -1
- package/dist/databases/entities/folder.js +1 -1
- package/dist/databases/entities/folder.js.map +1 -1
- package/dist/databases/entities/user.d.ts +1 -3
- package/dist/databases/entities/user.js +1 -1
- package/dist/databases/entities/user.js.map +1 -1
- package/dist/databases/migrations/common/1742918400000-AddScopesColumnToApiKeys.d.ts +5 -0
- package/dist/databases/migrations/common/1742918400000-AddScopesColumnToApiKeys.js +25 -0
- package/dist/databases/migrations/common/1742918400000-AddScopesColumnToApiKeys.js.map +1 -0
- package/dist/databases/migrations/mysqldb/index.js +2 -0
- package/dist/databases/migrations/mysqldb/index.js.map +1 -1
- package/dist/databases/migrations/postgresdb/index.js +2 -0
- package/dist/databases/migrations/postgresdb/index.js.map +1 -1
- package/dist/databases/migrations/sqlite/1742918400000-AddScopesColumnToApiKeys.d.ts +4 -0
- package/dist/databases/migrations/sqlite/1742918400000-AddScopesColumnToApiKeys.js +12 -0
- package/dist/databases/migrations/sqlite/1742918400000-AddScopesColumnToApiKeys.js.map +1 -0
- package/dist/databases/migrations/sqlite/index.js +2 -0
- package/dist/databases/migrations/sqlite/index.js.map +1 -1
- package/dist/databases/repositories/user.repository.d.ts +2 -1
- package/dist/databases/repositories/user.repository.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-helper.ee.d.ts +2 -0
- package/dist/environments.ee/source-control/source-control-helper.ee.js +5 -0
- package/dist/environments.ee/source-control/source-control-helper.ee.js.map +1 -1
- package/dist/environments.ee/source-control/source-control.controller.ee.d.ts +9 -9
- package/dist/environments.ee/source-control/source-control.service.ee.d.ts +6 -6
- package/dist/environments.ee/source-control/source-control.service.ee.js +20 -13
- package/dist/environments.ee/source-control/source-control.service.ee.js.map +1 -1
- package/dist/events/maps/relay.event-map.d.ts +2 -1
- package/dist/events/relays/telemetry.event-relay.d.ts +3 -2
- package/dist/events/relays/telemetry.event-relay.js +6 -5
- package/dist/events/relays/telemetry.event-relay.js.map +1 -1
- package/dist/execution-lifecycle/restore-binary-data-id.js +1 -6
- package/dist/execution-lifecycle/restore-binary-data-id.js.map +1 -1
- package/dist/interfaces.d.ts +2 -2
- package/dist/license.d.ts +1 -0
- package/dist/license.js +3 -0
- package/dist/license.js.map +1 -1
- package/dist/public-api/permissions.ee/global-roles-scopes.d.ts +4 -0
- package/dist/public-api/permissions.ee/global-roles-scopes.js +66 -0
- package/dist/public-api/permissions.ee/global-roles-scopes.js.map +1 -0
- package/dist/public-api/permissions.ee/index.d.ts +3 -0
- package/dist/public-api/permissions.ee/index.js +21 -0
- package/dist/public-api/permissions.ee/index.js.map +1 -0
- package/dist/public-api/v1/handlers/audit/audit.handler.d.ts +1 -1
- package/dist/public-api/v1/handlers/audit/audit.handler.js +2 -2
- package/dist/public-api/v1/handlers/audit/audit.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/credentials/credentials.handler.d.ts +5 -5
- package/dist/public-api/v1/handlers/credentials/credentials.handler.js +3 -0
- package/dist/public-api/v1/handlers/credentials/credentials.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/executions/executions.handler.d.ts +3 -3
- package/dist/public-api/v1/handlers/executions/executions.handler.js +3 -0
- package/dist/public-api/v1/handlers/executions/executions.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/projects/projects.handler.d.ts +7 -7
- package/dist/public-api/v1/handlers/projects/projects.handler.js +4 -4
- package/dist/public-api/v1/handlers/projects/projects.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/source-control/source-control.handler.d.ts +1 -1
- package/dist/public-api/v1/handlers/source-control/source-control.handler.js +1 -1
- package/dist/public-api/v1/handlers/source-control/source-control.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/tags/tags.handler.d.ts +8 -8
- package/dist/public-api/v1/handlers/tags/tags.handler.js +5 -5
- package/dist/public-api/v1/handlers/tags/tags.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/users/users.handler.ee.d.ts +7 -7
- package/dist/public-api/v1/handlers/users/users.handler.ee.js +5 -5
- package/dist/public-api/v1/handlers/users/users.handler.ee.js.map +1 -1
- package/dist/public-api/v1/handlers/variables/variables.handler.d.ts +5 -5
- package/dist/public-api/v1/handlers/variables/variables.handler.js +3 -3
- package/dist/public-api/v1/handlers/variables/variables.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/workflows/workflows.handler.d.ts +18 -18
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js +10 -0
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js.map +1 -1
- package/dist/public-api/v1/shared/middlewares/global.middleware.d.ts +11 -1
- package/dist/public-api/v1/shared/middlewares/global.middleware.js +22 -1
- package/dist/public-api/v1/shared/middlewares/global.middleware.js.map +1 -1
- package/dist/requests.d.ts +2 -8
- package/dist/scaling/multi-main-setup.ee.js +1 -2
- package/dist/scaling/multi-main-setup.ee.js.map +1 -1
- package/dist/scaling/pubsub/publisher.service.d.ts +1 -1
- package/dist/scaling/pubsub/publisher.service.js +3 -3
- package/dist/scaling/pubsub/publisher.service.js.map +1 -1
- package/dist/services/credentials-tester.service.js +1 -1
- package/dist/services/credentials-tester.service.js.map +1 -1
- package/dist/services/frontend.service.d.ts +3 -2
- package/dist/services/frontend.service.js +12 -8
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/public-api-key.service.d.ts +10 -2
- package/dist/services/public-api-key.service.js +48 -7
- package/dist/services/public-api-key.service.js.map +1 -1
- package/dist/services/role.service.d.ts +2 -2
- package/dist/services/role.service.js.map +1 -1
- package/dist/services/user.service.d.ts +6 -2
- package/dist/services/user.service.js +17 -2
- package/dist/services/user.service.js.map +1 -1
- package/dist/sso.ee/saml/routes/saml.controller.ee.d.ts +1 -1
- package/dist/task-runners/task-broker/errors/task-runner-accept-timeout.error.d.ts +4 -0
- package/dist/task-runners/task-broker/errors/task-runner-accept-timeout.error.js +13 -0
- package/dist/task-runners/task-broker/errors/task-runner-accept-timeout.error.js.map +1 -0
- package/dist/task-runners/task-broker/errors/{task-runner-timeout.error.d.ts → task-runner-execution-timeout.error.d.ts} +1 -1
- package/dist/task-runners/task-broker/errors/{task-runner-timeout.error.js → task-runner-execution-timeout.error.js} +4 -4
- package/dist/task-runners/task-broker/errors/task-runner-execution-timeout.error.js.map +1 -0
- package/dist/task-runners/task-broker/task-broker.service.js +8 -3
- package/dist/task-runners/task-broker/task-broker.service.js.map +1 -1
- package/dist/task-runners/task-runner-process.js +1 -0
- package/dist/task-runners/task-runner-process.js.map +1 -1
- package/dist/workflows/workflow-history.ee/workflow-history-helper.ee.js +3 -6
- package/dist/workflows/workflow-history.ee/workflow-history-helper.ee.js.map +1 -1
- package/dist/workflows/workflows.controller.js +1 -1
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +12 -12
- package/templates/form-trigger.handlebars +4 -1
- package/dist/config/utils.d.ts +0 -2
- package/dist/config/utils.js +0 -17
- package/dist/config/utils.js.map +0 -1
- package/dist/errors/not-string-array.error.d.ts +0 -4
- package/dist/errors/not-string-array.error.js +0 -11
- package/dist/errors/not-string-array.error.js.map +0 -1
- package/dist/errors/worker-missing-encryption-key.error.d.ts +0 -4
- package/dist/errors/worker-missing-encryption-key.error.js +0 -15
- package/dist/errors/worker-missing-encryption-key.error.js.map +0 -1
- package/dist/task-runners/task-broker/errors/task-runner-timeout.error.js.map +0 -1
|
@@ -8,68 +8,98 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var
|
|
12
|
-
return (
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.BinaryDataController = void 0;
|
|
16
|
-
const
|
|
16
|
+
const api_types_1 = require("@n8n/api-types");
|
|
17
|
+
const jsonwebtoken_1 = require("jsonwebtoken");
|
|
17
18
|
const n8n_core_1 = require("n8n-core");
|
|
18
19
|
const decorators_1 = require("../decorators");
|
|
20
|
+
const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
|
|
19
21
|
let BinaryDataController = class BinaryDataController {
|
|
20
22
|
constructor(binaryDataService) {
|
|
21
23
|
this.binaryDataService = binaryDataService;
|
|
22
24
|
}
|
|
23
|
-
async get(
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
if (!binaryDataId.includes(':')) {
|
|
29
|
-
return res.status(400).end('Missing binary data mode');
|
|
25
|
+
async get(_, res, { id: binaryDataId, action, fileName, mimeType }) {
|
|
26
|
+
try {
|
|
27
|
+
this.validateBinaryDataId(binaryDataId);
|
|
28
|
+
await this.setContentHeaders(binaryDataId, action, res, fileName, mimeType);
|
|
29
|
+
return await this.binaryDataService.getAsStream(binaryDataId);
|
|
30
30
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
31
|
+
catch (error) {
|
|
32
|
+
if (error instanceof n8n_core_1.FileNotFoundError)
|
|
33
|
+
return res.status(404).end();
|
|
34
|
+
if (error instanceof bad_request_error_1.BadRequestError)
|
|
35
|
+
return res.status(400).end(error.message);
|
|
36
|
+
else
|
|
37
|
+
throw error;
|
|
34
38
|
}
|
|
35
|
-
|
|
39
|
+
}
|
|
40
|
+
async getSigned(_, res, { token }) {
|
|
36
41
|
try {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
fileName = metadata.fileName;
|
|
41
|
-
mimeType = metadata.mimeType;
|
|
42
|
-
res.setHeader('Content-Length', metadata.fileSize);
|
|
43
|
-
}
|
|
44
|
-
catch { }
|
|
45
|
-
}
|
|
46
|
-
if (mimeType) {
|
|
47
|
-
res.setHeader('Content-Type', mimeType);
|
|
48
|
-
if (mimeType.includes('html') && action === 'view') {
|
|
49
|
-
res.header('Content-Security-Policy', 'sandbox');
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
if (action === 'download' && fileName) {
|
|
53
|
-
const encodedFilename = encodeURIComponent(fileName);
|
|
54
|
-
res.setHeader('Content-Disposition', `attachment; filename="${encodedFilename}"`);
|
|
55
|
-
}
|
|
42
|
+
const binaryDataId = this.binaryDataService.validateSignedToken(token);
|
|
43
|
+
this.validateBinaryDataId(binaryDataId);
|
|
44
|
+
await this.setContentHeaders(binaryDataId, 'download', res);
|
|
56
45
|
return await this.binaryDataService.getAsStream(binaryDataId);
|
|
57
46
|
}
|
|
58
47
|
catch (error) {
|
|
59
48
|
if (error instanceof n8n_core_1.FileNotFoundError)
|
|
60
49
|
return res.status(404).end();
|
|
50
|
+
if (error instanceof bad_request_error_1.BadRequestError || error instanceof jsonwebtoken_1.JsonWebTokenError)
|
|
51
|
+
return res.status(400).end(error.message);
|
|
61
52
|
else
|
|
62
53
|
throw error;
|
|
63
54
|
}
|
|
64
55
|
}
|
|
56
|
+
validateBinaryDataId(binaryDataId) {
|
|
57
|
+
if (!binaryDataId) {
|
|
58
|
+
throw new bad_request_error_1.BadRequestError('Missing binary data ID');
|
|
59
|
+
}
|
|
60
|
+
if (!binaryDataId.includes(':')) {
|
|
61
|
+
throw new bad_request_error_1.BadRequestError('Missing binary data mode');
|
|
62
|
+
}
|
|
63
|
+
const [mode] = binaryDataId.split(':');
|
|
64
|
+
if (!(0, n8n_core_1.isValidNonDefaultMode)(mode)) {
|
|
65
|
+
throw new bad_request_error_1.BadRequestError('Invalid binary data mode');
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
async setContentHeaders(binaryDataId, action, res, fileName, mimeType) {
|
|
69
|
+
try {
|
|
70
|
+
const metadata = await this.binaryDataService.getMetadata(binaryDataId);
|
|
71
|
+
fileName = metadata.fileName ?? fileName;
|
|
72
|
+
mimeType = metadata.mimeType ?? mimeType;
|
|
73
|
+
res.setHeader('Content-Length', metadata.fileSize);
|
|
74
|
+
}
|
|
75
|
+
catch { }
|
|
76
|
+
if (action === 'view' && (!mimeType || !api_types_1.ViewableMimeTypes.includes(mimeType.toLowerCase()))) {
|
|
77
|
+
throw new bad_request_error_1.BadRequestError('Content not viewable');
|
|
78
|
+
}
|
|
79
|
+
if (mimeType) {
|
|
80
|
+
res.setHeader('Content-Type', mimeType);
|
|
81
|
+
}
|
|
82
|
+
if (action === 'download' && fileName) {
|
|
83
|
+
const encodedFilename = encodeURIComponent(fileName);
|
|
84
|
+
res.setHeader('Content-Disposition', `attachment; filename="${encodedFilename}"`);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
65
87
|
};
|
|
66
88
|
exports.BinaryDataController = BinaryDataController;
|
|
67
89
|
__decorate([
|
|
68
90
|
(0, decorators_1.Get)('/'),
|
|
91
|
+
__param(2, decorators_1.Query),
|
|
69
92
|
__metadata("design:type", Function),
|
|
70
|
-
__metadata("design:paramtypes", [Object, Object]),
|
|
93
|
+
__metadata("design:paramtypes", [Object, Object, api_types_1.BinaryDataQueryDto]),
|
|
71
94
|
__metadata("design:returntype", Promise)
|
|
72
95
|
], BinaryDataController.prototype, "get", null);
|
|
96
|
+
__decorate([
|
|
97
|
+
(0, decorators_1.Get)('/signed', { skipAuth: true }),
|
|
98
|
+
__param(2, decorators_1.Query),
|
|
99
|
+
__metadata("design:type", Function),
|
|
100
|
+
__metadata("design:paramtypes", [Object, Object, api_types_1.BinaryDataSignedQueryDto]),
|
|
101
|
+
__metadata("design:returntype", Promise)
|
|
102
|
+
], BinaryDataController.prototype, "getSigned", null);
|
|
73
103
|
exports.BinaryDataController = BinaryDataController = __decorate([
|
|
74
104
|
(0, decorators_1.RestController)('/binary-data'),
|
|
75
105
|
__metadata("design:paramtypes", [n8n_core_1.BinaryDataService])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"binary-data.controller.js","sourceRoot":"","sources":["../../src/controllers/binary-data.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"binary-data.controller.js","sourceRoot":"","sources":["../../src/controllers/binary-data.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAAiG;AAEjG,+CAAiD;AACjD,uCAAuF;AAEvF,6CAA0D;AAC1D,kFAA6E;AAGtE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAChC,YAA6B,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;IAAG,CAAC;IAG/D,AAAN,KAAK,CAAC,GAAG,CACR,CAAU,EACV,GAAa,EACN,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAsB;QAE3E,IAAI,CAAC;YACJ,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;YACxC,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAC5E,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAC/D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,KAAK,YAAY,4BAAiB;gBAAE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;YACrE,IAAI,KAAK,YAAY,mCAAe;gBAAE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;;gBAC3E,MAAM,KAAK,CAAC;QAClB,CAAC;IACF,CAAC;IAGK,AAAN,KAAK,CAAC,SAAS,CAAC,CAAU,EAAE,GAAa,EAAS,EAAE,KAAK,EAA4B;QACpF,IAAI,CAAC;YACJ,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;YACvE,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;YACxC,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;YAC5D,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAC/D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,KAAK,YAAY,4BAAiB;gBAAE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;YACrE,IAAI,KAAK,YAAY,mCAAe,IAAI,KAAK,YAAY,gCAAiB;gBACzE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;;gBACtC,MAAM,KAAK,CAAC;QAClB,CAAC;IACF,CAAC;IAEO,oBAAoB,CAAC,YAAoB;QAChD,IAAI,CAAC,YAAY,EAAE,CAAC;YACnB,MAAM,IAAI,mCAAe,CAAC,wBAAwB,CAAC,CAAC;QACrD,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,mCAAe,CAAC,0BAA0B,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,CAAC,IAAA,gCAAqB,EAAC,IAAI,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,mCAAe,CAAC,0BAA0B,CAAC,CAAC;QACvD,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC9B,YAAoB,EACpB,MAA2B,EAC3B,GAAa,EACb,QAAiB,EACjB,QAAiB;QAEjB,IAAI,CAAC;YACJ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YACxE,QAAQ,GAAG,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC;YACzC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC;YACzC,GAAG,CAAC,SAAS,CAAC,gBAAgB,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACpD,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QAEV,IAAI,MAAM,KAAK,MAAM,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,6BAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC;YAC7F,MAAM,IAAI,mCAAe,CAAC,sBAAsB,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,QAAQ,EAAE,CAAC;YACd,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QACzC,CAAC;QAED,IAAI,MAAM,KAAK,UAAU,IAAI,QAAQ,EAAE,CAAC;YACvC,MAAM,eAAe,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YACrD,GAAG,CAAC,SAAS,CAAC,qBAAqB,EAAE,yBAAyB,eAAe,GAAG,CAAC,CAAC;QACnF,CAAC;IACF,CAAC;CACD,CAAA;AA7EY,oDAAoB;AAI1B;IADL,IAAA,gBAAG,EAAC,GAAG,CAAC;IAIP,WAAA,kBAAK,CAAA;;qDAAmD,8BAAkB;;+CAW3E;AAGK;IADL,IAAA,gBAAG,EAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACS,WAAA,kBAAK,CAAA;;qDAAY,oCAAwB;;qDAYpF;+BAjCW,oBAAoB;IADhC,IAAA,2BAAc,EAAC,cAAc,CAAC;qCAEkB,4BAAiB;GADrD,oBAAoB,CA6EhC"}
|
|
@@ -33,7 +33,7 @@ export declare abstract class AbstractOAuthController {
|
|
|
33
33
|
protected getDecryptedDataForAuthUri(credential: ICredentialsDb, additionalData: IWorkflowExecuteAdditionalData): Promise<ICredentialDataDecryptedObject>;
|
|
34
34
|
protected getDecryptedDataForCallback(credential: ICredentialsDb, additionalData: IWorkflowExecuteAdditionalData): Promise<ICredentialDataDecryptedObject>;
|
|
35
35
|
private getDecryptedData;
|
|
36
|
-
protected applyDefaultsAndOverwrites<T>(credential: ICredentialsDb, decryptedData: ICredentialDataDecryptedObject, additionalData: IWorkflowExecuteAdditionalData): T
|
|
36
|
+
protected applyDefaultsAndOverwrites<T>(credential: ICredentialsDb, decryptedData: ICredentialDataDecryptedObject, additionalData: IWorkflowExecuteAdditionalData): Promise<T>;
|
|
37
37
|
protected encryptAndSaveData(credential: ICredentialsDb, toUpdate: ICredentialDataDecryptedObject, toDelete?: string[]): Promise<void>;
|
|
38
38
|
protected getCredentialWithoutUser(credentialId: string): Promise<ICredentialsDb | null>;
|
|
39
39
|
createCsrfState(credentialsId: string, userId?: string): [string, string];
|
|
@@ -101,8 +101,8 @@ let AbstractOAuthController = class AbstractOAuthController {
|
|
|
101
101
|
async getDecryptedData(credential, additionalData, raw) {
|
|
102
102
|
return await this.credentialsHelper.getDecrypted(additionalData, credential, credential.type, 'internal', undefined, raw);
|
|
103
103
|
}
|
|
104
|
-
applyDefaultsAndOverwrites(credential, decryptedData, additionalData) {
|
|
105
|
-
return this.credentialsHelper.applyDefaultsAndOverwrites(additionalData, decryptedData, credential.type, 'internal');
|
|
104
|
+
async applyDefaultsAndOverwrites(credential, decryptedData, additionalData) {
|
|
105
|
+
return (await this.credentialsHelper.applyDefaultsAndOverwrites(additionalData, decryptedData, credential, credential.type, 'internal', undefined, undefined));
|
|
106
106
|
}
|
|
107
107
|
async encryptAndSaveData(credential, toUpdate, toDelete = []) {
|
|
108
108
|
const credentials = new n8n_core_1.Credentials(credential, credential.type, credential.data);
|
|
@@ -154,7 +154,7 @@ let AbstractOAuthController = class AbstractOAuthController {
|
|
|
154
154
|
}
|
|
155
155
|
const additionalData = await this.getAdditionalData();
|
|
156
156
|
const decryptedDataOriginal = await this.getDecryptedDataForCallback(credential, additionalData);
|
|
157
|
-
const oauthCredentials = this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
|
|
157
|
+
const oauthCredentials = await this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
|
|
158
158
|
if (!this.verifyCsrfState(decryptedDataOriginal, state)) {
|
|
159
159
|
throw new n8n_workflow_1.UnexpectedError('The OAuth callback state is invalid!');
|
|
160
160
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-oauth.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/abstract-oauth.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAA2C;AAC3C,gCAAkC;AAClC,gDAAwB;AAExB,uCAA+C;AAE/C,+CAA0D;AAE1D,2CAA4D;AAC5D,6DAAyD;AAEzD,4FAAwF;AACxF,0GAAqG;AACrG,oEAAgE;AAChE,kFAA6E;AAC7E,8EAAyE;AACzE,qDAAiD;AAGjD,wDAAoD;AACpD,kGAAoF;AAapF,MAAM,YAAY,GAAG,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AAIxC,QAAA,uBAAuB,GAAG,OAAO,CAAC,GAAG,CAAC,+BAA+B,KAAK,MAAM,CAAC;AAGvF,IAAe,uBAAuB,GAAtC,MAAe,uBAAuB;IAG5C,YACoB,MAAc,EACd,aAA4B,EAC9B,iBAAoC,EACpC,qBAA4C,EAC5C,2BAAwD,EACxD,UAAsB,EACtB,YAA0B;QANxB,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAe;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,gCAA2B,GAA3B,2BAA2B,CAA6B;QACxD,eAAU,GAAV,UAAU,CAAY;QACtB,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,IAAI,OAAO;QACV,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAC9F,OAAO,GAAG,OAAO,SAAS,IAAI,CAAC,YAAY,aAAa,CAAC;IAC1D,CAAC;IAES,KAAK,CAAC,aAAa,CAC5B,GAAuC;QAEvC,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QAEvC,IAAI,CAAC,YAAY,EAAE,CAAC;YACnB,MAAM,IAAI,mCAAe,CAAC,mCAAmC,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,qBAAqB,CAC9E,YAAY,EACZ,GAAG,CAAC,IAAI,EACR,CAAC,iBAAiB,CAAC,CACnB,CAAC;QAEF,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,QAAQ,IAAI,CAAC,YAAY,iGAAiG,EAC1H,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CACvB,CAAC;YACF,MAAM,IAAI,+BAAa,CAAC,mCAAuB,CAAC,aAAa,CAAC,CAAC;QAChE,CAAC;QAED,OAAO,UAAU,CAAC;IACnB,CAAC;IAES,KAAK,CAAC,iBAAiB;QAChC,OAAO,MAAM,6BAA6B,CAAC,OAAO,EAAE,CAAC;IACtD,CAAC;IAKS,KAAK,CAAC,0BAA0B,CACzC,UAA0B,EAC1B,cAA8C;QAE9C,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;IACvE,CAAC;IAKS,KAAK,CAAC,2BAA2B,CAC1C,UAA0B,EAC1B,cAA8C;QAE9C,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;IACtE,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC7B,UAA0B,EAC1B,cAA8C,EAC9C,GAAY;QAEZ,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAC/C,cAAc,EACd,UAAU,EACV,UAAU,CAAC,IAAI,EACf,UAAU,EACV,SAAS,EACT,GAAG,CACH,CAAC;IACH,CAAC;IAES,0BAA0B,
|
|
1
|
+
{"version":3,"file":"abstract-oauth.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/abstract-oauth.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@ let OAuth1CredentialController = class OAuth1CredentialController extends abstra
|
|
|
33
33
|
const credential = await this.getCredential(req);
|
|
34
34
|
const additionalData = await this.getAdditionalData();
|
|
35
35
|
const decryptedDataOriginal = await this.getDecryptedDataForAuthUri(credential, additionalData);
|
|
36
|
-
const oauthCredentials = this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
|
|
36
|
+
const oauthCredentials = await this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
|
|
37
37
|
const [csrfSecret, state] = this.createCsrfState(credential.id, abstract_oauth_controller_1.skipAuthOnOAuthCallback ? undefined : req.user.id);
|
|
38
38
|
const signatureMethod = oauthCredentials.signatureMethod;
|
|
39
39
|
const oAuthOptions = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth1-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth1-credential.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,kDAA0B;AAC1B,mCAAoC;AAEpC,+CAA0D;AAE1D,4DAAsC;AAEtC,6CAAmD;AAGnD,2EAA+F;AAW/F,MAAM,YAAY,GAAG;IACpB,aAAa,EAAE,QAAQ;IACvB,aAAa,EAAE,QAAQ;IACvB,WAAW,EAAE,MAAM;CACV,CAAC;AAGJ,IAAM,0BAA0B,GAAhC,MAAM,0BAA2B,SAAQ,mDAAuB;IAAhE;;QACG,iBAAY,GAAG,CAAC,CAAC;IAsH3B,CAAC;IAlHM,AAAN,KAAK,CAAC,UAAU,CAAC,GAAuC;QACvD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACjD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACtD,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QAChG,MAAM,gBAAgB,GAAG,IAAI,CAAC,0BAA0B,
|
|
1
|
+
{"version":3,"file":"oauth1-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth1-credential.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,7 +70,7 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
|
|
|
70
70
|
!constants_1.GENERIC_OAUTH2_CREDENTIALS_WITH_EDITABLE_SCOPE.includes(credential.type)) {
|
|
71
71
|
delete decryptedDataOriginal.scope;
|
|
72
72
|
}
|
|
73
|
-
const oauthCredentials = this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
|
|
73
|
+
const oauthCredentials = await this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
|
|
74
74
|
const [csrfSecret, state] = this.createCsrfState(credential.id, abstract_oauth_controller_1.skipAuthOnOAuthCallback ? undefined : req.user.id);
|
|
75
75
|
const oAuthOptions = {
|
|
76
76
|
...this.convertCredentialToOptions(oauthCredentials),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth2-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth2-credential.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,sDAAkD;AAElD,uDAA+B;AAC/B,qDAA6B;AAC7B,yDAAiC;AACjC,+CAAkF;AAClF,oEAA2C;AAC3C,gDAAkC;AAElC,2CAA+H;AAC/H,6CAAmD;AAGnD,2EAA+F;AAGxF,IAAM,0BAA0B,GAAhC,MAAM,0BAA2B,SAAQ,mDAAuB;IAAhE;;QACG,iBAAY,GAAG,CAAC,CAAC;IA2J3B,CAAC;IAvJM,AAAN,KAAK,CAAC,UAAU,CAAC,GAAuC;QACvD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACjD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACtD,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QAMhG,IACC,qBAAqB,EAAE,KAAK;YAC5B,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAClC,CAAC,0DAA8C,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EACxE,CAAC;YACF,OAAO,qBAAqB,CAAC,KAAK,CAAC;QACpC,CAAC;QAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,0BAA0B,
|
|
1
|
+
{"version":3,"file":"oauth2-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth2-credential.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -183,7 +183,7 @@ let UsersController = UsersController_1 = class UsersController {
|
|
|
183
183
|
if (req.user.role === 'global:owner' && targetUser.role === 'global:owner') {
|
|
184
184
|
throw new forbidden_error_1.ForbiddenError(NO_OWNER_ON_OWNER);
|
|
185
185
|
}
|
|
186
|
-
await this.userService.
|
|
186
|
+
await this.userService.changeUserRole(req.user, targetUser, payload);
|
|
187
187
|
this.eventService.emit('user-changed-role', {
|
|
188
188
|
userId: req.user.id,
|
|
189
189
|
targetUserId: targetUser.id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.controller.js","sourceRoot":"","sources":["../../src/controllers/users.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAAgF;AAEhF,uCAAkC;AAElC,sDAAkD;AAClD,2EAAuE;AACvE,sEAAkE;AAClE,0DAAuD;AACvD,oDAAiD;AACjD,oFAAgF;AAChF,0GAAqG;AACrG,oGAA+F;AAC/F,8EAA0E;AAC1E,6CASsB;AACtB,kFAA6E;AAC7E,8EAA0E;AAC1E,8EAAyE;AACzE,0DAAsD;AACtD,qDAAiD;AAEjD,+CAAoD;AAEpD,8DAA0D;AAC1D,sEAA+D;AAC/D,0DAAsD;AACtD,mEAA+D;AAGxD,IAAM,eAAe,uBAArB,MAAM,eAAe;IAC3B,YACkB,MAAc,EACd,aAA4B,EAC5B,2BAAwD,EACxD,wBAAkD,EAClD,cAA8B,EAC9B,WAAwB,EACxB,WAAwB,EACxB,iBAAoC,EACpC,eAAgC,EAChC,kBAAsC,EACtC,cAA8B,EAC9B,YAA0B,EAC1B,aAA4B;QAZ5B,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAe;QAC5B,gCAA2B,GAA3B,2BAA2B,CAA6B;QACxD,6BAAwB,GAAxB,wBAAwB,CAA0B;QAClD,mBAAc,GAAd,cAAc,CAAgB;QAC9B,gBAAW,GAAX,WAAW,CAAa;QACxB,gBAAW,GAAX,WAAW,CAAa;QACxB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,oBAAe,GAAf,eAAe,CAAiB;QAChC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,kBAAa,GAAb,aAAa,CAAe;IAC3C,CAAC;IAUI,yBAAyB,CAChC,WAAuC,EACvC,gBAAmC;QAEnC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAAC;QAIlD,IAAI,IAAI,IAAI,MAAM,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC;YACnC,KAAK,MAAM,IAAI,IAAI,WAAW;gBAAE,OAAO,IAAI,CAAC,EAAE,CAAC;QAChD,CAAC;QAED,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;YACrB,KAAK,MAAM,IAAI,IAAI,WAAW;gBAAE,OAAO,IAAI,CAAC,IAAI,CAAC;QAClD,CAAC;QAID,IAAI,MAAM,EAAE,CAAC;YACZ,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;gBAChC,OAAO,IAAI,CAAC,OAAO,CAAC;gBACpB,OAAO,IAAI,CAAC,SAAS,CAAC;gBACtB,OAAO,IAAI,CAAC,UAAU,CAAC;YACxB,CAAC;QACF,CAAC;QAED,OAAO,WAAW,CAAC;IACpB,CAAC;IAIK,AAAN,KAAK,CAAC,SAAS,CAAC,GAAsB;QACrC,MAAM,EAAE,gBAAgB,EAAE,GAAG,GAAG,CAAC;QAEjC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;QAEtF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAE9D,MAAM,WAAW,GAA+B,MAAM,OAAO,CAAC,GAAG,CAChE,KAAK,CAAC,GAAG,CACR,KAAK,EAAE,CAAC,EAAE,EAAE,CACX,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CACpF,CACD,CAAC;QAEF,OAAO,gBAAgB;YACtB,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,WAAW,EAAE,gBAAgB,CAAC;YAC/D,CAAC,CAAC,WAAW,CAAC;IAChB,CAAC;IAIK,AAAN,KAAK,CAAC,wBAAwB,CAAC,GAAkC;QAChE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;YACpD,KAAK,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE;SAC5B,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,MAAM,IAAI,+BAAa,CAAC,gBAAgB,CAAC,CAAC;QAC3C,CAAC;QAED,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YACtE,MAAM,IAAI,gCAAc,CAAC,6CAA6C,CAAC,CAAC;QACzE,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAC7D,OAAO,EAAE,IAAI,EAAE,CAAC;IACjB,CAAC;IAIK,AAAN,KAAK,CAAC,kBAAkB,CACvB,IAA0B,EAC1B,IAAc,EACR,OAAiC,EAC1B,EAAU;QAEvB,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAEnD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;YACpD,MAAM,EAAE,CAAC,UAAU,CAAC;YACpB,KAAK,EAAE,EAAE,EAAE,EAAE;SACb,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAOK,AAAN,KAAK,CAAC,UAAU,CAAC,GAAuB;QACvC,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAEtC,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,UAAU,EAAE,CAAC;YAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,oFAAoF,EACpF,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CACvB,CAAC;YACF,MAAM,IAAI,mCAAe,CAAC,6BAA6B,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QAEjC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;QAE7E,IAAI,CAAC,YAAY,EAAE,CAAC;YACnB,MAAM,IAAI,+BAAa,CACtB,gFAAgF,CAChF,CAAC;QACH,CAAC;QAED,IAAI,YAAY,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YAC1C,MAAM,IAAI,gCAAc,CAAC,mCAAmC,CAAC,CAAC;QAC/D,CAAC;QAED,MAAM,uBAAuB,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,+BAA+B,CAC3F,YAAY,CAAC,EAAE,CACf,CAAC;QAEF,IAAI,UAAU,KAAK,uBAAuB,CAAC,EAAE,EAAE,CAAC;YAC/C,MAAM,IAAI,mCAAe,CACxB,iGAAiG,CACjG,CAAC;QACH,CAAC;QAED,IAAI,YAAY,CAAC;QAEjB,IAAI,UAAU,EAAE,CAAC;YAChB,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;YAErF,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACxB,MAAM,IAAI,+BAAa,CACtB,oFAAoF,CACpF,CAAC;YACH,CAAC;YAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC;gBAC5D,gBAAgB,EAAE;oBACjB,SAAS,EAAE,iBAAiB,CAAC,EAAE;iBAC/B;aACD,CAAC,CAAC;YAEH,YAAY,GAAG,UAAU,CAAC,EAAE,CAAC;YAE7B,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBAC7D,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CACrC,uBAAuB,CAAC,EAAE,EAC1B,iBAAiB,CAAC,EAAE,EACpB,GAAG,CACH,CAAC;gBACF,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CACxC,uBAAuB,CAAC,EAAE,EAC1B,iBAAiB,CAAC,EAAE,EACpB,GAAG,CACH,CAAC;gBAEF,MAAM,IAAI,CAAC,aAAa,CAAC,2BAA2B,CACnD,uBAAuB,CAAC,EAAE,EAC1B,iBAAiB,CAAC,EAAE,EACpB,GAAG,CACH,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,MAAM,IAAI,CAAC,cAAc,CAAC,yCAAyC,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;QAC3F,CAAC;QAED,MAAM,CAAC,oBAAoB,EAAE,sBAAsB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACxE,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC;gBAClC,MAAM,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;gBAC5B,KAAK,EAAE,EAAE,SAAS,EAAE,uBAAuB,CAAC,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE;aACxE,CAAC;YACF,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC;gBACrC,SAAS,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;gBAChC,KAAK,EAAE,EAAE,SAAS,EAAE,uBAAuB,CAAC,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE;aAC1E,CAAC;SACF,CAAC,CAAC;QAEH,MAAM,gBAAgB,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC;QAEtF,KAAK,MAAM,EAAE,UAAU,EAAE,IAAI,oBAAoB,EAAE,CAAC;YACnD,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QAC7D,CAAC;QAED,KAAK,MAAM,UAAU,IAAI,gBAAgB,EAAE,CAAC;YAC3C,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;QACnE,CAAC;QAED,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAC7D,MAAM,GAAG,CAAC,MAAM,CAAC,4BAAY,EAAE,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;YAC5D,MAAM,GAAG,CAAC,MAAM,CAAC,iBAAO,EAAE,EAAE,EAAE,EAAE,uBAAuB,CAAC,EAAE,EAAE,CAAC,CAAC;YAC9D,MAAM,GAAG,CAAC,MAAM,CAAC,WAAI,EAAE,EAAE,EAAE,EAAE,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,EAAE;YACtC,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,SAAS,EAAE,KAAK;YAChB,mBAAmB,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;YAClE,YAAY,EAAE,UAAU;YACxB,iBAAiB,EAAE,UAAU,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,aAAa;YAC/D,eAAe,EAAE,YAAY;SAC7B,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAE9F,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;IAKK,AAAN,KAAK,CAAC,gBAAgB,CACrB,GAAyB,EACzB,CAAW,EACL,OAA6B,EACtB,EAAU;QAEvB,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,iBAAiB,EAAE,GACtD,iBAAe,CAAC,cAAc,CAAC,WAAW,CAAC;QAE5C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC/D,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;YACzB,MAAM,IAAI,+BAAa,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC;QAED,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,IAAI,UAAU,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YAC5E,MAAM,IAAI,gCAAc,CAAC,iBAAiB,CAAC,CAAC;QAC7C,CAAC;QAED,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,IAAI,UAAU,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YAC5E,MAAM,IAAI,gCAAc,CAAC,iBAAiB,CAAC,CAAC;QAC7C,CAAC;QAED,MAAM,IAAI,CAAC,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"users.controller.js","sourceRoot":"","sources":["../../src/controllers/users.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ export declare class CredentialsHelper extends ICredentialsHelper {
|
|
|
21
21
|
getCredentials(nodeCredential: INodeCredentialsDetails, type: string): Promise<Credentials>;
|
|
22
22
|
getCredentialsProperties(type: string): INodeProperties[];
|
|
23
23
|
getDecrypted(additionalData: IWorkflowExecuteAdditionalData, nodeCredentials: INodeCredentialsDetails, type: string, mode: WorkflowExecuteMode, executeData?: IExecuteData, raw?: boolean, expressionResolveValues?: ICredentialsExpressionResolveValues): Promise<ICredentialDataDecryptedObject>;
|
|
24
|
-
applyDefaultsAndOverwrites(additionalData: IWorkflowExecuteAdditionalData, decryptedDataOriginal: ICredentialDataDecryptedObject, type: string, mode: WorkflowExecuteMode, executeData?: IExecuteData, expressionResolveValues?: ICredentialsExpressionResolveValues
|
|
24
|
+
applyDefaultsAndOverwrites(additionalData: IWorkflowExecuteAdditionalData, decryptedDataOriginal: ICredentialDataDecryptedObject, credential: INodeCredentialsDetails, type: string, mode: WorkflowExecuteMode, executeData?: IExecuteData, expressionResolveValues?: ICredentialsExpressionResolveValues): Promise<ICredentialDataDecryptedObject>;
|
|
25
25
|
updateCredentials(nodeCredentials: INodeCredentialsDetails, type: string, data: ICredentialDataDecryptedObject): Promise<void>;
|
|
26
26
|
credentialCanUseExternalSecrets(nodeCredential: INodeCredentialsDetails): Promise<boolean>;
|
|
27
27
|
}
|
|
@@ -184,18 +184,18 @@ let CredentialsHelper = class CredentialsHelper extends n8n_workflow_1.ICredenti
|
|
|
184
184
|
return decryptedDataOriginal;
|
|
185
185
|
}
|
|
186
186
|
await additionalData?.secretsHelpers?.waitForInit();
|
|
187
|
-
|
|
188
|
-
return this.applyDefaultsAndOverwrites(additionalData, decryptedDataOriginal, type, mode, executeData, expressionResolveValues, canUseSecrets);
|
|
187
|
+
return await this.applyDefaultsAndOverwrites(additionalData, decryptedDataOriginal, nodeCredentials, type, mode, executeData, expressionResolveValues);
|
|
189
188
|
}
|
|
190
|
-
applyDefaultsAndOverwrites(additionalData, decryptedDataOriginal, type, mode, executeData, expressionResolveValues
|
|
189
|
+
async applyDefaultsAndOverwrites(additionalData, decryptedDataOriginal, credential, type, mode, executeData, expressionResolveValues) {
|
|
191
190
|
const credentialsProperties = this.getCredentialsProperties(type);
|
|
192
191
|
const dataWithOverwrites = this.credentialsOverwrites.applyOverwrite(type, decryptedDataOriginal);
|
|
193
192
|
let decryptedData = n8n_workflow_1.NodeHelpers.getNodeParameters(credentialsProperties, dataWithOverwrites, true, false, null, null);
|
|
194
193
|
if (decryptedDataOriginal.oauthTokenData !== undefined) {
|
|
195
194
|
decryptedData.oauthTokenData = decryptedDataOriginal.oauthTokenData;
|
|
196
195
|
}
|
|
196
|
+
const canUseExternalSecrets = await this.credentialCanUseExternalSecrets(credential);
|
|
197
197
|
const additionalKeys = (0, n8n_core_1.getAdditionalKeys)(additionalData, mode, null, {
|
|
198
|
-
secretsEnabled:
|
|
198
|
+
secretsEnabled: canUseExternalSecrets,
|
|
199
199
|
});
|
|
200
200
|
if (expressionResolveValues) {
|
|
201
201
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials-helper.js","sourceRoot":"","sources":["../src/credentials-helper.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"credentials-helper.js","sourceRoot":"","sources":["../src/credentials-helper.ts"],"names":[],"mappings":";;;;;;;;;;;;AAweA,wFASC;AA7eD,gCAAkC;AAElC,0CAAkC;AAClC,uCAA0D;AAqB1D,+CAA0F;AAE1F,yDAAqD;AACrD,qEAAiE;AAEjE,4FAAwF;AACxF,0GAAqG;AAGrG,2CAAsD;AACtD,oFAA8E;AAC9E,kEAA8D;AAE9D,MAAM,QAAQ,GAAG;IAChB,IAAI,EAAE,EAAE;IACR,WAAW,EAAE,CAAC;IACd,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IAChB,UAAU,EAAE,EAAqB;CACxB,CAAC;AAEX,MAAM,aAAa,GAAkB;IACpC,IAAI,EAAE;QACL,UAAU,EAAE,EAAE;QACd,IAAI,EAAE;YACL,WAAW,EAAE,EAAE,UAAU,EAAE,EAAuB,EAAE;SACvC;KACd;CACD,CAAC;AAEF,MAAM,aAAa,GAAe;IACjC,aAAa;QACZ,OAAO,EAAE,CAAC;IACX,CAAC;IACD,SAAS,CAAC,QAAgB;QACzB,OAAO,aAAa,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC;IACtC,CAAC;IACD,mBAAmB,CAAC,QAAgB,EAAE,OAAgB;QACrD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,8BAAe,CAAC,mCAAuB,CAAC,OAAO,EAAE;gBAC1D,IAAI,EAAE,EAAE,QAAQ,EAAE;aAClB,CAAC,CAAC;QACJ,CAAC;QACD,OAAO,0BAAW,CAAC,oBAAoB,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAChF,CAAC;CACD,CAAC;AAGK,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,iCAAkB;IACxD,YACkB,eAAgC,EAChC,qBAA4C,EAC5C,qBAA4C,EAC5C,2BAAwD,EACxD,YAA0B;QAE3C,KAAK,EAAE,CAAC;QANS,oBAAe,GAAf,eAAe,CAAiB;QAChC,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,gCAA2B,GAA3B,2BAA2B,CAA6B;QACxD,iBAAY,GAAZ,YAAY,CAAc;IAG5C,CAAC;IAKD,KAAK,CAAC,YAAY,CACjB,WAA2C,EAC3C,QAAgB,EAChB,sBAAuE,EACvE,QAAkB,EAClB,IAAW;QAEX,MAAM,cAAc,GAAG,sBAAsB,CAAC;QAC9C,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAEhE,IAAI,cAAc,CAAC,YAAY,EAAE,CAAC;YACjC,IAAI,OAAO,cAAc,CAAC,YAAY,KAAK,UAAU,EAAE,CAAC;gBAGvD,OAAO,MAAM,cAAc,CAAC,YAAY,CACvC,WAAW,EACX,cAAqC,CACrC,CAAC;YACH,CAAC;YAED,IAAI,OAAO,cAAc,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;gBAGrD,IAAI,WAAmB,CAAC;gBACxB,IAAI,aAAqB,CAAC;gBAC1B,MAAM,EAAE,YAAY,EAAE,GAAG,cAAc,CAAC;gBACxC,IAAI,cAAc,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;oBAC1C,cAAc,CAAC,OAAO,GAAG,EAAE,CAAC;gBAC7B,CAAC;gBAED,IAAI,YAAY,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBACrC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,EAAE;wBAC1E,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;4BACnD,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;4BAEpF,aAAa,GAAG,IAAI,CAAC,YAAY,CAChC,KAAe,EACf,EAAE,YAAY,EAAE,WAAW,EAAE,EAC7B,QAAQ,EACR,IAAI,CACJ,CAAC;4BAGF,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;gCAE/B,cAAc,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;4BAC/B,CAAC;4BAED,cAAc,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,GAAG,aAAa,CAAC;wBACvD,CAAC,CAAC,CAAC;oBACJ,CAAC,CAAC,CAAC;gBACJ,CAAC;YACF,CAAC;QACF,CAAC;QAED,OAAO,cAAqC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,iBAAiB,CACtB,OAA2B,EAC3B,WAA2C,EAC3C,QAAgB,EAChB,IAAW,EACX,kBAA2B;QAE3B,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAEhE,MAAM,iBAAiB,GAAG,cAAc,CAAC,UAAU,CAAC,IAAI,CACvD,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,QAAQ,IAAI,QAAQ,EAAE,WAAW,EAAE,SAAS,KAAK,IAAI,CACrF,CAAC;QAEF,IAAI,iBAAiB,EAAE,IAAI,KAAK,SAAS,EAAE,CAAC;YAC3C,OAAO,SAAS,CAAC;QAClB,CAAC;QAID,MAAM,oBAAoB,GACzB,IAAI,EAAE,UAAU,EAAE,IAAI,KAAK,EAAE,IAAI,IAAI,EAAE,IAAI,KAAK,qBAAqB,CAAC;QAEvE,IAAI,cAAc,CAAC,iBAAiB,EAAE,CAAC;YACtC,IAAI,OAAO,cAAc,CAAC,iBAAiB,KAAK,UAAU,EAAE,CAAC;gBAI5D,IACC,WAAW,CAAC,iBAAiB,EAAE,IAAI,CAAC,KAAK,EAAE;oBAC3C,kBAAkB;oBAClB,oBAAoB,EACnB,CAAC;oBACF,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;oBAKjF,IAAI,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;wBAClD,OAAO,SAAS,CAAC;oBAClB,CAAC;oBAED,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;wBACtB,MAAM,IAAI,CAAC,iBAAiB,CAC3B,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,EACrC,cAAc,CAAC,IAAI,EACnB,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAClC,CAAC;wBACF,OAAO,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;oBAC3C,CAAC;gBACF,CAAC;YACF,CAAC;QACF,CAAC;QACD,OAAO,SAAS,CAAC;IAClB,CAAC;IAKO,YAAY,CACnB,cAAsB,EACtB,cAAgD,EAChD,QAAkB,EAClB,IAAW;QAEX,IAAI,OAAO,cAAc,KAAK,QAAQ,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YAC5E,OAAO,cAAc,CAAC;QACvB,CAAC;QAED,MAAM,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAC9D,IAAI,EACJ,cAAc,EACd,UAAU,EACV,cAAc,EACd,SAAS,EACT,EAAE,CACF,CAAC;QAEF,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,OAAO,EAAE,CAAC;QACX,CAAC;QAED,OAAO,WAAW,CAAC,QAAQ,EAAE,CAAC;IAC/B,CAAC;IAKD,cAAc,CAAC,QAAgB;QAC9B,OAAO,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IACtD,CAAC;IAKD,KAAK,CAAC,cAAc,CACnB,cAAuC,EACvC,IAAY;QAEZ,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC;YACxB,MAAM,IAAI,8BAAe,CAAC,8BAA8B,EAAE;gBACzD,KAAK,EAAE,EAAE,cAAc,EAAE,cAAc,CAAC,IAAI,EAAE;gBAC9C,IAAI,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE;aAC9B,CAAC,CAAC;QACJ,CAAC;QAED,IAAI,UAA6B,CAAC;QAElC,IAAI,CAAC;YACJ,UAAU,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC;gBAC7D,EAAE,EAAE,cAAc,CAAC,EAAE;gBACrB,IAAI;aACJ,CAAC,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,oDAAuB,CAAC,cAAc,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC5D,CAAC;QAED,OAAO,IAAI,sBAAW,CACrB,EAAE,EAAE,EAAE,UAAU,CAAC,EAAE,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,EAC5C,UAAU,CAAC,IAAI,EACf,UAAU,CAAC,IAAI,CACf,CAAC;IACH,CAAC;IAKD,wBAAwB,CAAC,IAAY;QACpC,MAAM,kBAAkB,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAEhE,IAAI,kBAAkB,KAAK,SAAS,EAAE,CAAC;YACtC,MAAM,IAAI,8BAAe,CAAC,yBAAyB,EAAE,EAAE,IAAI,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QAC1F,CAAC;QAED,IAAI,kBAAkB,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAG9C,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC/C,OAAO;oBACN,GAAG,kBAAkB,CAAC,UAAU;oBAChC;wBACC,WAAW,EAAE,gBAAgB;wBAC7B,IAAI,EAAE,gBAAgB;wBACtB,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,KAAK;wBACf,OAAO,EAAE,EAAE;qBACX;iBACD,CAAC;YACH,CAAC;YAED,OAAO,kBAAkB,CAAC,UAAU,CAAC;QACtC,CAAC;QAED,MAAM,iBAAiB,GAAG,EAAuB,CAAC;QAClD,KAAK,MAAM,mBAAmB,IAAI,kBAAkB,CAAC,OAAO,EAAE,CAAC;YAC9D,MAAM,yBAAyB,GAAG,IAAI,CAAC,wBAAwB,CAAC,mBAAmB,CAAC,CAAC;YACrF,0BAAW,CAAC,mBAAmB,CAAC,iBAAiB,EAAE,yBAAyB,CAAC,CAAC;QAC/E,CAAC;QAGD,0BAAW,CAAC,mBAAmB,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAElF,OAAO,iBAAiB,CAAC;IAC1B,CAAC;IAKD,KAAK,CAAC,YAAY,CACjB,cAA8C,EAC9C,eAAwC,EACxC,IAAY,EACZ,IAAyB,EACzB,WAA0B,EAC1B,GAAa,EACb,uBAA6D;QAE7D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QACrE,MAAM,qBAAqB,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC;QAEpD,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YAClB,OAAO,qBAAqB,CAAC;QAC9B,CAAC;QAED,MAAM,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC;QAEpD,OAAO,MAAM,IAAI,CAAC,0BAA0B,CAC3C,cAAc,EACd,qBAAqB,EACrB,eAAe,EACf,IAAI,EACJ,IAAI,EACJ,WAAW,EACX,uBAAuB,CACvB,CAAC;IACH,CAAC;IAKD,KAAK,CAAC,0BAA0B,CAC/B,cAA8C,EAC9C,qBAAqD,EACrD,UAAmC,EACnC,IAAY,EACZ,IAAyB,EACzB,WAA0B,EAC1B,uBAA6D;QAE7D,MAAM,qBAAqB,GAAG,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAGlE,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,cAAc,CACnE,IAAI,EACJ,qBAAqB,CACrB,CAAC;QAGF,IAAI,aAAa,GAAG,0BAAW,CAAC,iBAAiB,CAChD,qBAAqB,EACrB,kBAAqC,EACrC,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,IAAI,CAC8B,CAAC;QAEpC,IAAI,qBAAqB,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YAGxD,aAAa,CAAC,cAAc,GAAG,qBAAqB,CAAC,cAAc,CAAC;QACrE,CAAC;QAED,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,+BAA+B,CAAC,UAAU,CAAC,CAAC;QACrF,MAAM,cAAc,GAAG,IAAA,4BAAiB,EAAC,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE;YACpE,cAAc,EAAE,qBAAqB;SACrC,CAAC,CAAC;QAEH,IAAI,uBAAuB,EAAE,CAAC;YAC7B,IAAI,CAAC;gBACJ,aAAa,GAAG,uBAAuB,CAAC,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAC5E,aAAgC,EAChC,uBAAuB,CAAC,gBAAgB,EACxC,uBAAuB,CAAC,QAAQ,EAChC,uBAAuB,CAAC,SAAS,EACjC,uBAAuB,CAAC,IAAI,CAAC,IAAI,EACjC,uBAAuB,CAAC,mBAAmB,EAC3C,IAAI,EACJ,cAAc,EACd,WAAW,EACX,KAAK,EACL,aAAa,CACqB,CAAC;YACrC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,CAAC,CAAC,OAAO,IAAI,gCAAgC,CAAC;gBAC9C,MAAM,CAAC,CAAC;YACT,CAAC;QACF,CAAC;aAAM,CAAC;YACP,MAAM,QAAQ,GAAG,IAAI,uBAAQ,CAAC;gBAC7B,KAAK,EAAE,CAAC,QAAQ,CAAC;gBACjB,WAAW,EAAE,EAAE;gBACf,MAAM,EAAE,KAAK;gBACb,SAAS,EAAE,aAAa;aACxB,CAAC,CAAC;YAGH,aAAa,GAAG,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAC3D,QAAQ,EACR,aAAgC,EAChC,IAAI,EACJ,cAAc,EACd,SAAS,EACT,SAAS,EACT,aAAa,CACqB,CAAC;QACrC,CAAC;QAED,OAAO,aAAa,CAAC;IACtB,CAAC;IAKD,KAAK,CAAC,iBAAiB,CACtB,eAAwC,EACxC,IAAY,EACZ,IAAoC;QAEpC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAErE,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1B,MAAM,kBAAkB,GAAG,WAAW,CAAC,aAAa,EAAoB,CAAC;QAGzE,kBAAkB,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;QAG1C,MAAM,SAAS,GAAG;YACjB,EAAE,EAAE,WAAW,CAAC,EAAE;YAClB,IAAI;SACJ,CAAC;QAEF,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,+BAA+B,CAAC,cAAuC;QAC5E,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC;YACxB,OAAO,KAAK,CAAC;QACd,CAAC;QAED,OAAO,CACN,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,8BAA8B,cAAc,CAAC,EAAE,EAAE,EAAE;YAC/E,SAAS,EAAE,KAAK,IAAI,EAAE;gBACrB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC;oBACjE,KAAK,EAAE;wBACN,IAAI,EAAE,kBAAkB;wBACxB,OAAO,EAAE;4BACR,gBAAgB,EAAE;gCACjB,IAAI,EAAE,IAAA,YAAE,EAAC,CAAC,uBAAuB,EAAE,eAAe,CAAC,CAAC;gCACpD,IAAI,EAAE;oCACL,IAAI,EAAE,IAAA,YAAE,EAAC,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;iCAC1C;6BACD;yBACD;wBACD,WAAW,EAAE;4BACZ,EAAE,EAAE,cAAc,CAAC,EAAG;yBACtB;qBACD;iBACD,CAAC,CAAC;gBAEH,IAAI,CAAC,UAAU,EAAE,CAAC;oBACjB,OAAO,KAAK,CAAC;gBACd,CAAC;gBAED,OAAO,IAAI,CAAC;YACb,CAAC;SACD,CAAC,CAAC,IAAI,KAAK,CACZ,CAAC;IACH,CAAC;CACD,CAAA;AA1ZY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,YAAO,GAAE;qCAG0B,kCAAe;QACT,8CAAqB;QACrB,8CAAqB;QACf,2DAA2B;QAC1C,4BAAY;GANhC,iBAAiB,CA0Z7B;AAED,SAAgB,sCAAsC,CACrD,UAA0B,EAC1B,OAAO,GAAG,KAAK;IAEf,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;IAC5C,IAAI,OAAO,EAAE,CAAC;QACb,OAAO,IAAI,sBAAW,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;IAClD,CAAC;IACD,OAAO,IAAI,sBAAW,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAClD,CAAC"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import type { ApiKeyScope } from '@n8n/permissions';
|
|
1
2
|
import { WithTimestampsAndStringId } from './abstract-entity';
|
|
2
3
|
import { User } from './user';
|
|
3
4
|
export declare class ApiKey extends WithTimestampsAndStringId {
|
|
4
5
|
user: User;
|
|
5
6
|
userId: string;
|
|
6
7
|
label: string;
|
|
8
|
+
scopes: ApiKeyScope[];
|
|
7
9
|
apiKey: string;
|
|
8
10
|
}
|
|
@@ -28,6 +28,10 @@ __decorate([
|
|
|
28
28
|
(0, typeorm_1.Column)({ type: String }),
|
|
29
29
|
__metadata("design:type", String)
|
|
30
30
|
], ApiKey.prototype, "label", void 0);
|
|
31
|
+
__decorate([
|
|
32
|
+
(0, typeorm_1.Column)({ type: abstract_entity_1.jsonColumnType, nullable: false }),
|
|
33
|
+
__metadata("design:type", Array)
|
|
34
|
+
], ApiKey.prototype, "scopes", void 0);
|
|
31
35
|
__decorate([
|
|
32
36
|
(0, typeorm_1.Index)({ unique: true }),
|
|
33
37
|
(0, typeorm_1.Column)({ type: String }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-key.js","sourceRoot":"","sources":["../../../src/databases/entities/api-key.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"api-key.js","sourceRoot":"","sources":["../../../src/databases/entities/api-key.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,0CAAwE;AAExE,uDAA8E;AAC9E,iCAA8B;AAIvB,IAAM,MAAM,GAAZ,MAAM,MAAO,SAAQ,2CAAyB;CAoBpD,CAAA;AApBY,wBAAM;AAMlB;IALC,IAAA,mBAAS,EACT,GAAG,EAAE,CAAC,WAAI,EACV,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,EACjB,EAAE,QAAQ,EAAE,SAAS,EAAE,CACvB;8BACK,WAAI;oCAAC;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;sCACV;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;qCACX;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,gCAAc,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;sCAC5B;AAItB;IAFC,IAAA,eAAK,EAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACvB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;sCACV;iBAnBH,MAAM;IAFlB,IAAA,gBAAM,EAAC,eAAe,CAAC;IACvB,IAAA,gBAAM,EAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;GACf,MAAM,CAoBlB"}
|
|
@@ -22,7 +22,7 @@ __decorate([
|
|
|
22
22
|
__metadata("design:type", String)
|
|
23
23
|
], Folder.prototype, "name", void 0);
|
|
24
24
|
__decorate([
|
|
25
|
-
(0, typeorm_1.Column)({ nullable: true
|
|
25
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
26
26
|
__metadata("design:type", Object)
|
|
27
27
|
], Folder.prototype, "parentFolderId", void 0);
|
|
28
28
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"folder.js","sourceRoot":"","sources":["../../../src/databases/entities/folder.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAQsB;AAEtB,uDAA8D;AAC9D,uCAAoC;AACpC,6CAAyC;AASlC,IAAM,MAAM,GAAZ,MAAM,MAAO,SAAQ,2CAAyB;CAqCpD,CAAA;AArCY,wBAAM;AAElB;IADC,IAAA,gBAAM,GAAE;;oCACI;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"folder.js","sourceRoot":"","sources":["../../../src/databases/entities/folder.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAQsB;AAEtB,uDAA8D;AAC9D,uCAAoC;AACpC,6CAAyC;AASlC,IAAM,MAAM,GAAZ,MAAM,MAAO,SAAQ,2CAAyB;CAqCpD,CAAA;AArCY,wBAAM;AAElB;IADC,IAAA,gBAAM,GAAE;;oCACI;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACG;AAI9B;IAFC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAChE,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;;4CACX;AAM5B;IAJC,IAAA,mBAAS,EACT,GAAG,EAAE,CAAC,MAAM,EACZ,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAC/B;;0CACoB;AAIrB;IAFC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,iBAAO,CAAC;IACxB,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;8BACrB,iBAAO;2CAAC;AAGrB;IADC,IAAA,mBAAS,EAAC,gBAAgB,EAAE,cAAc,CAAC;;yCAChB;AAc5B;IAZC,IAAA,oBAAU,EAAC,GAAG,EAAE,CAAC,sBAAS,CAAC;IAC3B,IAAA,mBAAS,EAAC;QACV,IAAI,EAAE,YAAY;QAClB,UAAU,EAAE;YACX,IAAI,EAAE,UAAU;YAChB,oBAAoB,EAAE,IAAI;SAC1B;QACD,iBAAiB,EAAE;YAClB,IAAI,EAAE,OAAO;YACb,oBAAoB,EAAE,IAAI;SAC1B;KACD,CAAC;;oCACgB;iBApCN,MAAM;IADlB,IAAA,gBAAM,GAAE;GACI,MAAM,CAqClB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type ScopeOptions, type Scope } from '@n8n/permissions';
|
|
1
|
+
import { type ScopeOptions, type Scope, GlobalRole } from '@n8n/permissions';
|
|
2
2
|
import type { IUser, IUserSettings } from 'n8n-workflow';
|
|
3
3
|
import type { IPersonalizationSurveyAnswers } from '../../interfaces';
|
|
4
4
|
import { WithTimestamps } from './abstract-entity';
|
|
@@ -7,8 +7,6 @@ import type { AuthIdentity } from './auth-identity';
|
|
|
7
7
|
import type { ProjectRelation } from './project-relation';
|
|
8
8
|
import type { SharedCredentials } from './shared-credentials';
|
|
9
9
|
import type { SharedWorkflow } from './shared-workflow';
|
|
10
|
-
export type GlobalRole = 'global:owner' | 'global:admin' | 'global:member';
|
|
11
|
-
export type AssignableRole = Exclude<GlobalRole, 'global:owner'>;
|
|
12
10
|
export declare class User extends WithTimestamps implements IUser {
|
|
13
11
|
id: string;
|
|
14
12
|
email: string;
|
|
@@ -113,7 +113,7 @@ __decorate([
|
|
|
113
113
|
__metadata("design:type", Object)
|
|
114
114
|
], User.prototype, "settings", void 0);
|
|
115
115
|
__decorate([
|
|
116
|
-
(0, typeorm_1.Column)(),
|
|
116
|
+
(0, typeorm_1.Column)({ type: String }),
|
|
117
117
|
__metadata("design:type", String)
|
|
118
118
|
], User.prototype, "role", void 0);
|
|
119
119
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/databases/entities/user.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/databases/entities/user.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { MigrationContext, ReversibleMigration } from '../../../databases/types';
|
|
2
|
+
export declare class AddScopesColumnToApiKeys1742918400000 implements ReversibleMigration {
|
|
3
|
+
up({ runQuery, escape, queryRunner, schemaBuilder: { addColumns, column }, }: MigrationContext): Promise<void>;
|
|
4
|
+
down({ schemaBuilder: { dropColumns } }: MigrationContext): Promise<void>;
|
|
5
|
+
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AddScopesColumnToApiKeys1742918400000 = void 0;
|
|
4
|
+
const api_key_1 = require("../../../databases/entities/api-key");
|
|
5
|
+
const permissions_ee_1 = require("../../../public-api/permissions.ee");
|
|
6
|
+
class AddScopesColumnToApiKeys1742918400000 {
|
|
7
|
+
async up({ runQuery, escape, queryRunner, schemaBuilder: { addColumns, column }, }) {
|
|
8
|
+
await addColumns('user_api_keys', [column('scopes').json]);
|
|
9
|
+
const userApiKeysTable = escape.tableName('user_api_keys');
|
|
10
|
+
const userTable = escape.tableName('user');
|
|
11
|
+
const idColumn = escape.columnName('id');
|
|
12
|
+
const userIdColumn = escape.columnName('userId');
|
|
13
|
+
const roleColumn = escape.columnName('role');
|
|
14
|
+
const apiKeysWithRoles = await runQuery(`SELECT ${userApiKeysTable}.${idColumn} AS id, ${userTable}.${roleColumn} AS role FROM ${userApiKeysTable} JOIN ${userTable} ON ${userTable}.${idColumn} = ${userApiKeysTable}.${userIdColumn}`);
|
|
15
|
+
for (const { id, role } of apiKeysWithRoles) {
|
|
16
|
+
const scopes = (0, permissions_ee_1.getApiKeyScopesForRole)(role);
|
|
17
|
+
await queryRunner.manager.update(api_key_1.ApiKey, { id }, { scopes });
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
async down({ schemaBuilder: { dropColumns } }) {
|
|
21
|
+
await dropColumns('user_api_keys', ['scopes']);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
exports.AddScopesColumnToApiKeys1742918400000 = AddScopesColumnToApiKeys1742918400000;
|
|
25
|
+
//# sourceMappingURL=1742918400000-AddScopesColumnToApiKeys.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"1742918400000-AddScopesColumnToApiKeys.js","sourceRoot":"","sources":["../../../../src/databases/migrations/common/1742918400000-AddScopesColumnToApiKeys.ts"],"names":[],"mappings":";;;AAEA,0DAAsD;AAEtD,gEAAqE;AAIrE,MAAa,qCAAqC;IACjD,KAAK,CAAC,EAAE,CAAC,EACR,QAAQ,EACR,MAAM,EACN,WAAW,EACX,aAAa,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,GACnB;QAClB,MAAM,UAAU,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAE3D,MAAM,gBAAgB,GAAG,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAE7C,MAAM,gBAAgB,GAAG,MAAM,QAAQ,CACtC,UAAU,gBAAgB,IAAI,QAAQ,WAAW,SAAS,IAAI,UAAU,iBAAiB,gBAAgB,SAAS,SAAS,OAAO,SAAS,IAAI,QAAQ,MAAM,gBAAgB,IAAI,YAAY,EAAE,CAC/L,CAAC;QAEF,KAAK,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,gBAAgB,EAAE,CAAC;YAC7C,MAAM,MAAM,GAAG,IAAA,uCAAsB,EAAC,IAAI,CAAC,CAAC;YAC5C,MAAM,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAM,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAC9D,CAAC;IACF,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EAAE,aAAa,EAAE,EAAE,WAAW,EAAE,EAAoB;QAC9D,MAAM,WAAW,CAAC,eAAe,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAChD,CAAC;CACD;AA5BD,sFA4BC"}
|
|
@@ -84,6 +84,7 @@ const _1737715421462_AddErrorColumnsToTestRuns_1 = require("../common/1737715421
|
|
|
84
84
|
const _1738709609940_CreateFolderTable_1 = require("../common/1738709609940-CreateFolderTable");
|
|
85
85
|
const _1739549398681_CreateAnalyticsTables_1 = require("../common/1739549398681-CreateAnalyticsTables");
|
|
86
86
|
const _1741167584277_RenameAnalyticsToInsights_1 = require("../common/1741167584277-RenameAnalyticsToInsights");
|
|
87
|
+
const _1742918400000_AddScopesColumnToApiKeys_1 = require("../common/1742918400000-AddScopesColumnToApiKeys");
|
|
87
88
|
const _1740445074052_UpdateParentFolderIdColumn_1 = require("../mysqldb/1740445074052-UpdateParentFolderIdColumn");
|
|
88
89
|
exports.mysqlMigrations = [
|
|
89
90
|
_1588157391238_InitialMigration_1.InitialMigration1588157391238,
|
|
@@ -170,5 +171,6 @@ exports.mysqlMigrations = [
|
|
|
170
171
|
_1739549398681_CreateAnalyticsTables_1.CreateAnalyticsTables1739549398681,
|
|
171
172
|
_1740445074052_UpdateParentFolderIdColumn_1.UpdateParentFolderIdColumn1740445074052,
|
|
172
173
|
_1741167584277_RenameAnalyticsToInsights_1.RenameAnalyticsToInsights1741167584277,
|
|
174
|
+
_1742918400000_AddScopesColumnToApiKeys_1.AddScopesColumnToApiKeys1742918400000,
|
|
173
175
|
];
|
|
174
176
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/databases/migrations/mysqldb/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/databases/migrations/mysqldb/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,6 +84,7 @@ const _1737715421462_AddErrorColumnsToTestRuns_1 = require("../common/1737715421
|
|
|
84
84
|
const _1738709609940_CreateFolderTable_1 = require("../common/1738709609940-CreateFolderTable");
|
|
85
85
|
const _1739549398681_CreateAnalyticsTables_1 = require("../common/1739549398681-CreateAnalyticsTables");
|
|
86
86
|
const _1741167584277_RenameAnalyticsToInsights_1 = require("../common/1741167584277-RenameAnalyticsToInsights");
|
|
87
|
+
const _1742918400000_AddScopesColumnToApiKeys_1 = require("../common/1742918400000-AddScopesColumnToApiKeys");
|
|
87
88
|
exports.postgresMigrations = [
|
|
88
89
|
_1587669153312_InitialMigration_1.InitialMigration1587669153312,
|
|
89
90
|
_1589476000887_WebhookModel_1.WebhookModel1589476000887,
|
|
@@ -168,5 +169,6 @@ exports.postgresMigrations = [
|
|
|
168
169
|
_1739549398681_CreateAnalyticsTables_1.CreateAnalyticsTables1739549398681,
|
|
169
170
|
_1740445074052_UpdateParentFolderIdColumn_1.UpdateParentFolderIdColumn1740445074052,
|
|
170
171
|
_1741167584277_RenameAnalyticsToInsights_1.RenameAnalyticsToInsights1741167584277,
|
|
172
|
+
_1742918400000_AddScopesColumnToApiKeys_1.AddScopesColumnToApiKeys1742918400000,
|
|
171
173
|
];
|
|
172
174
|
//# sourceMappingURL=index.js.map
|