n8n 2.8.3 → 2.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (155) hide show
  1. package/dist/abstract-server.js +1 -1
  2. package/dist/abstract-server.js.map +1 -1
  3. package/dist/build.tsbuildinfo +1 -1
  4. package/dist/commands/export/workflow.d.ts +7 -0
  5. package/dist/commands/export/workflow.js +87 -14
  6. package/dist/commands/export/workflow.js.map +1 -1
  7. package/dist/commands/import/workflow.js +12 -2
  8. package/dist/commands/import/workflow.js.map +1 -1
  9. package/dist/controllers/ai.controller.js +5 -2
  10. package/dist/controllers/ai.controller.js.map +1 -1
  11. package/dist/controllers/e2e.controller.js +1 -0
  12. package/dist/controllers/e2e.controller.js.map +1 -1
  13. package/dist/controllers/security-settings.controller.js +2 -0
  14. package/dist/controllers/security-settings.controller.js.map +1 -1
  15. package/dist/credentials/credentials.controller.js +2 -2
  16. package/dist/credentials/credentials.controller.js.map +1 -1
  17. package/dist/credentials/credentials.service.d.ts +9 -2
  18. package/dist/credentials/credentials.service.js +44 -5
  19. package/dist/credentials/credentials.service.js.map +1 -1
  20. package/dist/credentials/validation.d.ts +5 -1
  21. package/dist/credentials/validation.js +78 -0
  22. package/dist/credentials/validation.js.map +1 -1
  23. package/dist/eventbus/event-message-classes/abstract-event-message.js +1 -1
  24. package/dist/eventbus/event-message-classes/abstract-event-message.js.map +1 -1
  25. package/dist/eventbus/event-message-classes/index.d.ts +2 -2
  26. package/dist/eventbus/event-message-classes/index.js +5 -0
  27. package/dist/eventbus/event-message-classes/index.js.map +1 -1
  28. package/dist/events/maps/relay.event-map.d.ts +36 -0
  29. package/dist/events/relays/log-streaming.event-relay.d.ts +5 -0
  30. package/dist/events/relays/log-streaming.event-relay.js +35 -0
  31. package/dist/events/relays/log-streaming.event-relay.js.map +1 -1
  32. package/dist/executions/pre-execution-checks/credentials-permission-checker.d.ts +4 -1
  33. package/dist/executions/pre-execution-checks/credentials-permission-checker.js +29 -4
  34. package/dist/executions/pre-execution-checks/credentials-permission-checker.js.map +1 -1
  35. package/dist/interfaces.d.ts +9 -2
  36. package/dist/modules/chat-hub/chat-hub-agent.entity.d.ts +3 -3
  37. package/dist/modules/chat-hub/chat-hub-agent.entity.js +7 -2
  38. package/dist/modules/chat-hub/chat-hub-agent.entity.js.map +1 -1
  39. package/dist/modules/chat-hub/chat-hub-agent.repository.d.ts +1 -0
  40. package/dist/modules/chat-hub/chat-hub-agent.repository.js +8 -0
  41. package/dist/modules/chat-hub/chat-hub-agent.repository.js.map +1 -1
  42. package/dist/modules/chat-hub/chat-hub-agent.service.d.ts +9 -4
  43. package/dist/modules/chat-hub/chat-hub-agent.service.js +39 -7
  44. package/dist/modules/chat-hub/chat-hub-agent.service.js.map +1 -1
  45. package/dist/modules/chat-hub/chat-hub-session.entity.d.ts +2 -3
  46. package/dist/modules/chat-hub/chat-hub-session.entity.js +7 -2
  47. package/dist/modules/chat-hub/chat-hub-session.entity.js.map +1 -1
  48. package/dist/modules/chat-hub/chat-hub-tool.entity.d.ts +23 -0
  49. package/dist/modules/chat-hub/chat-hub-tool.entity.js +54 -0
  50. package/dist/modules/chat-hub/chat-hub-tool.entity.js.map +1 -0
  51. package/dist/modules/chat-hub/chat-hub-tool.repository.d.ts +18 -0
  52. package/dist/modules/chat-hub/chat-hub-tool.repository.js +134 -0
  53. package/dist/modules/chat-hub/chat-hub-tool.repository.js.map +1 -0
  54. package/dist/modules/chat-hub/chat-hub-tool.service.d.ts +24 -0
  55. package/dist/modules/chat-hub/chat-hub-tool.service.js +119 -0
  56. package/dist/modules/chat-hub/chat-hub-tool.service.js.map +1 -0
  57. package/dist/modules/chat-hub/chat-hub-workflow.service.d.ts +3 -1
  58. package/dist/modules/chat-hub/chat-hub-workflow.service.js +6 -3
  59. package/dist/modules/chat-hub/chat-hub-workflow.service.js.map +1 -1
  60. package/dist/modules/chat-hub/chat-hub.controller.d.ts +13 -6
  61. package/dist/modules/chat-hub/chat-hub.controller.js +67 -3
  62. package/dist/modules/chat-hub/chat-hub.controller.js.map +1 -1
  63. package/dist/modules/chat-hub/chat-hub.module.d.ts +1 -1
  64. package/dist/modules/chat-hub/chat-hub.module.js +2 -1
  65. package/dist/modules/chat-hub/chat-hub.module.js.map +1 -1
  66. package/dist/modules/chat-hub/chat-hub.service.d.ts +3 -1
  67. package/dist/modules/chat-hub/chat-hub.service.js +30 -14
  68. package/dist/modules/chat-hub/chat-hub.service.js.map +1 -1
  69. package/dist/modules/chat-hub/chat-hub.settings.service.d.ts +3 -2
  70. package/dist/modules/chat-hub/chat-hub.settings.service.js +4 -4
  71. package/dist/modules/chat-hub/chat-hub.settings.service.js.map +1 -1
  72. package/dist/modules/chat-hub/chat-hub.types.d.ts +2 -3
  73. package/dist/modules/chat-hub/chat-hub.types.js.map +1 -1
  74. package/dist/modules/external-secrets.ee/external-secrets-manager.ee.d.ts +2 -1
  75. package/dist/modules/external-secrets.ee/external-secrets-manager.ee.js +22 -7
  76. package/dist/modules/external-secrets.ee/external-secrets-manager.ee.js.map +1 -1
  77. package/dist/modules/external-secrets.ee/providers/gcp-secrets-manager/gcp-secrets-manager.js +13 -5
  78. package/dist/modules/external-secrets.ee/providers/gcp-secrets-manager/gcp-secrets-manager.js.map +1 -1
  79. package/dist/modules/external-secrets.ee/secret-provider-access-check.service.ee.d.ts +6 -0
  80. package/dist/modules/external-secrets.ee/secret-provider-access-check.service.ee.js +28 -0
  81. package/dist/modules/external-secrets.ee/secret-provider-access-check.service.ee.js.map +1 -0
  82. package/dist/modules/external-secrets.ee/secrets-cache.service.d.ts +2 -1
  83. package/dist/modules/external-secrets.ee/secrets-cache.service.js.map +1 -1
  84. package/dist/modules/external-secrets.ee/secrets-providers-connections.controller.ee.d.ts +5 -5
  85. package/dist/modules/external-secrets.ee/secrets-providers-connections.controller.ee.js +10 -10
  86. package/dist/modules/external-secrets.ee/secrets-providers-connections.controller.ee.js.map +1 -1
  87. package/dist/modules/external-secrets.ee/secrets-providers-connections.service.ee.d.ts +14 -6
  88. package/dist/modules/external-secrets.ee/secrets-providers-connections.service.ee.js +128 -14
  89. package/dist/modules/external-secrets.ee/secrets-providers-connections.service.ee.js.map +1 -1
  90. package/dist/modules/external-secrets.ee/secrets-providers-project.controller.ee.d.ts +8 -1
  91. package/dist/modules/external-secrets.ee/secrets-providers-project.controller.ee.js +93 -1
  92. package/dist/modules/external-secrets.ee/secrets-providers-project.controller.ee.js.map +1 -1
  93. package/dist/modules/external-secrets.ee/secrets-providers.responses.ee.d.ts +2 -2
  94. package/dist/modules/mcp/mcp.event-relay.js +2 -0
  95. package/dist/modules/mcp/mcp.event-relay.js.map +1 -1
  96. package/dist/modules/quick-connect/handlers/firecrawl.handler.d.ts +8 -0
  97. package/dist/modules/quick-connect/handlers/firecrawl.handler.js +37 -0
  98. package/dist/modules/quick-connect/handlers/firecrawl.handler.js.map +1 -0
  99. package/dist/modules/quick-connect/handlers/quick-connect.handler.d.ts +3 -2
  100. package/dist/modules/quick-connect/handlers/quick-connect.handler.js.map +1 -1
  101. package/dist/modules/quick-connect/quick-connect.config.d.ts +36 -0
  102. package/dist/modules/quick-connect/quick-connect.config.js +3 -0
  103. package/dist/modules/quick-connect/quick-connect.config.js.map +1 -1
  104. package/dist/modules/quick-connect/quick-connect.module.js +2 -2
  105. package/dist/modules/quick-connect/quick-connect.module.js.map +1 -1
  106. package/dist/modules/quick-connect/quick-connect.service.d.ts +29 -0
  107. package/dist/modules/quick-connect/quick-connect.service.js +7 -3
  108. package/dist/modules/quick-connect/quick-connect.service.js.map +1 -1
  109. package/dist/modules/source-control.ee/source-control-export.service.ee.d.ts +1 -2
  110. package/dist/modules/source-control.ee/source-control-export.service.ee.js +4 -29
  111. package/dist/modules/source-control.ee/source-control-export.service.ee.js.map +1 -1
  112. package/dist/modules/source-control.ee/source-control-helper.ee.d.ts +9 -5
  113. package/dist/modules/source-control.ee/source-control-helper.ee.js +78 -3
  114. package/dist/modules/source-control.ee/source-control-helper.ee.js.map +1 -1
  115. package/dist/modules/source-control.ee/source-control-import.service.ee.d.ts +1 -1
  116. package/dist/modules/source-control.ee/source-control-import.service.ee.js +42 -28
  117. package/dist/modules/source-control.ee/source-control-import.service.ee.js.map +1 -1
  118. package/dist/modules/workflow-index/workflow-index.service.js +3 -0
  119. package/dist/modules/workflow-index/workflow-index.service.js.map +1 -1
  120. package/dist/public-api/types.d.ts +8 -0
  121. package/dist/public-api/v1/handlers/credentials/credentials.handler.js +1 -1
  122. package/dist/public-api/v1/handlers/credentials/credentials.handler.js.map +1 -1
  123. package/dist/public-api/v1/handlers/credentials/credentials.middleware.js +2 -2
  124. package/dist/public-api/v1/handlers/credentials/credentials.middleware.js.map +1 -1
  125. package/dist/public-api/v1/handlers/credentials/credentials.service.d.ts +1 -1
  126. package/dist/public-api/v1/handlers/credentials/credentials.service.js +17 -5
  127. package/dist/public-api/v1/handlers/credentials/credentials.service.js.map +1 -1
  128. package/dist/public-api/v1/handlers/executions/executions.handler.d.ts +2 -0
  129. package/dist/public-api/v1/handlers/executions/executions.handler.js +44 -0
  130. package/dist/public-api/v1/handlers/executions/executions.handler.js.map +1 -1
  131. package/dist/public-api/v1/handlers/executions/executions.service.d.ts +14 -0
  132. package/dist/public-api/v1/handlers/executions/executions.service.js +49 -0
  133. package/dist/public-api/v1/handlers/executions/executions.service.js.map +1 -0
  134. package/dist/public-api/v1/openapi.yml +65 -11
  135. package/dist/scaling/worker-server.js +1 -1
  136. package/dist/scaling/worker-server.js.map +1 -1
  137. package/dist/services/ai-workflow-builder.service.d.ts +3 -2
  138. package/dist/services/ai-workflow-builder.service.js +56 -5
  139. package/dist/services/ai-workflow-builder.service.js.map +1 -1
  140. package/dist/services/frontend.service.js +2 -0
  141. package/dist/services/frontend.service.js.map +1 -1
  142. package/dist/services/import.service.d.ts +2 -2
  143. package/dist/services/import.service.js +3 -0
  144. package/dist/services/import.service.js.map +1 -1
  145. package/dist/task-runners/task-broker/task-broker-server.js +1 -1
  146. package/dist/task-runners/task-broker/task-broker-server.js.map +1 -1
  147. package/dist/workflows/workflow-execution.service.js +3 -1
  148. package/dist/workflows/workflow-execution.service.js.map +1 -1
  149. package/dist/workflows/workflow.service.d.ts +3 -2
  150. package/dist/workflows/workflow.service.js +10 -3
  151. package/dist/workflows/workflow.service.js.map +1 -1
  152. package/package.json +23 -22
  153. package/dist/modules/quick-connect/handlers/sample.handler.d.ts +0 -7
  154. package/dist/modules/quick-connect/handlers/sample.handler.js +0 -27
  155. package/dist/modules/quick-connect/handlers/sample.handler.js.map +0 -1
