n8n 1.44.2 → 1.45.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/Interfaces.d.ts +0 -1
- package/dist/Interfaces.js.map +1 -1
- package/dist/Mfa/mfa.service.d.ts +6 -7
- package/dist/Mfa/mfa.service.js +35 -34
- package/dist/Mfa/mfa.service.js.map +1 -1
- package/dist/Queue.js +1 -1
- package/dist/Queue.js.map +1 -1
- package/dist/ResponseHelper.d.ts +0 -3
- package/dist/ResponseHelper.js +1 -10
- package/dist/ResponseHelper.js.map +1 -1
- package/dist/Server.js +2 -13
- package/dist/Server.js.map +1 -1
- package/dist/WaitingWebhooks.d.ts +1 -3
- package/dist/WaitingWebhooks.js +2 -5
- package/dist/WaitingWebhooks.js.map +1 -1
- package/dist/WorkflowRunner.js +0 -21
- package/dist/WorkflowRunner.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/import/credentials.d.ts +0 -1
- package/dist/commands/import/credentials.js +0 -5
- package/dist/commands/import/credentials.js.map +1 -1
- package/dist/commands/import/workflow.d.ts +0 -1
- package/dist/commands/import/workflow.js +0 -6
- package/dist/commands/import/workflow.js.map +1 -1
- package/dist/commands/mfa/disable.js +4 -3
- package/dist/commands/mfa/disable.js.map +1 -1
- package/dist/commands/worker.js +1 -1
- package/dist/commands/worker.js.map +1 -1
- package/dist/constants.d.ts +1 -0
- package/dist/constants.js +7 -1
- package/dist/constants.js.map +1 -1
- package/dist/controllers/auth.controller.d.ts +0 -2
- package/dist/controllers/auth.controller.js +2 -27
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/curl.controller.d.ts +9 -0
- package/dist/controllers/curl.controller.js +41 -0
- package/dist/controllers/curl.controller.js.map +1 -0
- package/dist/controllers/invitation.controller.js +1 -1
- package/dist/controllers/invitation.controller.js.map +1 -1
- package/dist/controllers/oauth/oAuth2Credential.controller.js +2 -7
- package/dist/controllers/oauth/oAuth2Credential.controller.js.map +1 -1
- package/dist/controllers/passwordReset.controller.js +1 -1
- package/dist/controllers/passwordReset.controller.js.map +1 -1
- package/dist/controllers/tags.controller.d.ts +1 -1
- package/dist/controllers/tags.controller.js +1 -1
- package/dist/controllers/tags.controller.js.map +1 -1
- package/dist/controllers/users.controller.js +0 -1
- package/dist/controllers/users.controller.js.map +1 -1
- package/dist/credentials/credentials.controller.d.ts +1 -0
- package/dist/credentials/credentials.controller.js +12 -0
- package/dist/credentials/credentials.controller.js.map +1 -1
- package/dist/credentials/credentials.service.ee.d.ts +8 -4
- package/dist/credentials/credentials.service.ee.js +33 -2
- package/dist/credentials/credentials.service.ee.js.map +1 -1
- package/dist/databases/entities/AuthUser.d.ts +7 -0
- package/dist/databases/entities/AuthUser.js +40 -0
- package/dist/databases/entities/AuthUser.js.map +1 -0
- package/dist/databases/entities/Project.js +1 -1
- package/dist/databases/entities/Project.js.map +1 -1
- package/dist/databases/entities/User.d.ts +1 -3
- package/dist/databases/entities/User.js +1 -9
- package/dist/databases/entities/User.js.map +1 -1
- package/dist/databases/entities/index.d.ts +2 -0
- package/dist/databases/entities/index.js +2 -0
- package/dist/databases/entities/index.js.map +1 -1
- package/dist/databases/repositories/authUser.repository.d.ts +5 -0
- package/dist/databases/repositories/authUser.repository.js +26 -0
- package/dist/databases/repositories/authUser.repository.js.map +1 -0
- package/dist/databases/repositories/user.repository.js.map +1 -1
- package/dist/decorators/Route.d.ts +2 -1
- package/dist/decorators/Route.js +2 -2
- package/dist/decorators/Route.js.map +1 -1
- package/dist/decorators/registerController.js +4 -4
- package/dist/decorators/registerController.js.map +1 -1
- package/dist/decorators/types.d.ts +5 -1
- package/dist/environments/sourceControl/middleware/sourceControlEnabledMiddleware.ee.js +2 -2
- package/dist/environments/sourceControl/middleware/sourceControlEnabledMiddleware.ee.js.map +1 -1
- package/dist/errors/response-errors/not-found.error.d.ts +1 -0
- package/dist/errors/response-errors/not-found.error.js +5 -0
- package/dist/errors/response-errors/not-found.error.js.map +1 -1
- package/dist/errors/response-errors/transfer-credential.error.d.ts +4 -0
- package/dist/errors/response-errors/transfer-credential.error.js +11 -0
- package/dist/errors/response-errors/transfer-credential.error.js.map +1 -0
- package/dist/errors/response-errors/transfer-workflow.error.d.ts +4 -0
- package/dist/errors/response-errors/transfer-workflow.error.js +11 -0
- package/dist/errors/response-errors/transfer-workflow.error.js.map +1 -0
- package/dist/eventbus/middleware/logStreamingEnabled.middleware.ee.js +1 -1
- package/dist/eventbus/middleware/logStreamingEnabled.middleware.ee.js.map +1 -1
- package/dist/executions/executions.controller.js +5 -0
- package/dist/executions/executions.controller.js.map +1 -1
- package/dist/middlewares/bodyParser.js +2 -2
- package/dist/middlewares/bodyParser.js.map +1 -1
- package/dist/permissions/global-roles.js +2 -0
- package/dist/permissions/global-roles.js.map +1 -1
- package/dist/permissions/project-roles.js +4 -0
- package/dist/permissions/project-roles.js.map +1 -1
- package/dist/permissions/resource-roles.js +2 -0
- package/dist/permissions/resource-roles.js.map +1 -1
- package/dist/requests.d.ts +6 -6
- package/dist/requests.js.map +1 -1
- package/dist/{CurlConverterHelper.d.ts → services/curl.service.d.ts} +7 -2
- package/dist/services/curl.service.js +336 -0
- package/dist/services/curl.service.js.map +1 -0
- package/dist/services/metrics.service.js +1 -1
- package/dist/services/metrics.service.js.map +1 -1
- package/dist/services/user.service.js +1 -3
- package/dist/services/user.service.js.map +1 -1
- package/dist/utils.d.ts +2 -1
- package/dist/utils.js +4 -2
- package/dist/utils.js.map +1 -1
- package/dist/workflows/workflow.request.d.ts +5 -0
- package/dist/workflows/workflow.service.ee.d.ts +21 -2
- package/dist/workflows/workflow.service.ee.js +63 -2
- package/dist/workflows/workflow.service.ee.js.map +1 -1
- package/dist/workflows/workflows.controller.d.ts +14 -0
- package/dist/workflows/workflows.controller.js +12 -0
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +10 -10
- package/dist/CurlConverterHelper.js +0 -318
- package/dist/CurlConverterHelper.js.map +0 -1
- package/dist/databases/utils/commandHelpers.d.ts +0 -3
- package/dist/databases/utils/commandHelpers.js +0 -11
- package/dist/databases/utils/commandHelpers.js.map +0 -1
|
@@ -0,0 +1,336 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
9
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.CurlService = exports.flattenObject = void 0;
|
|
13
|
+
const typedi_1 = require("typedi");
|
|
14
|
+
const curlconverter_1 = __importDefault(require("curlconverter"));
|
|
15
|
+
const get_1 = __importDefault(require("lodash/get"));
|
|
16
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
17
|
+
var ContentTypes;
|
|
18
|
+
(function (ContentTypes) {
|
|
19
|
+
ContentTypes["applicationJson"] = "application/json";
|
|
20
|
+
ContentTypes["applicationFormUrlEncoded"] = "application/x-www-form-urlencoded";
|
|
21
|
+
ContentTypes["applicationMultipart"] = "multipart/form-data";
|
|
22
|
+
})(ContentTypes || (ContentTypes = {}));
|
|
23
|
+
const SUPPORTED_CONTENT_TYPES = [
|
|
24
|
+
"application/json",
|
|
25
|
+
"application/x-www-form-urlencoded",
|
|
26
|
+
"multipart/form-data",
|
|
27
|
+
];
|
|
28
|
+
const CONTENT_TYPE_KEY = 'content-type';
|
|
29
|
+
const FOLLOW_REDIRECT_FLAGS = ['--location', '-L'];
|
|
30
|
+
const MAX_REDIRECT_FLAG = '--max-redirs';
|
|
31
|
+
const PROXY_FLAGS = ['-x', '--proxy'];
|
|
32
|
+
const INCLUDE_HEADERS_IN_OUTPUT_FLAGS = ['-i', '--include'];
|
|
33
|
+
const REQUEST_FLAGS = ['-X', '--request'];
|
|
34
|
+
const TIMEOUT_FLAGS = ['--connect-timeout'];
|
|
35
|
+
const DOWNLOAD_FILE_FLAGS = ['-O', '-o'];
|
|
36
|
+
const IGNORE_SSL_ISSUES_FLAGS = ['-k', '--insecure'];
|
|
37
|
+
const isContentType = (headers, contentType) => {
|
|
38
|
+
return (0, get_1.default)(headers, CONTENT_TYPE_KEY) === contentType;
|
|
39
|
+
};
|
|
40
|
+
const isJsonRequest = (curlJson) => {
|
|
41
|
+
if (isContentType(curlJson.headers, "application/json"))
|
|
42
|
+
return true;
|
|
43
|
+
if (curlJson.data) {
|
|
44
|
+
const bodyKey = Object.keys(curlJson.data)[0];
|
|
45
|
+
try {
|
|
46
|
+
JSON.parse(bodyKey);
|
|
47
|
+
return true;
|
|
48
|
+
}
|
|
49
|
+
catch {
|
|
50
|
+
return false;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
return false;
|
|
54
|
+
};
|
|
55
|
+
const isFormUrlEncodedRequest = (curlJson) => {
|
|
56
|
+
if (isContentType(curlJson.headers, "application/x-www-form-urlencoded"))
|
|
57
|
+
return true;
|
|
58
|
+
if (curlJson.data && !curlJson.files)
|
|
59
|
+
return true;
|
|
60
|
+
return false;
|
|
61
|
+
};
|
|
62
|
+
const isMultipartRequest = (curlJson) => {
|
|
63
|
+
if (isContentType(curlJson.headers, "multipart/form-data"))
|
|
64
|
+
return true;
|
|
65
|
+
if (curlJson.files)
|
|
66
|
+
return true;
|
|
67
|
+
return false;
|
|
68
|
+
};
|
|
69
|
+
const isBinaryRequest = (curlJson) => {
|
|
70
|
+
var _a, _b;
|
|
71
|
+
if ((_a = curlJson === null || curlJson === void 0 ? void 0 : curlJson.headers) === null || _a === void 0 ? void 0 : _a[CONTENT_TYPE_KEY]) {
|
|
72
|
+
const contentType = (_b = curlJson === null || curlJson === void 0 ? void 0 : curlJson.headers) === null || _b === void 0 ? void 0 : _b[CONTENT_TYPE_KEY];
|
|
73
|
+
return ['image', 'video', 'audio'].some((d) => contentType.includes(d));
|
|
74
|
+
}
|
|
75
|
+
return false;
|
|
76
|
+
};
|
|
77
|
+
const sanitizeCurlCommand = (curlCommand) => curlCommand
|
|
78
|
+
.replace(/\r\n/g, ' ')
|
|
79
|
+
.replace(/\n/g, ' ')
|
|
80
|
+
.replace(/\\/g, ' ')
|
|
81
|
+
.replace(/[ ]{2,}/g, ' ');
|
|
82
|
+
const toKeyValueArray = ([key, value]) => ({ name: key, value });
|
|
83
|
+
const extractHeaders = (headers = {}) => {
|
|
84
|
+
const emptyHeaders = !Object.keys(headers).length;
|
|
85
|
+
const onlyContentTypeHeaderDefined = Object.keys(headers).length === 1 && headers[CONTENT_TYPE_KEY] !== undefined;
|
|
86
|
+
if (emptyHeaders || onlyContentTypeHeaderDefined)
|
|
87
|
+
return { sendHeaders: false };
|
|
88
|
+
return {
|
|
89
|
+
sendHeaders: true,
|
|
90
|
+
headerParameters: {
|
|
91
|
+
parameters: Object.entries(headers)
|
|
92
|
+
.map(toKeyValueArray)
|
|
93
|
+
.filter((parameter) => parameter.name !== CONTENT_TYPE_KEY),
|
|
94
|
+
},
|
|
95
|
+
};
|
|
96
|
+
};
|
|
97
|
+
const extractQueries = (queries = {}) => {
|
|
98
|
+
const emptyQueries = !Object.keys(queries).length;
|
|
99
|
+
if (emptyQueries)
|
|
100
|
+
return { sendQuery: false };
|
|
101
|
+
return {
|
|
102
|
+
sendQuery: true,
|
|
103
|
+
queryParameters: {
|
|
104
|
+
parameters: Object.entries(queries).map(toKeyValueArray),
|
|
105
|
+
},
|
|
106
|
+
};
|
|
107
|
+
};
|
|
108
|
+
const extractJson = (body) => (0, n8n_workflow_1.jsonParse)(Object.keys(body)[0]);
|
|
109
|
+
const jsonBodyToNodeParameters = (body = {}) => {
|
|
110
|
+
const data = extractJson(body);
|
|
111
|
+
return Object.entries(data).map(toKeyValueArray);
|
|
112
|
+
};
|
|
113
|
+
const multipartToNodeParameters = (body = {}, files = {}) => {
|
|
114
|
+
return [
|
|
115
|
+
...Object.entries(body)
|
|
116
|
+
.map(toKeyValueArray)
|
|
117
|
+
.map((e) => ({ parameterType: 'formData', ...e })),
|
|
118
|
+
...Object.entries(files)
|
|
119
|
+
.map(toKeyValueArray)
|
|
120
|
+
.map((e) => ({ parameterType: 'formBinaryData', ...e })),
|
|
121
|
+
];
|
|
122
|
+
};
|
|
123
|
+
const keyValueBodyToNodeParameters = (body = {}) => {
|
|
124
|
+
return Object.entries(body).map(toKeyValueArray);
|
|
125
|
+
};
|
|
126
|
+
const lowerCaseContentTypeKey = (obj) => {
|
|
127
|
+
const regex = new RegExp(CONTENT_TYPE_KEY, 'gi');
|
|
128
|
+
const contentTypeKey = Object.keys(obj).find((key) => {
|
|
129
|
+
const group = Array.from(key.matchAll(regex));
|
|
130
|
+
if (group.length)
|
|
131
|
+
return true;
|
|
132
|
+
return false;
|
|
133
|
+
});
|
|
134
|
+
if (!contentTypeKey)
|
|
135
|
+
return;
|
|
136
|
+
const value = obj[contentTypeKey];
|
|
137
|
+
delete obj[contentTypeKey];
|
|
138
|
+
obj[CONTENT_TYPE_KEY] = value;
|
|
139
|
+
};
|
|
140
|
+
const encodeBasicAuthentication = (username, password) => Buffer.from(`${username}:${password}`).toString('base64');
|
|
141
|
+
const jsonHasNestedObjects = (json) => Object.values(json).some((e) => typeof e === 'object');
|
|
142
|
+
const extractGroup = (curlCommand, regex) => curlCommand.matchAll(regex);
|
|
143
|
+
const mapCookies = (cookies) => {
|
|
144
|
+
if (!cookies)
|
|
145
|
+
return {};
|
|
146
|
+
const cookiesValues = Object.entries(cookies).reduce((accumulator, entry) => {
|
|
147
|
+
accumulator += `${entry[0]}=${entry[1]};`;
|
|
148
|
+
return accumulator;
|
|
149
|
+
}, '');
|
|
150
|
+
if (!cookiesValues)
|
|
151
|
+
return {};
|
|
152
|
+
return {
|
|
153
|
+
cookie: cookiesValues,
|
|
154
|
+
};
|
|
155
|
+
};
|
|
156
|
+
const flattenObject = (obj, prefix = '') => Object.keys(obj).reduce((acc, k) => {
|
|
157
|
+
const pre = prefix.length ? prefix + '.' : '';
|
|
158
|
+
if (typeof obj[k] === 'object')
|
|
159
|
+
Object.assign(acc, (0, exports.flattenObject)(obj[k], pre + k));
|
|
160
|
+
else
|
|
161
|
+
acc[pre + k] = obj[k];
|
|
162
|
+
return acc;
|
|
163
|
+
}, {});
|
|
164
|
+
exports.flattenObject = flattenObject;
|
|
165
|
+
let CurlService = class CurlService {
|
|
166
|
+
toHttpNodeParameters(curlCommand) {
|
|
167
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
168
|
+
const curlJson = (0, n8n_workflow_1.jsonParse)(curlconverter_1.default.toJsonString(curlCommand));
|
|
169
|
+
if (!curlJson.headers)
|
|
170
|
+
curlJson.headers = {};
|
|
171
|
+
lowerCaseContentTypeKey(curlJson.headers);
|
|
172
|
+
if (curlJson.auth) {
|
|
173
|
+
const { user, password: pass } = curlJson.auth;
|
|
174
|
+
Object.assign(curlJson.headers, {
|
|
175
|
+
authorization: `Basic ${encodeBasicAuthentication(user, pass)}`,
|
|
176
|
+
});
|
|
177
|
+
}
|
|
178
|
+
const httpNodeParameters = {
|
|
179
|
+
url: curlJson.url,
|
|
180
|
+
authentication: 'none',
|
|
181
|
+
method: curlJson.method.toUpperCase(),
|
|
182
|
+
...extractHeaders({ ...curlJson.headers, ...mapCookies(curlJson.cookies) }),
|
|
183
|
+
...extractQueries(curlJson.queries),
|
|
184
|
+
options: {
|
|
185
|
+
redirect: {
|
|
186
|
+
redirect: {},
|
|
187
|
+
},
|
|
188
|
+
response: {
|
|
189
|
+
response: {},
|
|
190
|
+
},
|
|
191
|
+
},
|
|
192
|
+
};
|
|
193
|
+
const curl = sanitizeCurlCommand(curlCommand);
|
|
194
|
+
if (FOLLOW_REDIRECT_FLAGS.some((flag) => curl.includes(` ${flag}`))) {
|
|
195
|
+
Object.assign((_a = httpNodeParameters.options.redirect) === null || _a === void 0 ? void 0 : _a.redirect, { followRedirects: true });
|
|
196
|
+
if (curl.includes(` ${MAX_REDIRECT_FLAG}`)) {
|
|
197
|
+
const extractedValue = Array.from(extractGroup(curl, new RegExp(` ${MAX_REDIRECT_FLAG} (\\d+)`, 'g')));
|
|
198
|
+
if (extractedValue.length) {
|
|
199
|
+
const [_, maxRedirects] = extractedValue[0];
|
|
200
|
+
if (maxRedirects) {
|
|
201
|
+
Object.assign((_b = httpNodeParameters.options.redirect) === null || _b === void 0 ? void 0 : _b.redirect, { maxRedirects });
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
if (PROXY_FLAGS.some((flag) => curl.includes(` ${flag}`))) {
|
|
207
|
+
const foundFlag = PROXY_FLAGS.find((flag) => curl.includes(` ${flag}`));
|
|
208
|
+
if (foundFlag) {
|
|
209
|
+
const extractedValue = Array.from(extractGroup(curl, new RegExp(` ${foundFlag} (\\S*)`, 'g')));
|
|
210
|
+
if (extractedValue.length) {
|
|
211
|
+
const [_, proxy] = extractedValue[0];
|
|
212
|
+
Object.assign(httpNodeParameters.options, { proxy });
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
if (INCLUDE_HEADERS_IN_OUTPUT_FLAGS.some((flag) => curl.includes(` ${flag}`))) {
|
|
217
|
+
Object.assign((_d = (_c = httpNodeParameters.options) === null || _c === void 0 ? void 0 : _c.response) === null || _d === void 0 ? void 0 : _d.response, {
|
|
218
|
+
fullResponse: true,
|
|
219
|
+
responseFormat: 'autodetect',
|
|
220
|
+
});
|
|
221
|
+
}
|
|
222
|
+
if (REQUEST_FLAGS.some((flag) => curl.includes(` ${flag}`))) {
|
|
223
|
+
const foundFlag = REQUEST_FLAGS.find((flag) => curl.includes(` ${flag}`));
|
|
224
|
+
if (foundFlag) {
|
|
225
|
+
const extractedValue = Array.from(extractGroup(curl, new RegExp(` ${foundFlag} (\\w+)`, 'g')));
|
|
226
|
+
if (extractedValue.length) {
|
|
227
|
+
const [_, request] = extractedValue[0];
|
|
228
|
+
httpNodeParameters.method = request.toUpperCase();
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
if (TIMEOUT_FLAGS.some((flag) => curl.includes(` ${flag}`))) {
|
|
233
|
+
const foundFlag = TIMEOUT_FLAGS.find((flag) => curl.includes(` ${flag}`));
|
|
234
|
+
if (foundFlag) {
|
|
235
|
+
const extractedValue = Array.from(extractGroup(curl, new RegExp(` ${foundFlag} (\\d+)`, 'g')));
|
|
236
|
+
if (extractedValue.length) {
|
|
237
|
+
const [_, timeout] = extractedValue[0];
|
|
238
|
+
Object.assign(httpNodeParameters.options, {
|
|
239
|
+
timeout: parseInt(timeout, 10) * 1000,
|
|
240
|
+
});
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
if (DOWNLOAD_FILE_FLAGS.some((flag) => curl.includes(` ${flag}`))) {
|
|
245
|
+
const foundFlag = DOWNLOAD_FILE_FLAGS.find((flag) => curl.includes(` ${flag}`));
|
|
246
|
+
if (foundFlag) {
|
|
247
|
+
Object.assign(httpNodeParameters.options.response.response, {
|
|
248
|
+
responseFormat: 'file',
|
|
249
|
+
outputPropertyName: 'data',
|
|
250
|
+
});
|
|
251
|
+
}
|
|
252
|
+
}
|
|
253
|
+
if (IGNORE_SSL_ISSUES_FLAGS.some((flag) => curl.includes(` ${flag}`))) {
|
|
254
|
+
const foundFlag = IGNORE_SSL_ISSUES_FLAGS.find((flag) => curl.includes(` ${flag}`));
|
|
255
|
+
if (foundFlag) {
|
|
256
|
+
Object.assign(httpNodeParameters.options, {
|
|
257
|
+
allowUnauthorizedCerts: true,
|
|
258
|
+
});
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
const contentType = (_e = curlJson === null || curlJson === void 0 ? void 0 : curlJson.headers) === null || _e === void 0 ? void 0 : _e[CONTENT_TYPE_KEY];
|
|
262
|
+
if (isBinaryRequest(curlJson)) {
|
|
263
|
+
return Object.assign(httpNodeParameters, {
|
|
264
|
+
contentType: 'binaryData',
|
|
265
|
+
sendBody: true,
|
|
266
|
+
});
|
|
267
|
+
}
|
|
268
|
+
if (contentType && !SUPPORTED_CONTENT_TYPES.includes(contentType)) {
|
|
269
|
+
return Object.assign(httpNodeParameters, {
|
|
270
|
+
sendBody: true,
|
|
271
|
+
contentType: 'raw',
|
|
272
|
+
rawContentType: contentType,
|
|
273
|
+
body: Object.keys((_f = curlJson === null || curlJson === void 0 ? void 0 : curlJson.data) !== null && _f !== void 0 ? _f : {})[0],
|
|
274
|
+
});
|
|
275
|
+
}
|
|
276
|
+
if (isJsonRequest(curlJson)) {
|
|
277
|
+
Object.assign(httpNodeParameters, {
|
|
278
|
+
contentType: 'json',
|
|
279
|
+
sendBody: true,
|
|
280
|
+
});
|
|
281
|
+
if (curlJson.data) {
|
|
282
|
+
const json = extractJson(curlJson.data);
|
|
283
|
+
if (jsonHasNestedObjects(json)) {
|
|
284
|
+
Object.assign(httpNodeParameters, {
|
|
285
|
+
specifyBody: 'json',
|
|
286
|
+
jsonBody: JSON.stringify(json, null, 2),
|
|
287
|
+
});
|
|
288
|
+
}
|
|
289
|
+
else {
|
|
290
|
+
Object.assign(httpNodeParameters, {
|
|
291
|
+
specifyBody: 'keypair',
|
|
292
|
+
bodyParameters: {
|
|
293
|
+
parameters: jsonBodyToNodeParameters(curlJson.data),
|
|
294
|
+
},
|
|
295
|
+
});
|
|
296
|
+
}
|
|
297
|
+
}
|
|
298
|
+
}
|
|
299
|
+
else if (isFormUrlEncodedRequest(curlJson)) {
|
|
300
|
+
Object.assign(httpNodeParameters, {
|
|
301
|
+
contentType: 'form-urlencoded',
|
|
302
|
+
sendBody: true,
|
|
303
|
+
specifyBody: 'keypair',
|
|
304
|
+
bodyParameters: {
|
|
305
|
+
parameters: keyValueBodyToNodeParameters(curlJson.data),
|
|
306
|
+
},
|
|
307
|
+
});
|
|
308
|
+
}
|
|
309
|
+
else if (isMultipartRequest(curlJson)) {
|
|
310
|
+
Object.assign(httpNodeParameters, {
|
|
311
|
+
contentType: 'multipart-form-data',
|
|
312
|
+
sendBody: true,
|
|
313
|
+
bodyParameters: {
|
|
314
|
+
parameters: multipartToNodeParameters(curlJson.data, curlJson.files),
|
|
315
|
+
},
|
|
316
|
+
});
|
|
317
|
+
}
|
|
318
|
+
else {
|
|
319
|
+
Object.assign(httpNodeParameters, {
|
|
320
|
+
sendBody: false,
|
|
321
|
+
});
|
|
322
|
+
}
|
|
323
|
+
if (!Object.keys((_g = httpNodeParameters.options) === null || _g === void 0 ? void 0 : _g.redirect.redirect).length) {
|
|
324
|
+
delete httpNodeParameters.options.redirect;
|
|
325
|
+
}
|
|
326
|
+
if (!Object.keys(httpNodeParameters.options.response.response).length) {
|
|
327
|
+
delete httpNodeParameters.options.response;
|
|
328
|
+
}
|
|
329
|
+
return httpNodeParameters;
|
|
330
|
+
}
|
|
331
|
+
};
|
|
332
|
+
exports.CurlService = CurlService;
|
|
333
|
+
exports.CurlService = CurlService = __decorate([
|
|
334
|
+
(0, typedi_1.Service)()
|
|
335
|
+
], CurlService);
|
|
336
|
+
//# sourceMappingURL=curl.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"curl.service.js","sourceRoot":"","sources":["../../src/services/curl.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,7 +75,7 @@ let MetricsService = class MetricsService extends events_1.default {
|
|
|
75
75
|
}
|
|
76
76
|
}
|
|
77
77
|
mountMetricsEndpoint(app) {
|
|
78
|
-
app.get('/metrics', async (
|
|
78
|
+
app.get('/metrics', async (_req, res) => {
|
|
79
79
|
const metrics = await prom_client_1.default.register.metrics();
|
|
80
80
|
res.setHeader('Content-Type', prom_client_1.default.register.contentType);
|
|
81
81
|
res.send(metrics).end();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.service.js","sourceRoot":"","sources":["../../src/services/metrics.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sDAA8B;AAC9B,2CAA0C;AAE1C,8EAA6C;AAC7C,8DAAuD;AACvD,mEAAiD;AACjD,mCAAiC;AACjC,oDAAkC;AAElC,kEAA8D;AAC9D,yCAA2F;AAC3F,gFAA6E;AAC7E,qCAAkC;AAG3B,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,gBAAY;IAC/C,YACkB,MAAc,EACd,YAA0B,EAC1B,QAAyB;QAE1C,KAAK,EAAE,CAAC;QAJS,WAAM,GAAN,MAAM,CAAQ;QACd,iBAAY,GAAZ,YAAY,CAAc;QAC1B,aAAQ,GAAR,QAAQ,CAAiB;QAK3C,aAAQ,GAA2C,EAAE,CAAC;IAFtD,CAAC;IAID,KAAK,CAAC,gBAAgB,CAAC,GAAwB;QAC9C,qBAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAC5B,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC7B,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,2BAA2B,EAAE,CAAC;QACnC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAEO,qBAAqB;QAC5B,MAAM,UAAU,GAAG,IAAA,eAAW,EAAC,uBAAW,IAAI,OAAO,CAAC,CAAC;QAEvD,IAAI,UAAU,EAAE,CAAC;YAChB,MAAM,YAAY,GAAG,IAAI,qBAAU,CAAC,KAAK,CAAC;gBACzC,IAAI,EAAE,gBAAM,CAAC,MAAM,CAAC,0BAA0B,CAAC,GAAG,cAAc;gBAChE,IAAI,EAAE,mBAAmB;gBACzB,UAAU,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;aAClD,CAAC,CAAC;YAEH,YAAY,CAAC,GAAG,CACf;gBACC,OAAO,EAAE,GAAG,GAAG,UAAU,CAAC,OAAO;gBACjC,KAAK,EAAE,UAAU,CAAC,KAAK;gBACvB,KAAK,EAAE,UAAU,CAAC,KAAK;gBACvB,KAAK,EAAE,UAAU,CAAC,KAAK;aACvB,EACD,CAAC,CACD,CAAC;QACH,CAAC;IACF,CAAC;IAEO,mBAAmB;QAC1B,IAAI,gBAAM,CAAC,MAAM,CAAC,yCAAyC,CAAC,EAAE,CAAC;YAC9D,qBAAU,CAAC,qBAAqB,EAAE,CAAC;QACpC,CAAC;IACF,CAAC;IAEO,eAAe,CAAC,GAAwB;QAC/C,IAAI,gBAAM,CAAC,MAAM,CAAC,uCAAuC,CAAC,EAAE,CAAC;YAC5D,MAAM,iBAAiB,GAAG,IAAA,6BAAU,EAAC;gBACpC,YAAY,EAAE,KAAK;gBACnB,SAAS,EAAE,KAAK;gBAChB,WAAW,EAAE,gBAAM,CAAC,MAAM,CAAC,uCAAuC,CAAC;gBACnE,aAAa,EAAE,gBAAM,CAAC,MAAM,CAAC,yCAAyC,CAAC;gBACvE,iBAAiB,EAAE,gBAAM,CAAC,MAAM,CAAC,6CAA6C,CAAC;aAC/E,CAAC,CAAC;YAEH,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,iBAAiB,CAAC,CAAC;QAC/E,CAAC;IACF,CAAC;IAED,oBAAoB,CAAC,GAAwB;QAC5C,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"metrics.service.js","sourceRoot":"","sources":["../../src/services/metrics.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,13 +46,11 @@ let UserService = class UserService {
|
|
|
46
46
|
await this.userRepository.save(user);
|
|
47
47
|
}
|
|
48
48
|
async toPublic(user, options) {
|
|
49
|
-
|
|
50
|
-
const { password, updatedAt, apiKey, authIdentities, mfaRecoveryCodes, mfaSecret, ...rest } = user;
|
|
49
|
+
const { password, updatedAt, apiKey, authIdentities, ...rest } = user;
|
|
51
50
|
const ldapIdentity = authIdentities === null || authIdentities === void 0 ? void 0 : authIdentities.find((i) => i.providerType === 'ldap');
|
|
52
51
|
let publicUser = {
|
|
53
52
|
...rest,
|
|
54
53
|
signInType: ldapIdentity ? 'ldap' : 'email',
|
|
55
|
-
hasRecoveryCodesLeft: !!((_a = user.mfaRecoveryCodes) === null || _a === void 0 ? void 0 : _a.length),
|
|
56
54
|
};
|
|
57
55
|
if ((options === null || options === void 0 ? void 0 : options.withInviteUrl) && !(options === null || options === void 0 ? void 0 : options.inviterId)) {
|
|
58
56
|
throw new n8n_workflow_1.ApplicationError('Inviter ID is required to generate invite URL');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/services/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAA4C;AAE5C,+CAAqF;AAGrF,sEAAkE;AAGlE,qCAAkC;AAClC,kDAA8D;AAC9D,mDAAgD;AAChD,wDAAoD;AAEpD,0FAAqF;AAG9E,IAAM,WAAW,GAAjB,MAAM,WAAW;IACvB,YACkB,MAAc,EACd,cAA8B,EAC9B,MAA4B,EAC5B,UAAsB;QAHtB,WAAM,GAAN,MAAM,CAAQ;QACd,mBAAc,GAAd,cAAc,CAAgB;QAC9B,WAAM,GAAN,MAAM,CAAsB;QAC5B,eAAU,GAAV,UAAU,CAAY;IACrC,CAAC;IAEJ,KAAK,CAAC,MAAM,CAAC,MAAc,EAAE,IAAmB;QAC/C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAEjE,IAAI,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7E,CAAC;QAED,OAAO;IACR,CAAC;IAED,UAAU;QACT,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,MAAc,EAAE,WAAmC;QACvE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QAEhF,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC3C,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC;QAC7B,CAAC;QAED,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,QAAQ,CACb,IAAU,EACV,OAKC
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/services/user.service.ts"],"names":[],"mappings":"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"}
|
package/dist/utils.d.ts
CHANGED
|
@@ -11,4 +11,5 @@ export declare function isObjectLiteral(item: unknown): item is {
|
|
|
11
11
|
};
|
|
12
12
|
export declare function removeTrailingSlash(path: string): string;
|
|
13
13
|
export declare function rightDiff<T1, T2>([arr1, keyExtractor1]: [T1[], (item: T1) => string], [arr2, keyExtractor2]: [T2[], (item: T2) => string]): T2[];
|
|
14
|
-
export declare const assertNever: (
|
|
14
|
+
export declare const assertNever: (_value: never) => void;
|
|
15
|
+
export declare const isPositiveInteger: (maybeInt: string) => boolean;
|
package/dist/utils.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.assertNever = exports.rightDiff = exports.removeTrailingSlash = exports.isObjectLiteral = exports.isIntegerString = exports.isStringArray = exports.toError = exports.separate = exports.findCliWorkflowStart = exports.findSubworkflowStart = exports.isWorkflowIdValid = void 0;
|
|
3
|
+
exports.isPositiveInteger = exports.assertNever = exports.rightDiff = exports.removeTrailingSlash = exports.isObjectLiteral = exports.isIntegerString = exports.isStringArray = exports.toError = exports.separate = exports.findCliWorkflowStart = exports.findSubworkflowStart = exports.isWorkflowIdValid = void 0;
|
|
4
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
5
|
const constants_1 = require("./constants");
|
|
6
6
|
function isWorkflowIdValid(id) {
|
|
@@ -61,6 +61,8 @@ function rightDiff([arr1, keyExtractor1], [arr2, keyExtractor2]) {
|
|
|
61
61
|
}, []);
|
|
62
62
|
}
|
|
63
63
|
exports.rightDiff = rightDiff;
|
|
64
|
-
const assertNever = (
|
|
64
|
+
const assertNever = (_value) => { };
|
|
65
65
|
exports.assertNever = assertNever;
|
|
66
|
+
const isPositiveInteger = (maybeInt) => /^[1-9]\d*$/.test(maybeInt);
|
|
67
|
+
exports.isPositiveInteger = isPositiveInteger;
|
|
66
68
|
//# sourceMappingURL=utils.js.map
|
package/dist/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,6 +47,11 @@ export declare namespace WorkflowRequest {
|
|
|
47
47
|
}, {}, {
|
|
48
48
|
shareWithIds: string[];
|
|
49
49
|
}>;
|
|
50
|
+
type Transfer = AuthenticatedRequest<{
|
|
51
|
+
workflowId: string;
|
|
52
|
+
}, {}, {
|
|
53
|
+
destinationProjectId: string;
|
|
54
|
+
}>;
|
|
50
55
|
type FromUrl = AuthenticatedRequest<{}, {}, {}, {
|
|
51
56
|
url?: string;
|
|
52
57
|
}>;
|
|
@@ -9,6 +9,9 @@ import { Logger } from '../Logger';
|
|
|
9
9
|
import type { WorkflowWithSharingsAndCredentials, WorkflowWithSharingsMetaDataAndCredentials } from './workflows.types';
|
|
10
10
|
import { OwnershipService } from '../services/ownership.service';
|
|
11
11
|
import { type EntityManager } from '@n8n/typeorm';
|
|
12
|
+
import { ProjectService } from '../services/project.service';
|
|
13
|
+
import { ActiveWorkflowManager } from '../ActiveWorkflowManager';
|
|
14
|
+
import { SharedWorkflow } from '../databases/entities/SharedWorkflow';
|
|
12
15
|
export declare class EnterpriseWorkflowService {
|
|
13
16
|
private readonly logger;
|
|
14
17
|
private readonly sharedWorkflowRepository;
|
|
@@ -16,12 +19,28 @@ export declare class EnterpriseWorkflowService {
|
|
|
16
19
|
private readonly credentialsRepository;
|
|
17
20
|
private readonly credentialsService;
|
|
18
21
|
private readonly ownershipService;
|
|
19
|
-
|
|
20
|
-
|
|
22
|
+
private readonly projectService;
|
|
23
|
+
private readonly activeWorkflowManager;
|
|
24
|
+
constructor(logger: Logger, sharedWorkflowRepository: SharedWorkflowRepository, workflowRepository: WorkflowRepository, credentialsRepository: CredentialsRepository, credentialsService: CredentialsService, ownershipService: OwnershipService, projectService: ProjectService, activeWorkflowManager: ActiveWorkflowManager);
|
|
25
|
+
shareWithProjects(workflow: WorkflowEntity, shareWithIds: string[], entityManager: EntityManager): Promise<SharedWorkflow[]>;
|
|
21
26
|
addOwnerAndSharings(workflow: WorkflowWithSharingsAndCredentials): WorkflowWithSharingsMetaDataAndCredentials;
|
|
22
27
|
addCredentialsToWorkflow(workflow: WorkflowWithSharingsMetaDataAndCredentials, currentUser: User): Promise<void>;
|
|
23
28
|
validateCredentialPermissionsToUser(workflow: WorkflowEntity, allowedCredentials: CredentialsEntity[]): void;
|
|
24
29
|
preventTampering(workflow: WorkflowEntity, workflowId: string, user: User): Promise<WorkflowEntity>;
|
|
25
30
|
validateWorkflowCredentialUsage(newWorkflowVersion: WorkflowEntity, previousWorkflowVersion: WorkflowEntity, credentialsUserHasAccessTo: CredentialsEntity[]): WorkflowEntity;
|
|
26
31
|
getNodesWithInaccessibleCreds(workflow: WorkflowEntity, userCredIds: string[]): import("n8n-workflow").INode[];
|
|
32
|
+
transferOne(user: User, workflowId: string, destinationProjectId: string): Promise<{
|
|
33
|
+
error: {
|
|
34
|
+
message: string;
|
|
35
|
+
lineNumber: number | undefined;
|
|
36
|
+
timestamp: number;
|
|
37
|
+
name: string;
|
|
38
|
+
description: string | null | undefined;
|
|
39
|
+
context: import("n8n-workflow").IDataObject;
|
|
40
|
+
cause: Error | undefined;
|
|
41
|
+
} | {
|
|
42
|
+
name: string;
|
|
43
|
+
message: string;
|
|
44
|
+
};
|
|
45
|
+
} | undefined>;
|
|
27
46
|
}
|
|
@@ -26,14 +26,20 @@ const Logger_1 = require("../Logger");
|
|
|
26
26
|
const ownership_service_1 = require("../services/ownership.service");
|
|
27
27
|
const typeorm_1 = require("@n8n/typeorm");
|
|
28
28
|
const Project_1 = require("../databases/entities/Project");
|
|
29
|
+
const project_service_1 = require("../services/project.service");
|
|
30
|
+
const ActiveWorkflowManager_1 = require("../ActiveWorkflowManager");
|
|
31
|
+
const transfer_workflow_error_1 = require("../errors/response-errors/transfer-workflow.error");
|
|
32
|
+
const SharedWorkflow_1 = require("../databases/entities/SharedWorkflow");
|
|
29
33
|
let EnterpriseWorkflowService = class EnterpriseWorkflowService {
|
|
30
|
-
constructor(logger, sharedWorkflowRepository, workflowRepository, credentialsRepository, credentialsService, ownershipService) {
|
|
34
|
+
constructor(logger, sharedWorkflowRepository, workflowRepository, credentialsRepository, credentialsService, ownershipService, projectService, activeWorkflowManager) {
|
|
31
35
|
this.logger = logger;
|
|
32
36
|
this.sharedWorkflowRepository = sharedWorkflowRepository;
|
|
33
37
|
this.workflowRepository = workflowRepository;
|
|
34
38
|
this.credentialsRepository = credentialsRepository;
|
|
35
39
|
this.credentialsService = credentialsService;
|
|
36
40
|
this.ownershipService = ownershipService;
|
|
41
|
+
this.projectService = projectService;
|
|
42
|
+
this.activeWorkflowManager = activeWorkflowManager;
|
|
37
43
|
}
|
|
38
44
|
async shareWithProjects(workflow, shareWithIds, entityManager) {
|
|
39
45
|
const em = entityManager !== null && entityManager !== void 0 ? entityManager : this.sharedWorkflowRepository.manager;
|
|
@@ -165,6 +171,59 @@ let EnterpriseWorkflowService = class EnterpriseWorkflowService {
|
|
|
165
171
|
return allUsedCredentialIds.some((nodeCredId) => nodeCredId && !userCredIds.includes(nodeCredId));
|
|
166
172
|
});
|
|
167
173
|
}
|
|
174
|
+
async transferOne(user, workflowId, destinationProjectId) {
|
|
175
|
+
const workflow = await this.sharedWorkflowRepository.findWorkflowForUser(workflowId, user, [
|
|
176
|
+
'workflow:move',
|
|
177
|
+
]);
|
|
178
|
+
not_found_error_1.NotFoundError.isDefinedAndNotNull(workflow, `Could not find workflow with the id "${workflowId}". Make sure you have the permission to move it.`);
|
|
179
|
+
const ownerSharing = workflow.shared.find((s) => s.role === 'workflow:owner');
|
|
180
|
+
not_found_error_1.NotFoundError.isDefinedAndNotNull(ownerSharing, `Could not find owner for workflow "${workflow.id}"`);
|
|
181
|
+
const sourceProject = ownerSharing.project;
|
|
182
|
+
const destinationProject = await this.projectService.getProjectWithScope(user, destinationProjectId, ['workflow:create']);
|
|
183
|
+
not_found_error_1.NotFoundError.isDefinedAndNotNull(destinationProject, `Could not find project with the id "${destinationProjectId}". Make sure you have the permission to create workflows in it.`);
|
|
184
|
+
if (sourceProject.id === destinationProject.id) {
|
|
185
|
+
throw new transfer_workflow_error_1.TransferWorkflowError("You can't transfer a workflow into the project that's already owning it.");
|
|
186
|
+
}
|
|
187
|
+
if (sourceProject.type !== 'team' && sourceProject.type !== 'personal') {
|
|
188
|
+
throw new transfer_workflow_error_1.TransferWorkflowError('You can only transfer workflows out of personal or team projects.');
|
|
189
|
+
}
|
|
190
|
+
if (destinationProject.type !== 'team') {
|
|
191
|
+
throw new transfer_workflow_error_1.TransferWorkflowError('You can only transfer workflows into team projects.');
|
|
192
|
+
}
|
|
193
|
+
const wasActive = workflow.active;
|
|
194
|
+
if (wasActive) {
|
|
195
|
+
await this.activeWorkflowManager.remove(workflowId);
|
|
196
|
+
}
|
|
197
|
+
await this.workflowRepository.manager.transaction(async (trx) => {
|
|
198
|
+
await trx.remove(workflow.shared);
|
|
199
|
+
await trx.save(trx.create(SharedWorkflow_1.SharedWorkflow, {
|
|
200
|
+
workflowId: workflow.id,
|
|
201
|
+
projectId: destinationProject.id,
|
|
202
|
+
role: 'workflow:owner',
|
|
203
|
+
}));
|
|
204
|
+
});
|
|
205
|
+
if (wasActive) {
|
|
206
|
+
try {
|
|
207
|
+
await this.activeWorkflowManager.add(workflowId, 'update');
|
|
208
|
+
return;
|
|
209
|
+
}
|
|
210
|
+
catch (error) {
|
|
211
|
+
await this.workflowRepository.updateActiveState(workflowId, false);
|
|
212
|
+
if (error instanceof n8n_workflow_1.WorkflowActivationError) {
|
|
213
|
+
return {
|
|
214
|
+
error: error.toJSON
|
|
215
|
+
? error.toJSON()
|
|
216
|
+
: {
|
|
217
|
+
name: error.name,
|
|
218
|
+
message: error.message,
|
|
219
|
+
},
|
|
220
|
+
};
|
|
221
|
+
}
|
|
222
|
+
throw error;
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
return;
|
|
226
|
+
}
|
|
168
227
|
};
|
|
169
228
|
exports.EnterpriseWorkflowService = EnterpriseWorkflowService;
|
|
170
229
|
exports.EnterpriseWorkflowService = EnterpriseWorkflowService = __decorate([
|
|
@@ -174,6 +233,8 @@ exports.EnterpriseWorkflowService = EnterpriseWorkflowService = __decorate([
|
|
|
174
233
|
workflow_repository_1.WorkflowRepository,
|
|
175
234
|
credentials_repository_1.CredentialsRepository,
|
|
176
235
|
credentials_service_1.CredentialsService,
|
|
177
|
-
ownership_service_1.OwnershipService
|
|
236
|
+
ownership_service_1.OwnershipService,
|
|
237
|
+
project_service_1.ProjectService,
|
|
238
|
+
ActiveWorkflowManager_1.ActiveWorkflowManager])
|
|
178
239
|
], EnterpriseWorkflowService);
|
|
179
240
|
//# sourceMappingURL=workflow.service.ee.js.map
|