n8n 2.38.5 → 2.38.7
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/deprecation/deprecation.service.js +1 -1
- package/dist/deprecation/deprecation.service.js.map +1 -1
- package/dist/modules/breaking-changes/rules/v3/docker-only-deployment.rule.js +1 -1
- package/dist/modules/breaking-changes/rules/v3/docker-only-deployment.rule.js.map +1 -1
- package/dist/modules/git-connections.ee/git-connections-git.utils.js +5 -0
- package/dist/modules/git-connections.ee/git-connections-git.utils.js.map +1 -1
- package/dist/modules/n8n-packages/entities/variable/variable.exporter.js +2 -2
- package/dist/modules/n8n-packages/entities/variable/variable.exporter.js.map +1 -1
- package/dist/modules/oauth-server/oauth-consent.controller.js +11 -0
- package/dist/modules/oauth-server/oauth-consent.controller.js.map +1 -1
- package/dist/modules/oauth-server/oauth-consent.service.d.ts +8 -2
- package/dist/modules/oauth-server/oauth-consent.service.js +14 -2
- package/dist/modules/oauth-server/oauth-consent.service.js.map +1 -1
- package/dist/modules/source-control.ee/source-control-export.service.ee.d.ts +6 -2
- package/dist/modules/source-control.ee/source-control-export.service.ee.js +106 -146
- package/dist/modules/source-control.ee/source-control-export.service.ee.js.map +1 -1
- package/dist/modules/source-control.ee/source-control-import.service.ee.js +3 -8
- package/dist/modules/source-control.ee/source-control-import.service.ee.js.map +1 -1
- package/dist/public-api/public-api-controller.registry.js +7 -3
- package/dist/public-api/public-api-controller.registry.js.map +1 -1
- package/dist/scaling/job-processor.js +19 -3
- package/dist/scaling/job-processor.js.map +1 -1
- package/package.json +19 -19
|
@@ -148,7 +148,7 @@ let DeprecationService = class DeprecationService {
|
|
|
148
148
|
mustWarn.push(` - ${deprecation.envVar} -> ${deprecation.message}\n`);
|
|
149
149
|
}
|
|
150
150
|
if (!this.instanceSettings.isDocker) {
|
|
151
|
-
mustWarn.push(' - Running n8n outside a container is deprecated. Future versions will require running n8n via the official Docker image. See https://docs.n8n.io/deploy/host-n8n
|
|
151
|
+
mustWarn.push(' - Running n8n outside a container is deprecated. Future versions will require running n8n via the official Docker image. See https://docs.n8n.io/deploy/host-n8n\n');
|
|
152
152
|
}
|
|
153
153
|
if (mustWarn.length === 0)
|
|
154
154
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deprecation.service.js","sourceRoot":"","sources":["../../src/deprecation/deprecation.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"deprecation.service.js","sourceRoot":"","sources":["../../src/deprecation/deprecation.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ let DockerOnlyDeploymentRule = class DockerOnlyDeploymentRule {
|
|
|
24
24
|
description: 'Support for running n8n via npm is removed. The new version must be run via the official Docker image.',
|
|
25
25
|
category: "infrastructure",
|
|
26
26
|
severity: 'medium',
|
|
27
|
-
documentationUrl: 'https://docs.n8n.io/deploy/host-n8n
|
|
27
|
+
documentationUrl: 'https://docs.n8n.io/deploy/host-n8n',
|
|
28
28
|
};
|
|
29
29
|
}
|
|
30
30
|
async detect() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-only-deployment.rule.js","sourceRoot":"","sources":["../../../../../src/modules/breaking-changes/rules/v3/docker-only-deployment.rule.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAAqD;AACrD,uCAA4C;AAUrC,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IACpC,YAA6B,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAE/D,OAAE,GAAW,2BAA2B,CAAC;IAFyB,CAAC;IAInE,WAAW;QACV,OAAO;YACN,OAAO,EAAE,IAAI;YACb,KAAK,EAAE,qDAAqD;YAC5D,WAAW,EACV,wGAAwG;YACzG,QAAQ,kBAAuC;YAC/C,QAAQ,EAAE,QAAQ;YAClB,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"docker-only-deployment.rule.js","sourceRoot":"","sources":["../../../../../src/modules/breaking-changes/rules/v3/docker-only-deployment.rule.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAAqD;AACrD,uCAA4C;AAUrC,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IACpC,YAA6B,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAE/D,OAAE,GAAW,2BAA2B,CAAC;IAFyB,CAAC;IAInE,WAAW;QACV,OAAO;YACN,OAAO,EAAE,IAAI;YACb,KAAK,EAAE,qDAAqD;YAC5D,WAAW,EACV,wGAAwG;YACzG,QAAQ,kBAAuC;YAC/C,QAAQ,EAAE,QAAQ;YAClB,gBAAgB,EAAE,qCAAqC;SACvD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,MAAM;QACX,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC;YACpC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC;QACvE,CAAC;QAED,OAAO;YACN,UAAU,EAAE,IAAI;YAChB,cAAc,EAAE;gBACf;oBACC,KAAK,EAAE,wCAAwC;oBAC/C,WAAW,EACV,2IAA2I;oBAC5I,KAAK,EAAE,SAAS;iBAChB;aACD;YACD,eAAe,EAAE;gBAChB;oBACC,MAAM,EAAE,sCAAsC;oBAC9C,WAAW,EACV,qHAAqH;iBACtH;aACD;SACD,CAAC;IACH,CAAC;CACD,CAAA;;mCAzCY,wBAAwB;IADpC,IAAA,+BAAkB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;qCAEU,2BAAgB;GADnD,wBAAwB,CAyCpC"}
|
|
@@ -18,6 +18,11 @@ function buildHttpsGitConfig(repositoryUrl, credentials) {
|
|
|
18
18
|
const proxyUrl = (0, backend_network_1.resolveProxyUrl)(repositoryUrl);
|
|
19
19
|
if (proxyUrl)
|
|
20
20
|
config.push(`http.proxy=${proxyUrl}`);
|
|
21
|
+
const { GIT_SSL_CAINFO, GIT_SSL_CAPATH } = process.env;
|
|
22
|
+
if (GIT_SSL_CAINFO)
|
|
23
|
+
config.push(`http.sslCAInfo=${GIT_SSL_CAINFO}`);
|
|
24
|
+
if (GIT_SSL_CAPATH)
|
|
25
|
+
config.push(`http.sslCAPath=${GIT_SSL_CAPATH}`);
|
|
21
26
|
return config;
|
|
22
27
|
}
|
|
23
28
|
function buildSshCommand(paths) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-connections-git.utils.js","sourceRoot":"","sources":["../../../src/modules/git-connections.ee/git-connections-git.utils.ts"],"names":[],"mappings":";;;;;AACA,0DAAuD;AACvD,6CAAkD;AAElD,2CAMqB;AAGrB,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC;AAQ/E,6BACC,aAAqB,EACrB,WAAmD;IAEnD,MAAM,MAAM,GAAG,wBAAwB,aAAa,CAAC,WAAW,CAAC,QAAQ,CAAC,mBAAmB,aAAa,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC;IACzI,MAAM,MAAM,GAAG;QACd,qBAAqB,MAAM,EAAE;QAC7B,6BAA6B;QAC7B,sBAAsB,sCAA0B,EAAE;QAClD,qBAAqB,uCAA2B,EAAE;KAClD,CAAC;IAEF,MAAM,QAAQ,GAAG,IAAA,iCAAe,EAAC,aAAa,CAAC,CAAC;IAChD,IAAI,QAAQ;QAAE,MAAM,CAAC,IAAI,CAAC,cAAc,QAAQ,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"git-connections-git.utils.js","sourceRoot":"","sources":["../../../src/modules/git-connections.ee/git-connections-git.utils.ts"],"names":[],"mappings":";;;;;AACA,0DAAuD;AACvD,6CAAkD;AAElD,2CAMqB;AAGrB,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC;AAQ/E,6BACC,aAAqB,EACrB,WAAmD;IAEnD,MAAM,MAAM,GAAG,wBAAwB,aAAa,CAAC,WAAW,CAAC,QAAQ,CAAC,mBAAmB,aAAa,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC;IACzI,MAAM,MAAM,GAAG;QACd,qBAAqB,MAAM,EAAE;QAC7B,6BAA6B;QAC7B,sBAAsB,sCAA0B,EAAE;QAClD,qBAAqB,uCAA2B,EAAE;KAClD,CAAC;IAEF,MAAM,QAAQ,GAAG,IAAA,iCAAe,EAAC,aAAa,CAAC,CAAC;IAChD,IAAI,QAAQ;QAAE,MAAM,CAAC,IAAI,CAAC,cAAc,QAAQ,EAAE,CAAC,CAAC;IAEpD,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IACvD,IAAI,cAAc;QAAE,MAAM,CAAC,IAAI,CAAC,kBAAkB,cAAc,EAAE,CAAC,CAAC;IACpE,IAAI,cAAc;QAAE,MAAM,CAAC,IAAI,CAAC,kBAAkB,cAAc,EAAE,CAAC,CAAC;IACpE,OAAO,MAAM,CAAC;AACf,CAAC;AAGD,yBAAgC,KAAyD;IACxF,MAAM,iBAAiB,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3F,MAAM,QAAQ,GAAG,qBAAqB,uCAA2B,2BAA2B,6CAAiC,2BAA2B,sCAA0B,EAAE,CAAC;IACrL,OAAO,OAAO,QAAQ,0BAA0B,iBAAiB,CAAC,KAAK,CAAC,cAAc,CAAC,2CAA2C,iBAAiB,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;AAC7K,CAAC;AAGM,KAAK,6BAA6B,OAA4B,EAAE,OAAe;IAErF,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,SAAS,GACd,OAAO,KAAK,SAAS;QACpB,CAAC,CAAC,IAAA,iCAAmB,EAAC,SAAS,EAAE;YAC/B,kBAAkB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE;YACpD,iBAAiB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE;SAClD,CAAC;QACH,CAAC,CAAC,IAAA,iCAAmB,EAAC,KAAK,EAAE;YAC3B,aAAa,EAAE,IAAI;YACnB,kBAAkB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE;YACpD,iBAAiB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE;SAClD,CAAC,CAAC;IACN,MAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAC7D,SAAS,CAAC,OAAO,GAAG,OAAO,CAAC;IAC5B,MAAM,UAAU,GAAG,KAAK,CAAC,eAAe,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IACtE,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC;IAC7B,OAAO;QACN,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC;QACpC,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC;KAC9C,CAAC;AACH,CAAC"}
|
|
@@ -110,8 +110,8 @@ let VariableExporter = class VariableExporter {
|
|
|
110
110
|
return prefix ? `${prefix}/variables` : 'variables';
|
|
111
111
|
}
|
|
112
112
|
async resolveWorkflowProjects(workflowIds) {
|
|
113
|
-
const owners = await this.sharedWorkflowRepository.
|
|
114
|
-
return new Map(owners.map((
|
|
113
|
+
const owners = await this.sharedWorkflowRepository.findOwnerProjectsByWorkflowIds(workflowIds);
|
|
114
|
+
return new Map([...owners].map(([workflowId, project]) => [workflowId, project.id]));
|
|
115
115
|
}
|
|
116
116
|
assertNoBundledVariableCollision(resolvedNames, projectTargetsById) {
|
|
117
117
|
const conflictingNames = resolvedNames
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variable.exporter.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/variable/variable.exporter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"variable.exporter.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/variable/variable.exporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,6 +46,17 @@ let OAuthConsentController = class OAuthConsentController {
|
|
|
46
46
|
}
|
|
47
47
|
return;
|
|
48
48
|
}
|
|
49
|
+
if (consentDetails.autoApproved) {
|
|
50
|
+
this.oauthSessionService.clearSession(res);
|
|
51
|
+
res.json({
|
|
52
|
+
data: {
|
|
53
|
+
autoApproved: true,
|
|
54
|
+
redirectUrl: consentDetails.redirectUrl,
|
|
55
|
+
uiHints: consentDetails.uiHints,
|
|
56
|
+
},
|
|
57
|
+
});
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
49
60
|
res.json({
|
|
50
61
|
data: {
|
|
51
62
|
clientName: consentDetails.clientName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-consent.controller.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth-consent.controller.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"oauth-consent.controller.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth-consent.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,10 +5,16 @@ import { OAuthClientRepository } from './database/repositories/oauth-client.repo
|
|
|
5
5
|
import { UserConsentRepository } from './database/repositories/oauth-user-consent.repository';
|
|
6
6
|
import { OAuthAuthorizationCodeService } from './oauth-authorization-code.service';
|
|
7
7
|
import { OAuthSessionService, type OAuthSessionPayload } from './oauth-session.service';
|
|
8
|
-
import { ProtectedResourceRegistry } from '../../services/protected-resource.registry';
|
|
8
|
+
import { ProtectedResourceRegistry, type ProtectedResource } from '../../services/protected-resource.registry';
|
|
9
9
|
import { UrlService } from '../../services/url.service';
|
|
10
10
|
type ConsentDetailsResult = {
|
|
11
11
|
ok: true;
|
|
12
|
+
autoApproved: true;
|
|
13
|
+
redirectUrl: string;
|
|
14
|
+
uiHints?: ConsentUiHints;
|
|
15
|
+
} | {
|
|
16
|
+
ok: true;
|
|
17
|
+
autoApproved: false;
|
|
12
18
|
clientName: string;
|
|
13
19
|
clientId: string;
|
|
14
20
|
resourceName?: string;
|
|
@@ -42,7 +48,7 @@ export declare class OAuthConsentService {
|
|
|
42
48
|
}>;
|
|
43
49
|
private issueGrant;
|
|
44
50
|
private resolveGrantedScopes;
|
|
45
|
-
tryReuseConsent(user: User, sessionPayload: OAuthSessionPayload): Promise<{
|
|
51
|
+
tryReuseConsent(user: User, sessionPayload: OAuthSessionPayload, resolvedResource?: ProtectedResource): Promise<{
|
|
46
52
|
redirectUrl: string;
|
|
47
53
|
} | null>;
|
|
48
54
|
}
|
|
@@ -45,6 +45,15 @@ let OAuthConsentService = class OAuthConsentService {
|
|
|
45
45
|
if (!resource) {
|
|
46
46
|
return { ok: false, reason: 'resource_unavailable' };
|
|
47
47
|
}
|
|
48
|
+
const reuse = await this.tryReuseConsent(user, sessionPayload, resource);
|
|
49
|
+
if (reuse) {
|
|
50
|
+
return {
|
|
51
|
+
ok: true,
|
|
52
|
+
autoApproved: true,
|
|
53
|
+
redirectUrl: reuse.redirectUrl,
|
|
54
|
+
uiHints: resource.uiHints,
|
|
55
|
+
};
|
|
56
|
+
}
|
|
48
57
|
if (!(await resource.authorize(user)))
|
|
49
58
|
return {
|
|
50
59
|
ok: false,
|
|
@@ -53,6 +62,7 @@ let OAuthConsentService = class OAuthConsentService {
|
|
|
53
62
|
const scopes = this.grantableScopes(resource.scopes, sessionPayload.requestedScopes);
|
|
54
63
|
return {
|
|
55
64
|
ok: true,
|
|
65
|
+
autoApproved: false,
|
|
56
66
|
clientName: client.name,
|
|
57
67
|
clientId: client.id,
|
|
58
68
|
resourceName: resource.displayName,
|
|
@@ -68,6 +78,7 @@ let OAuthConsentService = class OAuthConsentService {
|
|
|
68
78
|
const scopes = this.grantableScopes(defaultResource?.scopes ?? [], sessionPayload.requestedScopes);
|
|
69
79
|
return {
|
|
70
80
|
ok: true,
|
|
81
|
+
autoApproved: false,
|
|
71
82
|
clientName: client.name,
|
|
72
83
|
clientId: client.id,
|
|
73
84
|
redirectUri: sessionPayload.redirectUri,
|
|
@@ -165,10 +176,11 @@ let OAuthConsentService = class OAuthConsentService {
|
|
|
165
176
|
}
|
|
166
177
|
return scopes;
|
|
167
178
|
}
|
|
168
|
-
async tryReuseConsent(user, sessionPayload) {
|
|
179
|
+
async tryReuseConsent(user, sessionPayload, resolvedResource) {
|
|
169
180
|
if (!sessionPayload.resource)
|
|
170
181
|
return null;
|
|
171
|
-
const resource =
|
|
182
|
+
const resource = resolvedResource ??
|
|
183
|
+
(await this.protectedResourceRegistry.getByResourceUrl(sessionPayload.resource));
|
|
172
184
|
if (!resource?.isFirstParty)
|
|
173
185
|
return null;
|
|
174
186
|
const consent = await this.userConsentRepository.findOne({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-consent.service.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth-consent.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,wDAA6C;AAE7C,gCAAkC;AAClC,+CAAyC;AAEzC,6FAAwF;AACxF,yGAA8F;AAC9F,yFAAmF;AACnF,mEAAwF;AACxF,mDAA+C;AAC/C,8EAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"oauth-consent.service.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth-consent.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { SourceControlledFile } from '@n8n/api-types';
|
|
2
2
|
import { Logger } from '@n8n/backend-common';
|
|
3
|
-
import { FolderRepository, ProjectRepository, SharedCredentialsRepository, SharedWorkflowRepository, TagRepository, WorkflowRepository, WorkflowTagMappingRepository } from '@n8n/db';
|
|
3
|
+
import { FolderRepository, ProjectRelationRepository, ProjectRepository, SharedCredentialsRepository, SharedWorkflowRepository, TagRepository, WorkflowRepository, WorkflowTagMappingRepository } from '@n8n/db';
|
|
4
4
|
import { InstanceSettings } from 'n8n-core';
|
|
5
5
|
import { DataTableRepository } from '../../modules/data-table/data-table.repository';
|
|
6
6
|
import { SourceControlScopedService } from './source-control-scoped.service';
|
|
@@ -19,23 +19,27 @@ export declare class SourceControlExportService {
|
|
|
19
19
|
private readonly folderRepository;
|
|
20
20
|
private readonly sourceControlScopedService;
|
|
21
21
|
private readonly dataTableRepository;
|
|
22
|
+
private readonly projectRelationRepository;
|
|
22
23
|
private gitFolder;
|
|
23
24
|
private workflowExportFolder;
|
|
24
25
|
private projectExportFolder;
|
|
25
26
|
private credentialExportFolder;
|
|
26
27
|
private dataTableExportFolder;
|
|
27
|
-
constructor(logger: Logger, variablesService: VariablesService, tagRepository: TagRepository, projectRepository: ProjectRepository, sharedCredentialsRepository: SharedCredentialsRepository, sharedWorkflowRepository: SharedWorkflowRepository, workflowRepository: WorkflowRepository, workflowTagMappingRepository: WorkflowTagMappingRepository, folderRepository: FolderRepository, sourceControlScopedService: SourceControlScopedService, instanceSettings: InstanceSettings, dataTableRepository: DataTableRepository);
|
|
28
|
+
constructor(logger: Logger, variablesService: VariablesService, tagRepository: TagRepository, projectRepository: ProjectRepository, sharedCredentialsRepository: SharedCredentialsRepository, sharedWorkflowRepository: SharedWorkflowRepository, workflowRepository: WorkflowRepository, workflowTagMappingRepository: WorkflowTagMappingRepository, folderRepository: FolderRepository, sourceControlScopedService: SourceControlScopedService, instanceSettings: InstanceSettings, dataTableRepository: DataTableRepository, projectRelationRepository: ProjectRelationRepository);
|
|
28
29
|
getWorkflowPath(workflowId: string): string;
|
|
29
30
|
getCredentialsPath(credentialsId: string): string;
|
|
30
31
|
getDataTablePath(dataTableId: string): string;
|
|
31
32
|
deleteRepositoryFolder(): Promise<void>;
|
|
32
33
|
rmFilesFromExportFolder(filesToBeDeleted: Set<string>): Promise<Set<string>>;
|
|
34
|
+
private getPersonalOwnerEmails;
|
|
35
|
+
private getResourceOwner;
|
|
33
36
|
private writeExportableWorkflowsToExportFolder;
|
|
34
37
|
exportWorkflowsToWorkFolder(candidates: SourceControlledFile[]): Promise<ExportResult>;
|
|
35
38
|
exportGlobalVariablesToWorkFolder(): Promise<ExportResult>;
|
|
36
39
|
exportDataTablesToWorkFolder(candidates: SourceControlledFile[], context: SourceControlContext): Promise<ExportResult>;
|
|
37
40
|
exportFoldersToWorkFolder(context: SourceControlContext): Promise<ExportResult>;
|
|
38
41
|
exportTagsToWorkFolder(context: SourceControlContext): Promise<ExportResult>;
|
|
42
|
+
private writeExportableCredentialsToExportFolder;
|
|
39
43
|
exportCredentialsToWorkFolder(candidates: SourceControlledFile[]): Promise<ExportResult>;
|
|
40
44
|
exportTeamProjectsToWorkFolder(candidates: SourceControlledFile[]): Promise<ExportResult>;
|
|
41
45
|
}
|