@@ -36,7 +36,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
36
36
  return (mod && mod.__esModule) ? mod : { "default": mod };
37
37
  };
38
38
  Object.defineProperty(exports, "__esModule", { value: true });
39
- exports.stringContainsExpression = stringContainsExpression;
39
+ exports.sanitizeCredentialData = sanitizeCredentialData;
40
+ exports.mergeRemoteCrendetialDataIntoLocalCredentialData = mergeRemoteCrendetialDataIntoLocalCredentialData;
40
41
  exports.getWorkflowExportPath = getWorkflowExportPath;
41
42
  exports.getProjectExportPath = getProjectExportPath;
42
43
  exports.getCredentialExportPath = getCredentialExportPath;
@@ -64,6 +65,7 @@ const backend_common_1 = require("@n8n/backend-common");
64
65
  const di_1 = require("@n8n/di");
65
66
  const crypto_1 = require("crypto");
66
67
  const fs_1 = require("fs");
68
+ const isEqual_1 = __importDefault(require("lodash/isEqual"));
67
69
  const n8n_workflow_1 = require("n8n-workflow");
68
70
  const strict_1 = require("node:assert/strict");
69
71
  const promises_1 = require("node:fs/promises");
@@ -71,7 +73,70 @@ const path_1 = __importDefault(require("path"));
71
73
  const license_1 = require("../../license");
72
74
  const constants_1 = require("./constants");
73
75
  function stringContainsExpression(testString) {
74
- return /^=.*\{\{.*\}\}/.test(testString);
76
+ return /^=.*\{\{.+\}\}/.test(testString);
77
+ }
78
+ function sanitizeCredentialData(data) {
79
+ const result = (0, n8n_workflow_1.deepCopy)(data);
80
+ for (const [key, value] of Object.entries(data)) {
81
+ if (value === null || key === 'oauthTokenData') {
82
+ delete result[key];
83
+ }
84
+ else if (typeof value === 'object') {
85
+ result[key] = sanitizeCredentialData(value);
86
+ }
87
+ else if (typeof value === 'string') {
88
+ result[key] = stringContainsExpression(value) ? value : '';
89
+ }
90
+ }
91
+ return result;
92
+ }
93
+ function isPlainObject(value) {
94
+ return value !== null && typeof value === 'object' && !Array.isArray(value);
95
+ }
96
+ function mergeSingleValue(sanitizedRemoteValue, localValue) {
97
+ if (typeof sanitizedRemoteValue === 'string') {
98
+ if (stringContainsExpression(sanitizedRemoteValue)) {
99
+ return sanitizedRemoteValue;
100
+ }
101
+ else if (localValue !== undefined && localValue !== null) {
102
+ return localValue;
103
+ }
104
+ return undefined;
105
+ }
106
+ if (typeof sanitizedRemoteValue === 'number' || typeof sanitizedRemoteValue === 'boolean') {
107
+ return sanitizedRemoteValue;
108
+ }
109
+ if (Array.isArray(sanitizedRemoteValue)) {
110
+ if (Array.isArray(localValue) && localValue.length === sanitizedRemoteValue.length) {
111
+ return sanitizedRemoteValue.map((sanitizedItem, index) => {
112
+ const localItem = localValue[index];
113
+ return mergeSingleValue(sanitizedItem, localItem);
114
+ });
115
+ }
116
+ return sanitizedRemoteValue;
117
+ }
118
+ if (isPlainObject(sanitizedRemoteValue)) {
119
+ if (isPlainObject(localValue)) {
120
+ return mergeRemoteCrendetialDataIntoLocalCredentialData({
121
+ local: localValue,
122
+ remote: sanitizedRemoteValue,
123
+ });
124
+ }
125
+ return sanitizedRemoteValue;
126
+ }
127
+ return undefined;
128
+ }
129
+ function mergeRemoteCrendetialDataIntoLocalCredentialData({ local, remote, }) {
130
+ const merged = {};
131
+ const sanitizedRemote = sanitizeCredentialData(remote);
132
+ for (const [key, sanitizedRemoteValue] of Object.entries(sanitizedRemote)) {
133
+ const localValue = local[key];
134
+ const mergedValue = mergeSingleValue(sanitizedRemoteValue, localValue);
135
+ if (mergedValue !== undefined) {
136
+ merged[key] = mergedValue;
137
+ }
138
+ }
139
+ return merged;
75
140
  }
76
141
  function getWorkflowExportPath(workflowId, workflowExportFolder) {
77
142
  return (0, backend_common_1.safeJoinPath)(workflowExportFolder, `${workflowId}.json`);
@@ -313,6 +378,16 @@ function areSameCredentials(credA, credB) {
313
378
  return (credA.name === credB.name &&
314
379
  credA.type === credB.type &&
315
380
  !hasOwnerChanged(credA.ownedBy, credB.ownedBy) &&
316
- Boolean(credA.isGlobal) === Boolean(credB.isGlobal));
381
+ Boolean(credA.isGlobal) === Boolean(credB.isGlobal) &&
382
+ !hasSynchableCredentialDataChanged(credA.data, credB.data));
383
+ }
384
+ function hasSynchableCredentialDataChanged(data1, data2) {
385
+ if (!data1 && !data2)
386
+ return false;
387
+ if (!data1 || !data2)
388
+ return true;
389
+ const sanitizedData1 = sanitizeCredentialData(data1);
390
+ const sanitizedData2 = sanitizeCredentialData(data2);
391
+ return !(0, isEqual_1.default)(sanitizedData1, sanitizedData2);
317
392
  }
318
393
  //# sourceMappingURL=source-control-helper.ee.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"source-control-helper.ee.js","sourceRoot":"","sources":["../../../src/modules/source-control.ee/source-control-helper.ee.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"source-control-helper.ee.js","sourceRoot":"","sources":["../../../src/modules/source-control.ee/source-control-helper.ee.ts"],"names":[],"mappings":"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"}
@@ -6,7 +6,7 @@ import { DataTableRepository } from '../../modules/data-table/data-table.reposit
6
6
  import { DataTableColumnRepository } from '../../modules/data-table/data-table-column.repository';
7
7
  import { DataTableDDLService } from '../../modules/data-table/data-table-ddl.service';
8
8
  import { ErrorReporter, InstanceSettings } from 'n8n-core';
9
- import { type AutoPublishMode } from 'n8n-workflow';
9
+ import type { AutoPublishMode } from 'n8n-workflow';
10
10
  import { CredentialsService } from '../../credentials/credentials.service';
11
11
  import { TagService } from '../../services/tag.service';
12
12
  import { WorkflowHistoryService } from '../../workflows/workflow-history/workflow-history.service';
@@ -26,7 +26,6 @@ const fast_glob_1 = __importDefault(require("fast-glob"));
26
26
  const isEqual_1 = __importDefault(require("lodash/isEqual"));
27
27
  const n8n_core_1 = require("n8n-core");
28
28
  const n8n_workflow_1 = require("n8n-workflow");
29
- const n8n_workflow_2 = require("n8n-workflow");
30
29
  const promises_1 = require("node:fs/promises");
31
30
  const path_1 = __importDefault(require("path"));
32
31
  const credentials_service_1 = require("../../credentials/credentials.service");
@@ -247,7 +246,7 @@ let SourceControlImportService = class SourceControlImportService {
247
246
  const accessibleProjects = await this.sourceControlScopedService.getAuthorizedProjectsFromContext(context);
248
247
  const remoteCredentialFilesRead = await Promise.all(remoteCredentialFiles.map(async (file) => {
249
248
  this.logger.debug(`Parsing credential file ${file}`);
250
- const remote = (0, n8n_workflow_2.jsonParse)(await (0, promises_1.readFile)(file, { encoding: 'utf8' }));
249
+ const remote = (0, n8n_workflow_1.jsonParse)(await (0, promises_1.readFile)(file, { encoding: 'utf8' }));
251
250
  return remote;
252
251
  }));
253
252
  const remoteCredentialFilesParsed = remoteCredentialFilesRead
@@ -292,6 +291,7 @@ let SourceControlImportService = class SourceControlImportService {
292
291
  id: true,
293
292
  name: true,
294
293
  type: true,
294
+ data: true,
295
295
  isGlobal: true,
296
296
  shared: {
297
297
  project: {
@@ -315,10 +315,18 @@ let SourceControlImportService = class SourceControlImportService {
315
315
  });
316
316
  return localCredentials.map((local) => {
317
317
  const remoteOwnerProject = local.shared?.find((s) => s.role === 'credential:owner')?.project;
318
+ let data = {};
319
+ try {
320
+ const credentials = new n8n_core_1.Credentials({ id: local.id, name: local.name }, local.type, local.data);
321
+ data = (0, source_control_helper_ee_1.sanitizeCredentialData)(credentials.getData());
322
+ }
323
+ catch {
324
+ }
318
325
  return {
319
326
  id: local.id,
320
327
  name: local.name,
321
328
  type: local.type,
329
+ data,
322
330
  filename: (0, source_control_helper_ee_1.getCredentialExportPath)(local.id, this.credentialExportFolder),
323
331
  ownedBy: remoteOwnerProject ? getOwnerFromProject(remoteOwnerProject) : undefined,
324
332
  isGlobal: local.isGlobal,
@@ -332,7 +340,7 @@ let SourceControlImportService = class SourceControlImportService {
332
340
  });
333
341
  if (variablesFile.length > 0) {
334
342
  this.logger.debug(`Importing variables from file ${variablesFile[0]}`);
335
- return (0, n8n_workflow_2.jsonParse)(await (0, promises_1.readFile)(variablesFile[0], { encoding: 'utf8' }), {
343
+ return (0, n8n_workflow_1.jsonParse)(await (0, promises_1.readFile)(variablesFile[0], { encoding: 'utf8' }), {
336
344
  fallbackValue: [],
337
345
  });
338
346
  }
@@ -353,7 +361,7 @@ let SourceControlImportService = class SourceControlImportService {
353
361
  this.logger.debug(`Parsing data table file ${file}`);
354
362
  const fileContent = await (0, promises_1.readFile)(file, { encoding: 'utf8' });
355
363
  try {
356
- return (0, n8n_workflow_2.jsonParse)(fileContent);
364
+ return (0, n8n_workflow_1.jsonParse)(fileContent);
357
365
  }
358
366
  catch (error) {
359
367
  this.logger.warn(`Failed to parse data table from file ${file}: invalid JSON format`);
@@ -423,7 +431,7 @@ let SourceControlImportService = class SourceControlImportService {
423
431
  });
424
432
  if (foldersFile.length > 0) {
425
433
  this.logger.debug(`Importing folders from file ${foldersFile[0]}`);
426
- const mappedFolders = (0, n8n_workflow_2.jsonParse)(await (0, promises_1.readFile)(foldersFile[0], { encoding: 'utf8' }), {
434
+ const mappedFolders = (0, n8n_workflow_1.jsonParse)(await (0, promises_1.readFile)(foldersFile[0], { encoding: 'utf8' }), {
427
435
  fallbackValue: { folders: [] },
428
436
  });
429
437
  const accessibleProjects = await this.sourceControlScopedService.getAuthorizedProjectsFromContext(context);
@@ -464,7 +472,7 @@ let SourceControlImportService = class SourceControlImportService {
464
472
  });
465
473
  if (tagsFile.length > 0) {
466
474
  this.logger.debug(`Importing tags from file ${tagsFile[0]}`);
467
- const mappedTags = (0, n8n_workflow_2.jsonParse)(await (0, promises_1.readFile)(tagsFile[0], { encoding: 'utf8' }), { fallbackValue: { tags: [], mappings: [] } });
475
+ const mappedTags = (0, n8n_workflow_1.jsonParse)(await (0, promises_1.readFile)(tagsFile[0], { encoding: 'utf8' }), { fallbackValue: { tags: [], mappings: [] } });
468
476
  const accessibleWorkflows = await this.sourceControlScopedService.getWorkflowsInAdminProjectsFromContext(context);
469
477
  if (accessibleWorkflows) {
470
478
  mappedTags.mappings = mappedTags.mappings.filter((mapping) => accessibleWorkflows.some((workflow) => workflow.id === mapping.workflowId));
@@ -491,7 +499,7 @@ let SourceControlImportService = class SourceControlImportService {
491
499
  const remoteProjects = await Promise.all(remoteProjectFiles.map(async (file) => {
492
500
  this.logger.debug(`Parsing project file ${file}`);
493
501
  const fileContent = await (0, promises_1.readFile)(file, { encoding: 'utf8' });
494
- const parsedProject = (0, n8n_workflow_2.jsonParse)(fileContent);
502
+ const parsedProject = (0, n8n_workflow_1.jsonParse)(fileContent);
495
503
  return {
496
504
  ...parsedProject,
497
505
  filename: (0, source_control_helper_ee_1.getProjectExportPath)(parsedProject.id, this.projectExportFolder),
@@ -579,7 +587,7 @@ let SourceControlImportService = class SourceControlImportService {
579
587
  parentFolder: existingFolderIds.includes(parentFolderId) ? { id: parentFolderId } : null,
580
588
  }, ['id']);
581
589
  if (upsertResult?.identifiers?.length !== 1) {
582
- throw new n8n_workflow_2.UnexpectedError('Failed to upsert workflow', {
590
+ throw new n8n_workflow_1.UnexpectedError('Failed to upsert workflow', {
583
591
  extra: { workflowId: id ?? 'new' },
584
592
  });
585
593
  }
@@ -587,7 +595,7 @@ let SourceControlImportService = class SourceControlImportService {
587
595
  await this.saveOrUpdateWorkflowHistory({ id, versionId, nodes, connections }, userId);
588
596
  }
589
597
  catch (error) {
590
- const e = (0, n8n_workflow_2.ensureError)(error);
598
+ const e = (0, n8n_workflow_1.ensureError)(error);
591
599
  this.logger.error(`Failed to save or update workflow history for workflow ${id}`, {
592
600
  error: e,
593
601
  });
@@ -617,11 +625,11 @@ let SourceControlImportService = class SourceControlImportService {
617
625
  this.logger.debug(`Parsing workflow file ${file}`);
618
626
  try {
619
627
  const fileContent = await (0, promises_1.readFile)(file, { encoding: 'utf8' });
620
- return (0, n8n_workflow_2.jsonParse)(fileContent);
628
+ return (0, n8n_workflow_1.jsonParse)(fileContent);
621
629
  }
622
630
  catch (error) {
623
631
  this.logger.error(`Failed to parse workflow file ${file}`, { error });
624
- throw new n8n_workflow_2.UnexpectedError(`Failed to parse workflow file ${file}: ${error instanceof Error ? error.message : String(error)}`);
632
+ throw new n8n_workflow_1.UnexpectedError(`Failed to parse workflow file ${file}: ${error instanceof Error ? error.message : String(error)}`);
625
633
  }
626
634
  }
627
635
  shouldAutoPublishWorkflow(existingWorkflow, importedWorkflow, autoPublish) {
@@ -653,7 +661,7 @@ let SourceControlImportService = class SourceControlImportService {
653
661
  return true;
654
662
  }
655
663
  catch (e) {
656
- const error = (0, n8n_workflow_2.ensureError)(e);
664
+ const error = (0, n8n_workflow_1.ensureError)(e);
657
665
  this.logger.error(`Failed to unpublish workflow ${workflowId}`, { error });
658
666
  return false;
659
667
  }
@@ -673,7 +681,7 @@ let SourceControlImportService = class SourceControlImportService {
673
681
  return { success: true };
674
682
  }
675
683
  catch (e) {
676
- const error = (0, n8n_workflow_2.ensureError)(e);
684
+ const error = (0, n8n_workflow_1.ensureError)(e);
677
685
  this.logger.error(`Failed to publish workflow ${workflowId}`, { error });
678
686
  return { success: false, error: error.message };
679
687
  }
@@ -697,16 +705,22 @@ let SourceControlImportService = class SourceControlImportService {
697
705
  let importCredentialsResult = [];
698
706
  importCredentialsResult = await Promise.all(candidates.map(async (candidate) => {
699
707
  this.logger.debug(`Importing credentials file ${candidate.file}`);
700
- const credential = (0, n8n_workflow_2.jsonParse)(await (0, promises_1.readFile)(candidate.file, { encoding: 'utf8' }));
708
+ const credential = (0, n8n_workflow_1.jsonParse)(await (0, promises_1.readFile)(candidate.file, { encoding: 'utf8' }));
701
709
  const existingCredential = existingCredentials.find((e) => e.id === credential.id && e.type === credential.type);
702
710
  const { name, type, data, id, isGlobal = false } = credential;
703
711
  const newCredentialObject = new n8n_core_1.Credentials({ id, name }, type);
704
712
  if (existingCredential?.data) {
705
- newCredentialObject.data = existingCredential.data;
713
+ const existingDecrypted = new n8n_core_1.Credentials({ id: existingCredential.id, name: existingCredential.name }, existingCredential.type, existingCredential.data);
714
+ const localData = existingDecrypted.getData();
715
+ const mergedData = (0, source_control_helper_ee_1.mergeRemoteCrendetialDataIntoLocalCredentialData)({
716
+ local: localData,
717
+ remote: data,
718
+ });
719
+ newCredentialObject.setData(mergedData);
706
720
  }
707
721
  else {
708
- const { oauthTokenData, ...rest } = data;
709
- newCredentialObject.setData(rest);
722
+ const sanitizedData = (0, source_control_helper_ee_1.sanitizeCredentialData)(data);
723
+ newCredentialObject.setData(sanitizedData);
710
724
  }
711
725
  this.logger.debug(`Updating credential id ${newCredentialObject.id}`);
712
726
  await this.credentialsRepository.upsert({ ...newCredentialObject, isGlobal }, ['id']);
@@ -730,10 +744,10 @@ let SourceControlImportService = class SourceControlImportService {
730
744
  let mappedTags;
731
745
  try {
732
746
  this.logger.debug(`Importing tags from file ${candidate.file}`);
733
- mappedTags = (0, n8n_workflow_2.jsonParse)(await (0, promises_1.readFile)(candidate.file, { encoding: 'utf8' }), { fallbackValue: { tags: [], mappings: [] } });
747
+ mappedTags = (0, n8n_workflow_1.jsonParse)(await (0, promises_1.readFile)(candidate.file, { encoding: 'utf8' }), { fallbackValue: { tags: [], mappings: [] } });
734
748
  }
735
749
  catch (e) {
736
- const error = (0, n8n_workflow_2.ensureError)(e);
750
+ const error = (0, n8n_workflow_1.ensureError)(e);
737
751
  this.logger.error(`Failed to import tags from file ${candidate.file}`, { error });
738
752
  return;
739
753
  }
@@ -749,7 +763,7 @@ let SourceControlImportService = class SourceControlImportService {
749
763
  select: ['id'],
750
764
  });
751
765
  if (findByName && findByName.id !== tag.id) {
752
- throw new n8n_workflow_2.UserError(`A tag with the name <strong>${tag.name}</strong> already exists locally.<br />Please either rename the local tag, or the remote one with the id <strong>${tag.id}</strong> in the tags.json file.`);
766
+ throw new n8n_workflow_1.UserError(`A tag with the name <strong>${tag.name}</strong> already exists locally.<br />Please either rename the local tag, or the remote one with the id <strong>${tag.id}</strong> in the tags.json file.`);
753
767
  }
754
768
  const tagCopy = this.tagRepository.create(tag);
755
769
  await this.tagRepository.upsert(tagCopy, {
@@ -790,12 +804,12 @@ let SourceControlImportService = class SourceControlImportService {
790
804
  const personalProject = await this.projectRepository.getPersonalProjectForUserOrFail(user.id);
791
805
  try {
792
806
  this.logger.debug(`Importing folders from file ${candidate.file}`);
793
- mappedFolders = (0, n8n_workflow_2.jsonParse)(await (0, promises_1.readFile)(candidate.file, { encoding: 'utf8' }), {
807
+ mappedFolders = (0, n8n_workflow_1.jsonParse)(await (0, promises_1.readFile)(candidate.file, { encoding: 'utf8' }), {
794
808
  fallbackValue: { folders: [] },
795
809
  });
796
810
  }
797
811
  catch (e) {
798
- const error = (0, n8n_workflow_2.ensureError)(e);
812
+ const error = (0, n8n_workflow_1.ensureError)(e);
799
813
  this.logger.error(`Failed to import folders from file ${candidate.file}`, { error });
800
814
  return;
801
815
  }
@@ -876,7 +890,7 @@ let SourceControlImportService = class SourceControlImportService {
876
890
  let importedVariables;
877
891
  try {
878
892
  this.logger.debug(`Importing variables from file ${candidate.file}`);
879
- importedVariables = (0, n8n_workflow_2.jsonParse)(await (0, promises_1.readFile)(candidate.file, { encoding: 'utf8' }), { fallbackValue: [] });
893
+ importedVariables = (0, n8n_workflow_1.jsonParse)(await (0, promises_1.readFile)(candidate.file, { encoding: 'utf8' }), { fallbackValue: [] });
880
894
  }
881
895
  catch (e) {
882
896
  this.logger.error(`Failed to import tags from file ${candidate.file}`, { error: e });
@@ -894,7 +908,7 @@ let SourceControlImportService = class SourceControlImportService {
894
908
  for (const candidate of candidates) {
895
909
  try {
896
910
  this.logger.debug(`Importing data table from file ${candidate.file}`);
897
- const dataTable = (0, n8n_workflow_2.jsonParse)(await (0, promises_1.readFile)(candidate.file, { encoding: 'utf8' }));
911
+ const dataTable = (0, n8n_workflow_1.jsonParse)(await (0, promises_1.readFile)(candidate.file, { encoding: 'utf8' }));
898
912
  if (!dataTable || typeof dataTable !== 'object' || !dataTable.id || !dataTable.name) {
899
913
  this.logger.warn(`Failed to parse data table from file ${candidate.file}`);
900
914
  continue;
@@ -990,7 +1004,7 @@ let SourceControlImportService = class SourceControlImportService {
990
1004
  }
991
1005
  catch (error) {
992
1006
  this.logger.error(`Failed to import data table ${candidate.name}`, {
993
- error: (0, n8n_workflow_2.ensureError)(error),
1007
+ error: (0, n8n_workflow_1.ensureError)(error),
994
1008
  });
995
1009
  }
996
1010
  }
@@ -1002,7 +1016,7 @@ let SourceControlImportService = class SourceControlImportService {
1002
1016
  for (const candidate of candidates) {
1003
1017
  try {
1004
1018
  this.logger.debug(`Importing project file ${candidate.file}`);
1005
- const project = (0, n8n_workflow_2.jsonParse)(await (0, promises_1.readFile)(candidate.file, { encoding: 'utf8' }));
1019
+ const project = (0, n8n_workflow_1.jsonParse)(await (0, promises_1.readFile)(candidate.file, { encoding: 'utf8' }));
1006
1020
  if (typeof project.owner !== 'object' ||
1007
1021
  project.owner.type !== 'team' ||
1008
1022
  project.owner.teamId !== project.id) {
@@ -1041,7 +1055,7 @@ let SourceControlImportService = class SourceControlImportService {
1041
1055
  });
1042
1056
  }
1043
1057
  catch (error) {
1044
- const errorMessage = (0, n8n_workflow_2.ensureError)(error);
1058
+ const errorMessage = (0, n8n_workflow_1.ensureError)(error);
1045
1059
  this.logger.error(`Failed to import project from file ${candidate.file}`, {
1046
1060
  error: errorMessage,
1047
1061
  });
@@ -1129,7 +1143,7 @@ let SourceControlImportService = class SourceControlImportService {
1129
1143
  }
1130
1144
  (0, utils_1.assertNever)(owner);
1131
1145
  const errorOwner = owner;
1132
- throw new n8n_workflow_2.UnexpectedError(`Unknown resource owner type "${typeof errorOwner !== 'string' ? errorOwner.type : 'UNKNOWN'}" found when finding owner project`);
1146
+ throw new n8n_workflow_1.UnexpectedError(`Unknown resource owner type "${typeof errorOwner !== 'string' ? errorOwner.type : 'UNKNOWN'}" found when finding owner project`);
1133
1147
  }
1134
1148
  async createTeamProject(owner) {
1135
1149
  let teamProject = null;