n8n 2.46.1 → 2.46.3

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 (76) hide show
  1. package/dist/binary-data/binary-data-access.service.js +1 -1
  2. package/dist/binary-data/binary-data-access.service.js.map +1 -1
  3. package/dist/build.tsbuildinfo +1 -1
  4. package/dist/controllers/oauth/oauth1-credential.controller.js +6 -2
  5. package/dist/controllers/oauth/oauth1-credential.controller.js.map +1 -1
  6. package/dist/controllers/oauth/oauth2-credential.controller.js +7 -4
  7. package/dist/controllers/oauth/oauth2-credential.controller.js.map +1 -1
  8. package/dist/credentials/credential-options.service.js +4 -1
  9. package/dist/credentials/credential-options.service.js.map +1 -1
  10. package/dist/credentials-helper.d.ts +5 -1
  11. package/dist/credentials-helper.js +24 -4
  12. package/dist/credentials-helper.js.map +1 -1
  13. package/dist/credentials-overwrites.d.ts +17 -6
  14. package/dist/credentials-overwrites.js +102 -20
  15. package/dist/credentials-overwrites.js.map +1 -1
  16. package/dist/errors/managed-app-unavailable.error.d.ts +3 -0
  17. package/dist/errors/managed-app-unavailable.error.js +8 -0
  18. package/dist/errors/managed-app-unavailable.error.js.map +1 -0
  19. package/dist/evaluation.ee/evaluation-dataset.service.js +6 -0
  20. package/dist/evaluation.ee/evaluation-dataset.service.js.map +1 -1
  21. package/dist/executions/execution.service.js +5 -0
  22. package/dist/executions/execution.service.js.map +1 -1
  23. package/dist/interfaces.d.ts +10 -0
  24. package/dist/managed-versions.d.ts +14 -0
  25. package/dist/managed-versions.js +150 -0
  26. package/dist/managed-versions.js.map +1 -0
  27. package/dist/modules/agents/integrations/platforms/slack/slack-managed-setup.service.d.ts +2 -0
  28. package/dist/modules/agents/integrations/platforms/slack/slack-managed-setup.service.js +32 -3
  29. package/dist/modules/agents/integrations/platforms/slack/slack-managed-setup.service.js.map +1 -1
  30. package/dist/modules/agents/integrations/platforms/teams/teams-managed-setup.service.js +4 -1
  31. package/dist/modules/agents/integrations/platforms/teams/teams-managed-setup.service.js.map +1 -1
  32. package/dist/modules/agents/integrations/platforms/teams/teams-manager-token.service.js +12 -3
  33. package/dist/modules/agents/integrations/platforms/teams/teams-manager-token.service.js.map +1 -1
  34. package/dist/modules/breaking-changes/breaking-changes.service.d.ts +8 -2
  35. package/dist/modules/breaking-changes/breaking-changes.service.js +72 -11
  36. package/dist/modules/breaking-changes/breaking-changes.service.js.map +1 -1
  37. package/dist/modules/breaking-changes/database/repositories/migration-finding.repository.d.ts +3 -1
  38. package/dist/modules/breaking-changes/database/repositories/migration-finding.repository.js +2 -2
  39. package/dist/modules/breaking-changes/database/repositories/migration-finding.repository.js.map +1 -1
  40. package/dist/modules/breaking-changes/notifications/migration-finding-notification.service.d.ts +1 -0
  41. package/dist/modules/breaking-changes/notifications/migration-finding-notification.service.js +8 -3
  42. package/dist/modules/breaking-changes/notifications/migration-finding-notification.service.js.map +1 -1
  43. package/dist/modules/breaking-changes/query/migration-finding-query.service.d.ts +1 -0
  44. package/dist/modules/breaking-changes/query/migration-finding-query.service.js +16 -2
  45. package/dist/modules/breaking-changes/query/migration-finding-query.service.js.map +1 -1
  46. package/dist/modules/breaking-changes/sync/migration-finding-diff.d.ts +2 -0
  47. package/dist/modules/breaking-changes/sync/migration-finding-diff.js +33 -15
  48. package/dist/modules/breaking-changes/sync/migration-finding-diff.js.map +1 -1
  49. package/dist/modules/breaking-changes/sync/migration-finding-sync.listener.js +6 -0
  50. package/dist/modules/breaking-changes/sync/migration-finding-sync.listener.js.map +1 -1
  51. package/dist/modules/breaking-changes/sync/migration-finding-sync.service.d.ts +1 -1
  52. package/dist/modules/breaking-changes/sync/migration-finding-sync.service.js +33 -11
  53. package/dist/modules/breaking-changes/sync/migration-finding-sync.service.js.map +1 -1
  54. package/dist/modules/instance-ai/mcp/instance-ai-mcp-registry.service.js +4 -3
  55. package/dist/modules/instance-ai/mcp/instance-ai-mcp-registry.service.js.map +1 -1
  56. package/dist/modules/mcp-discovery/eligibility.d.ts +1 -1
  57. package/dist/modules/mcp-discovery/eligibility.js +1 -1
  58. package/dist/modules/mcp-discovery/eligibility.js.map +1 -1
  59. package/dist/modules/mcp-registry/mcp-connection-discovery.service.js +7 -12
  60. package/dist/modules/mcp-registry/mcp-connection-discovery.service.js.map +1 -1
  61. package/dist/modules/mcp-registry/mcp-credential-access.d.ts +3 -0
  62. package/dist/modules/mcp-registry/mcp-credential-access.js +18 -0
  63. package/dist/modules/mcp-registry/mcp-credential-access.js.map +1 -0
  64. package/dist/oauth/oauth.service.d.ts +9 -2
  65. package/dist/oauth/oauth.service.js +37 -15
  66. package/dist/oauth/oauth.service.js.map +1 -1
  67. package/dist/scaling/job-processor.js +1 -0
  68. package/dist/scaling/job-processor.js.map +1 -1
  69. package/dist/scaling/scaling.service.js +1 -0
  70. package/dist/scaling/scaling.service.js.map +1 -1
  71. package/dist/scaling/scaling.types.d.ts +1 -0
  72. package/dist/services/frontend.service.js +1 -0
  73. package/dist/services/frontend.service.js.map +1 -1
  74. package/dist/workflow-runner.js +2 -0
  75. package/dist/workflow-runner.js.map +1 -1
  76. package/package.json +35 -35
package/dist/controllers/oauth/oauth1-credential.controller.js CHANGED
@@ -15,6 +15,7 @@ const backend_services_1 = require("@n8n/backend-services");
15
15
  const decorators_1 = require("@n8n/decorators");
16
16
  const ensure_error_1 = require("@n8n/utils/errors/ensure-error");
17
17
  const credentials_overwrites_1 = require("../../credentials-overwrites");
18
+ const managed_versions_1 = require("../../managed-versions");
18
19
  const oauth_service_1 = require("../../oauth/oauth.service");
19
20
  let OAuth1CredentialController = class OAuth1CredentialController {
20
21
  constructor(oauthService, logger, eventService, credentialsOverwrites) {
@@ -45,8 +46,11 @@ let OAuth1CredentialController = class OAuth1CredentialController {
45
46
  oauthVerifier: oauth_verifier,
46
47
  oauthTokenSecret: flowState.oauthTokenSecret ?? '',
47
48
  });
49
+ const tokenDataToSave = flowState.managedVersion === undefined
50
+ ? oauthTokenData
51
+ : (0, managed_versions_1.withTokenVersion)(oauthTokenData, flowState.managedVersion);
48
52
  if (!state.origin || state.origin === 'static-credential') {
49
- await this.oauthService.encryptAndSaveData(credential, { oauthTokenData });
53
+ await this.oauthService.encryptAndSaveData(credential, { oauthTokenData: tokenDataToSave });
50
54
  this.logger.debug('OAuth1 callback successful for new credential', {
51
55
  credentialId: credential.id,
52
56
  });
@@ -61,7 +65,7 @@ let OAuth1CredentialController = class OAuth1CredentialController {
61
65
  !state.authorizationHeader.startsWith('Bearer ')) {
62
66
  return this.oauthService.renderCallbackError(res, 'Authorization header is required');
63
67
  }
64
- await this.oauthService.saveDynamicCredential(credential, oauthTokenData, state.authorizationHeader.split('Bearer ')[1], state.credentialResolverId, state.authMetadata ?? {});
68
+ await this.oauthService.saveDynamicCredential(credential, tokenDataToSave, state.authorizationHeader.split('Bearer ')[1], state.credentialResolverId, state.authMetadata ?? {});
65
69
  if (typeof state.userId === 'string') {
66
70
  this.eventService.emit('private-credential-user-connected', {
67
71
  user: { id: state.userId },
package/dist/controllers/oauth/oauth1-credential.controller.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"oauth1-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth1-credential.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oauth1-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth1-credential.controller.ts"],"names":[],"mappings":"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"}
package/dist/controllers/oauth/oauth2-credential.controller.js CHANGED
@@ -25,6 +25,7 @@ const ensure_error_1 = require("@n8n/utils/errors/ensure-error");
25
25
  const n8n_workflow_1 = require("n8n-workflow");
26
26
  const credentials_overwrites_1 = require("../../credentials-overwrites");
27
27
  const external_hooks_1 = require("../../external-hooks");
28
+ const managed_versions_1 = require("../../managed-versions");
28
29
  const oauth_service_1 = require("../../oauth/oauth.service");
29
30
  let OAuth2CredentialController = class OAuth2CredentialController {
30
31
  constructor(oauthService, logger, externalHooks, oauthJweServiceProxy, eventService, credentialsOverwrites) {
@@ -94,9 +95,8 @@ let OAuth2CredentialController = class OAuth2CredentialController {
94
95
  const tokenResponse = oauthCredentials.jweEnabled === true
95
96
  ? await this.oauthJweServiceProxy.decryptOAuth2TokenData(rawTokenResponse)
96
97
  : rawTokenResponse;
97
- const { oauthTokenData: tokenData } = decryptedDataOriginal;
98
98
  const oauthTokenData = {
99
- ...(typeof tokenData === 'object' ? tokenData : {}),
99
+ ...this.oauthService.getCarriedOverTokenData(credential.type, decryptedDataOriginal, flowState.managedVersion),
100
100
  ...tokenResponse,
101
101
  };
102
102
  const expiresInSeconds = Number(tokenResponse.expires_in);
@@ -106,8 +106,11 @@ let OAuth2CredentialController = class OAuth2CredentialController {
106
106
  if (typeof state.resource === 'string') {
107
107
  oauthTokenData.resource = state.resource;
108
108
  }
109
+ const tokenDataToSave = flowState.managedVersion === undefined
110
+ ? oauthTokenData
111
+ : (0, managed_versions_1.withTokenVersion)(oauthTokenData, flowState.managedVersion);
109
112
  if (!state.origin || state.origin === 'static-credential') {
110
- await this.oauthService.encryptAndSaveData(credential, { oauthTokenData });
113
+ await this.oauthService.encryptAndSaveData(credential, { oauthTokenData: tokenDataToSave });
111
114
  this.logger.debug('OAuth2 callback successful for credential', {
112
115
  credentialId: credential.id,
113
116
  });
@@ -122,7 +125,7 @@ let OAuth2CredentialController = class OAuth2CredentialController {
122
125
  !state.authorizationHeader.startsWith('Bearer ')) {
123
126
  return this.oauthService.renderCallbackError(res, 'Authorization header is required');
124
127
  }
125
- await this.oauthService.saveDynamicCredential(credential, { oauthTokenData }, state.authorizationHeader.split('Bearer ')[1], state.credentialResolverId, state.authMetadata ?? {});
128
+ await this.oauthService.saveDynamicCredential(credential, { oauthTokenData: tokenDataToSave }, state.authorizationHeader.split('Bearer ')[1], state.credentialResolverId, state.authMetadata ?? {});
126
129
  if (typeof state.userId === 'string') {
127
130
  this.eventService.emit('private-credential-user-connected', {
128
131
  user: { id: state.userId },
package/dist/controllers/oauth/oauth2-credential.controller.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"oauth2-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth2-credential.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oauth2-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth2-credential.controller.ts"],"names":[],"mappings":"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"}
package/dist/credentials/credential-options.service.js CHANGED
@@ -16,6 +16,7 @@ const errors_1 = require("@n8n/errors");
16
16
  const permissions_1 = require("@n8n/permissions");
17
17
  const credential_types_1 = require("../credential-types");
18
18
  const credentials_helper_1 = require("../credentials-helper");
19
+ const managed_app_unavailable_error_1 = require("../errors/managed-app-unavailable.error");
19
20
  const external_secrets_config_1 = require("../modules/external-secrets.ee/external-secrets.config");
20
21
  const secret_provider_access_check_service_ee_1 = require("../modules/external-secrets.ee/secret-provider-access-check.service.ee");
21
22
  const check_access_1 = require("../permissions.ee/check-access");
@@ -92,7 +93,9 @@ let CredentialOptionsService = class CredentialOptionsService {
92
93
  const resolvedData = await this.credentialsHelper.applyDefaultsAndOverwrites(additionalData, data, request.type, 'internal', undefined, undefined);
93
94
  return await loader(resolvedData, request.filter, request.paginationToken);
94
95
  }
95
- catch {
96
+ catch (error) {
97
+ if (error instanceof managed_app_unavailable_error_1.ManagedAppUnavailableError)
98
+ throw new errors_1.BadRequestError(error.message);
96
99
  throw new errors_1.BadRequestError('Could not load the list. Try again or enter an ID.');
97
100
  }
98
101
  }
package/dist/credentials/credential-options.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"credential-options.service.js","sourceRoot":"","sources":["../../src/credentials/credential-options.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,4DAAiE;AAEjE,gCAAkC;AAClC,wCAA8D;AAC9D,kDAAkD;AAGlD,yDAAqD;AACrD,6DAAyD;AACzD,mGAA8F;AAC9F,mIAA0H;AAC1H,gEAA8D;AAC9D,yFAA6D;AAE7D,+DAA2D;AAC3D,6CAGsB;AAGf,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IACpC,YACkB,eAAgC,EAChC,iBAAoC,EACpC,kBAAsC,EACtC,iBAA2C,EAC3C,qBAA4C,EAC5C,oBAAuD;+BALvD,eAAe;iCACf,iBAAiB;kCACjB,kBAAkB;iCAClB,iBAAiB;qCACjB,qBAAqB;oCACrB,oBAAoB;IACnC,CAAC;IAEJ,KAAK,CAAC,WAAW,CAAC,IAAU,EAAE,OAAoC,EAAE,SAAwB;QAC3F,MAAM,OAAO,GACZ,SAAS,KAAK,IAAI;YACjB,CAAC,CAAC,IAAA,4BAAc,EAAC,IAAI,EAAE,2BAA2B,CAAC;YACnD,CAAC,CAAC,MAAM,IAAA,4BAAa,EAAC,IAAI,EAAE,CAAC,mBAAmB,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QAC3E,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,uBAAc,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CACjD,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAC9B,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EACtB,SAAS,CACT,CAAC;QACF,MAAM,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAClE,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAAU,EAAE,YAAoB,EAAE,OAAoC;QACxF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,CAC1E,YAAY,EACZ,IAAI,EACJ,CAAC,iBAAiB,CAAC,EACnB,EAAE,0BAA0B,EAAE,IAAI,EAAE,CACpC,CAAC;QACF,IAAI,CAAC,gBAAgB;YAAE,MAAM,IAAI,uBAAc,EAAE,CAAC;QAClD,IAAI,gBAAgB,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,EAAE,CAAC;YAC5C,MAAM,IAAI,wBAAe,CAAC,0DAA0D,CAAC,CAAC;QACvF,CAAC;QACD,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,wBAAwB,CAAC;YAC1F,gBAAgB;YAChB,IAAI;YACJ,gBAAgB,EAAE,gBAAgB,CAAC,SAAS;gBAC3C,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;SAC5F,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,WAAW,CAAC,WAAW,EAAE,EAAE,IAAI,IAAI,CAAC;QACtD,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,IAAI,EAAE,CAAC;QACpC,MAAM,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QACtE,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IACxD,CAAC;IAEO,KAAK,CAAC,uBAAuB,CACpC,IAAU,EACV,IAAoC,EACpC,SAAwB,EACxB,UAA2C;QAE3C,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACxB,IAAI,CAAC,kBAAkB,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC;YAC7D,OAAO;QACR,CAAC;QACD,MAAM,IAAA,+CAAkC,EAAC;YACxC,IAAI;YACJ,SAAS;YACT,UAAU,EAAE,IAAI;YAChB,qBAAqB,EAAE,UAAU;SACjC,CAAC,CAAC;QACH,IAAI,IAAI,CAAC,qBAAqB,CAAC,0BAA0B,EAAE,CAAC;YAC3D,MAAM,IAAA,sDAAyC,EAC9C,SAAS,EACT,IAAI,EACJ,IAAI,CAAC,oBAAoB,EACzB,QAAQ,CACR,CAAC;QACH,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,IAAI,CACjB,IAAU,EACV,OAAoC,EACpC,IAAoC,EACpC,SAAwB;QAExB,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACpE,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB;aACrC,wBAAwB,CAAC,OAAO,CAAC,IAAI,CAAC;aACtC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;QACvD,MAAM,UAAU,GAAG,QAAQ,EAAE,WAAW,EAAE,iBAAiB,CAAC;QAC5D,MAAM,MAAM,GACX,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,WAAW,IAAI,EAAE,EAAE,UAAU,CAAC;YACjF,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC,UAAU,CAAC;YACnD,CAAC,CAAC,SAAS,CAAC;QACd,IAAI,QAAQ,EAAE,IAAI,KAAK,SAAS,IAAI,CAAC,MAAM,EAAE,CAAC;YAC7C,MAAM,IAAI,wBAAe,CAAC,wDAAwD,CAAC,CAAC;QACrF,CAAC;QACD,IAAI,CAAC;YACJ,MAAM,cAAc,GAAG,MAAM,IAAA,0CAAO,EAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,SAAS,IAAI,SAAS,EAAE,CAAC,CAAC;YAC7F,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,0BAA0B,CAC3E,cAAc,EACd,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,UAAU,EACV,SAAS,EACT,SAAS,CACT,CAAC;YACF,OAAO,MAAM,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;QAC5E,CAAC;QAAC,MAAM,CAAC;YAER,MAAM,IAAI,wBAAe,CAAC,oDAAoD,CAAC,CAAC;QACjF,CAAC;IACF,CAAC;CACD,CAAA;;mCA7GY,wBAAwB;IADpC,IAAA,YAAO,GAAE;qCAG0B,kCAAe,EACb,sCAAiB,EAChB,wCAAkB,EACnB,2CAAwB,EACpB,+CAAqB,EACtB,2EAAiC;GAP7D,wBAAwB,CA6GpC"}
1
+ {"version":3,"file":"credential-options.service.js","sourceRoot":"","sources":["../../src/credentials/credential-options.service.ts"],"names":[],"mappings":"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"}
package/dist/credentials-helper.d.ts CHANGED
@@ -39,10 +39,14 @@ export declare class CredentialsHelper extends ICredentialsHelper {
39
39
  private assertTriggerSupportsEndUserCredential;
40
40
  getDecrypted(additionalData: IWorkflowExecuteAdditionalData, nodeCredentials: INodeCredentialsDetails, type: string, mode: WorkflowExecuteMode, executeData?: IExecuteData, raw?: boolean, expressionResolveValues?: ICredentialsExpressionResolveValues, options?: IGetDecryptedCredentialsOptions & {
41
41
  actor?: PolicyActor;
42
+ managedVersion?: number;
42
43
  }): Promise<ICredentialDataDecryptedObject>;
43
44
  private trackStoredData;
44
- applyDefaultsAndOverwrites(additionalData: IWorkflowExecuteAdditionalData, decryptedDataOriginal: ICredentialDataDecryptedObject, type: string, mode: WorkflowExecuteMode, executeData?: IExecuteData, expressionResolveValues?: ICredentialsExpressionResolveValues): Promise<ICredentialDataDecryptedObject>;
45
+ getNewConnectionVersion(type: string, decryptedData: ICredentialDataDecryptedObject): number | undefined;
46
+ getBoundVersion(type: string, decryptedData: ICredentialDataDecryptedObject): number | undefined;
47
+ applyDefaultsAndOverwrites(additionalData: IWorkflowExecuteAdditionalData, decryptedDataOriginal: ICredentialDataDecryptedObject, type: string, mode: WorkflowExecuteMode, executeData?: IExecuteData, expressionResolveValues?: ICredentialsExpressionResolveValues, managedVersion?: number): Promise<ICredentialDataDecryptedObject>;
45
48
  updateCredentials(nodeCredentials: INodeCredentialsDetails, type: string, data: ICredentialDataDecryptedObject): Promise<void>;
46
49
  updateCredentialsOauthTokenData(nodeCredentials: INodeCredentialsDetails, type: string, data: ICredentialDataDecryptedObject, additionalData: IWorkflowExecuteAdditionalData): Promise<void>;
50
+ private getTokenDataForFirstConnection;
47
51
  }
48
52
  export declare function createCredentialsFromCredentialsEntity(credential: ICredentialsDb, encrypt?: boolean): Credentials;
package/dist/credentials-helper.js CHANGED
@@ -15,10 +15,12 @@ const api_types_1 = require("@n8n/api-types");
15
15
  const backend_common_1 = require("@n8n/backend-common");
16
16
  const db_1 = require("@n8n/db");
17
17
  const di_1 = require("@n8n/di");
18
+ const is_record_1 = require("@n8n/utils/is-record");
18
19
  const n8n_core_1 = require("n8n-core");
19
20
  const n8n_workflow_1 = require("n8n-workflow");
20
21
  const credential_types_1 = require("./credential-types");
21
22
  const credentials_overwrites_1 = require("./credentials-overwrites");
23
+ const managed_versions_1 = require("./managed-versions");
22
24
  const dcr_managed_fields_1 = require("./oauth/dcr-managed-fields");
23
25
  const external_secrets_config_1 = require("./modules/external-secrets.ee/external-secrets.config");
24
26
  const policy_enforcement_service_1 = require("./policy/policy-enforcement.service");
@@ -359,7 +361,7 @@ let CredentialsHelper = class CredentialsHelper extends n8n_workflow_1.ICredenti
359
361
  const accessibleProviderKeys = await this.secretsProviderConnectionRepository.findAllAccessibleProviderKeysByCredentialId(credentialsEntity.id);
360
362
  additionalData.externalSecretProviderKeysAccessibleByCredential = new Set(accessibleProviderKeys);
361
363
  }
362
- const decryptedData = await this.applyDefaultsAndOverwrites(additionalData, decryptedDataOriginal, type, mode, executeData, expressionResolveValues);
364
+ const decryptedData = await this.applyDefaultsAndOverwrites(additionalData, decryptedDataOriginal, type, mode, executeData, expressionResolveValues, options?.managedVersion);
363
365
  return this.trackStoredData(decryptedData, credentialsEntity);
364
366
  }
365
367
  trackStoredData(decryptedData, credentialsEntity) {
@@ -368,7 +370,13 @@ let CredentialsHelper = class CredentialsHelper extends n8n_workflow_1.ICredenti
368
370
  }
369
371
  return decryptedData;
370
372
  }
371
- async applyDefaultsAndOverwrites(additionalData, decryptedDataOriginal, type, mode, executeData, expressionResolveValues) {
373
+ getNewConnectionVersion(type, decryptedData) {
374
+ return this.credentialsOverwrites.getNewConnectionVersion(type, decryptedData);
375
+ }
376
+ getBoundVersion(type, decryptedData) {
377
+ return this.credentialsOverwrites.resolveBoundVersion(type, decryptedData);
378
+ }
379
+ async applyDefaultsAndOverwrites(additionalData, decryptedDataOriginal, type, mode, executeData, expressionResolveValues, managedVersion) {
372
380
  const credentialsProperties = this.getCredentialsProperties(type);
373
381
  const storedData = { ...decryptedDataOriginal };
374
382
  for (const field of dcr_managed_fields_1.OAUTH_PINNED_FIELDS) {
@@ -376,7 +384,7 @@ let CredentialsHelper = class CredentialsHelper extends n8n_workflow_1.ICredenti
376
384
  delete storedData[field];
377
385
  }
378
386
  }
379
- const dataWithOverwrites = this.credentialsOverwrites.applyOverwrite(type, storedData);
387
+ const dataWithOverwrites = this.credentialsOverwrites.applyOverwrite(type, storedData, managedVersion);
380
388
  let decryptedData = n8n_workflow_1.NodeHelpers.getNodeParameters(credentialsProperties, dataWithOverwrites, true, false, null, null);
381
389
  if (decryptedDataOriginal.oauthTokenData !== undefined) {
382
390
  decryptedData.oauthTokenData = decryptedDataOriginal.oauthTokenData;
@@ -468,7 +476,8 @@ let CredentialsHelper = class CredentialsHelper extends n8n_workflow_1.ICredenti
468
476
  if (storedData !== undefined && storedData !== credentials.data) {
469
477
  return;
470
478
  }
471
- await credentials.updateData({ oauthTokenData: data.oauthTokenData });
479
+ const oauthTokenData = await this.getTokenDataForFirstConnection(type, credentials, data.oauthTokenData);
480
+ await credentials.updateData({ oauthTokenData });
472
481
  const { data: newData } = credentials.getDataToSave();
473
482
  if (newData === undefined) {
474
483
  throw new n8n_workflow_1.UnexpectedError('Credential data is missing after re-encryption');
@@ -486,6 +495,17 @@ let CredentialsHelper = class CredentialsHelper extends n8n_workflow_1.ICredenti
486
495
  this.storedDataByDecrypted.set(data, newData);
487
496
  }
488
497
  }
498
+ async getTokenDataForFirstConnection(type, credentials, tokenData) {
499
+ if (!(0, is_record_1.isRecord)(tokenData) || tokenData[n8n_workflow_1.MANAGED_VERSION_KEY] !== undefined)
500
+ return tokenData;
501
+ if (!this.credentialsOverwrites.supportsManagedAuth(type))
502
+ return tokenData;
503
+ const storedData = await credentials.getData();
504
+ if ((0, managed_versions_1.hasTokenData)(storedData))
505
+ return tokenData;
506
+ const version = this.credentialsOverwrites.getNewConnectionVersion(type, storedData);
507
+ return version === undefined ? tokenData : { ...tokenData, [n8n_workflow_1.MANAGED_VERSION_KEY]: version };
508
+ }
489
509
  };
490
510
  exports.CredentialsHelper = CredentialsHelper;
491
511
  exports.CredentialsHelper = CredentialsHelper = __decorate([
package/dist/credentials-helper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"credentials-helper.js","sourceRoot":"","sources":["../src/credentials-helper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"credentials-helper.js","sourceRoot":"","sources":["../src/credentials-helper.ts"],"names":[],"mappings":"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"}
package/dist/credentials-overwrites.d.ts CHANGED
@@ -4,7 +4,7 @@ import { SettingsRepository } from '@n8n/db';
4
4
  import { Cipher } from 'n8n-core';
5
5
  import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
6
6
  import { CredentialTypes } from './credential-types';
7
- import type { ICredentialsOverwrite } from './interfaces';
7
+ import type { ICredentialsOverwrite, ManagedAuthState } from './interfaces';
8
8
  export declare class CredentialsOverwrites {
9
9
  private readonly globalConfig;
10
10
  private readonly credentialTypes;
@@ -12,6 +12,9 @@ export declare class CredentialsOverwrites {
12
12
  private readonly settings;
13
13
  private readonly cipher;
14
14
  private overwriteData;
15
+ private entryVersions;
16
+ private newerApps;
17
+ private appOwners;
15
18
  private resolvedTypes;
16
19
  constructor(globalConfig: GlobalConfig, credentialTypes: CredentialTypes, logger: Logger, settings: SettingsRepository, cipher: Cipher);
17
20
  private reloadHandler?;
@@ -21,15 +24,23 @@ export declare class CredentialsOverwrites {
21
24
  reloadOverwriteCredentials(): Promise<void>;
22
25
  loadOverwriteDataFromDB(reloadFrontend: boolean): Promise<void>;
23
26
  private broadcastReloadOverwriteCredentialsCommand;
24
- saveOverwriteDataToDB(overwriteData: ICredentialsOverwrite, broadcast?: boolean): Promise<void>;
27
+ saveOverwriteDataToDB(overwriteData: Record<string, unknown>, broadcast?: boolean): Promise<void>;
25
28
  getOverwriteEndpointMiddleware(): ((req: import("express").Request, res: import("express").Response, next: import("express").NextFunction) => void) | null;
26
- setPlainData(overwriteData: ICredentialsOverwrite): void;
27
- setData(overwriteData: ICredentialsOverwrite, storeInDb?: boolean, reloadFrontend?: boolean): Promise<void>;
28
- applyOverwrite(type: string, data: ICredentialDataDecryptedObject): ICredentialDataDecryptedObject;
29
- getOverwrites(type: string): ICredentialDataDecryptedObject | undefined;
29
+ setPlainData(overwriteData: Record<string, unknown>): void;
30
+ setData(overwriteData: Record<string, unknown>, storeInDb?: boolean, reloadFrontend?: boolean): Promise<void>;
31
+ applyOverwrite(type: string, data: ICredentialDataDecryptedObject, versionOverride?: number): ICredentialDataDecryptedObject;
32
+ getOverwrites(type: string, version?: number): ICredentialDataDecryptedObject | undefined;
33
+ getNewConnectionVersion(type: string, data: ICredentialDataDecryptedObject): number | undefined;
34
+ resolveBoundVersion(type: string, data: ICredentialDataDecryptedObject): number | undefined;
35
+ private getClientFields;
36
+ private versionValue;
37
+ private pickApp;
38
+ private getOverwritesWithParents;
30
39
  private get;
31
40
  getAll(): ICredentialsOverwrite;
41
+ getNewerAppProperties(type: string): string[];
32
42
  supportsManagedAuth(type: string): boolean;
33
43
  isManagedOAuthType(type: string): boolean;
34
44
  usesManagedAuth(type: string, data: Record<string, unknown>): boolean;
45
+ getManagedAuthState(type: string, data: Record<string, unknown>): ManagedAuthState;
35
46
  }
package/dist/credentials-overwrites.js CHANGED
@@ -18,6 +18,8 @@ const di_1 = require("@n8n/di");
18
18
  const n8n_core_1 = require("n8n-core");
19
19
  const n8n_workflow_1 = require("n8n-workflow");
20
20
  const credential_types_1 = require("./credential-types");
21
+ const managed_app_unavailable_error_1 = require("./errors/managed-app-unavailable.error");
22
+ const managed_versions_1 = require("./managed-versions");
21
23
  const static_auth_service_1 = require("./services/static-auth-service");
22
24
  const CREDENTIALS_OVERWRITE_KEY = 'credentialsOverwrite';
23
25
  let CredentialsOverwrites = class CredentialsOverwrites {
@@ -28,6 +30,9 @@ let CredentialsOverwrites = class CredentialsOverwrites {
28
30
  this.settings = settings;
29
31
  this.cipher = cipher;
30
32
  this.overwriteData = {};
33
+ this.entryVersions = {};
34
+ this.newerApps = {};
35
+ this.appOwners = new Set();
31
36
  this.resolvedTypes = [];
32
37
  this.reloading = false;
33
38
  }
@@ -95,10 +100,22 @@ let CredentialsOverwrites = class CredentialsOverwrites {
95
100
  return static_auth_service_1.StaticAuthService.getStaticAuthMiddleware(endpointAuthToken);
96
101
  }
97
102
  setPlainData(overwriteData) {
103
+ const parsed = (0, managed_versions_1.parseOverwritesPayload)(overwriteData, (type) => this.getClientFields(type), (type) => this.credentialTypes.recognizes(type), (type) => this.credentialTypes.getParentTypes(type));
104
+ for (const problem of parsed.problems) {
105
+ this.logger.warn(problem);
106
+ }
98
107
  this.resolvedTypes.length = 0;
99
- this.overwriteData = overwriteData;
100
- for (const type in overwriteData) {
101
- const overwrites = this.getOverwrites(type);
108
+ this.overwriteData = parsed.entries;
109
+ this.entryVersions = parsed.entryVersions;
110
+ this.newerApps = parsed.versions;
111
+ this.appOwners = new Set(Object.entries(parsed.entries)
112
+ .filter(([type, entry]) => {
113
+ const clientFields = this.getClientFields(type);
114
+ return clientFields !== undefined && (0, managed_versions_1.hasClientFields)(entry, clientFields);
115
+ })
116
+ .map(([type]) => type));
117
+ for (const type in this.overwriteData) {
118
+ const overwrites = this.getOverwritesWithParents(type);
102
119
  if (overwrites && Object.keys(overwrites).length) {
103
120
  this.overwriteData[type] = overwrites;
104
121
  }
@@ -113,11 +130,12 @@ let CredentialsOverwrites = class CredentialsOverwrites {
113
130
  await this.reloadHandler?.();
114
131
  }
115
132
  }
116
- applyOverwrite(type, data) {
117
- const overwrites = this.get(type);
118
- if (overwrites === undefined) {
133
+ applyOverwrite(type, data, versionOverride) {
134
+ const base = this.get(type);
135
+ if (base === undefined) {
119
136
  return data;
120
137
  }
138
+ const overwrites = this.pickApp(type, base, versionOverride ?? this.resolveBoundVersion(type, data));
121
139
  if (this.globalConfig.credentials.overwrite?.skipTypes?.includes(type)) {
122
140
  const isFieldCustomized = (key) => {
123
141
  const storedValue = data[key];
@@ -141,7 +159,63 @@ let CredentialsOverwrites = class CredentialsOverwrites {
141
159
  }
142
160
  return returnData;
143
161
  }
144
- getOverwrites(type) {
162
+ getOverwrites(type, version) {
163
+ const base = this.getOverwritesWithParents(type);
164
+ if (base === undefined)
165
+ return undefined;
166
+ return this.pickApp(type, base, version);
167
+ }
168
+ getNewConnectionVersion(type, data) {
169
+ const clientFields = this.getClientFields(type);
170
+ if (!clientFields || !(0, managed_versions_1.hasEmptyClientFields)(data, clientFields))
171
+ return undefined;
172
+ if (this.get(type) === undefined)
173
+ return undefined;
174
+ return (this.versionValue(type, this.newerApps)?.version ??
175
+ this.versionValue(type, this.entryVersions) ??
176
+ n8n_workflow_1.IMPLICIT_MANAGED_VERSION);
177
+ }
178
+ resolveBoundVersion(type, data) {
179
+ const clientFields = this.getClientFields(type);
180
+ if (!clientFields || !(0, managed_versions_1.hasEmptyClientFields)(data, clientFields))
181
+ return undefined;
182
+ const stored = (0, managed_versions_1.readStoredVersion)(data);
183
+ if (stored !== undefined)
184
+ return stored;
185
+ if ((0, managed_versions_1.hasInvalidStoredVersion)(data)) {
186
+ throw new managed_app_unavailable_error_1.ManagedAppUnavailableError('The managed app version stored on this credential is not valid. Reconnect the credential to continue.');
187
+ }
188
+ return (0, managed_versions_1.hasTokenData)(data) ? n8n_workflow_1.IMPLICIT_MANAGED_VERSION : undefined;
189
+ }
190
+ getClientFields(type) {
191
+ if (!this.credentialTypes.recognizes(type))
192
+ return undefined;
193
+ const parentTypes = this.credentialTypes.getParentTypes(type);
194
+ const extendsBase = (base) => type === base || parentTypes.includes(base);
195
+ if (extendsBase('oAuth2Api'))
196
+ return ['clientId', 'clientSecret'];
197
+ if (extendsBase('oAuth1Api'))
198
+ return ['consumerKey', 'consumerSecret'];
199
+ return undefined;
200
+ }
201
+ versionValue(type, values) {
202
+ if (this.appOwners.has(type))
203
+ return Object.hasOwn(values, type) ? values[type] : undefined;
204
+ return (0, managed_versions_1.nearestValue)(type, this.credentialTypes.getParentTypes(type), values);
205
+ }
206
+ pickApp(type, base, version) {
207
+ if (!this.getClientFields(type))
208
+ return base;
209
+ const newer = this.versionValue(type, this.newerApps);
210
+ const baseVersion = this.versionValue(type, this.entryVersions) ?? n8n_workflow_1.IMPLICIT_MANAGED_VERSION;
211
+ const target = version ?? newer?.version ?? baseVersion;
212
+ if (target === baseVersion)
213
+ return base;
214
+ if (newer && target === newer.version)
215
+ return { ...base, ...(0, managed_versions_1.withoutVersion)(newer) };
216
+ throw new managed_app_unavailable_error_1.ManagedAppUnavailableError(`This credential uses a managed app (version ${target}) that is no longer available. Reconnect the credential to continue.`);
217
+ }
218
+ getOverwritesWithParents(type) {
145
219
  if (this.resolvedTypes.includes(type)) {
146
220
  return this.overwriteData[type];
147
221
  }
@@ -156,7 +230,7 @@ let CredentialsOverwrites = class CredentialsOverwrites {
156
230
  }
157
231
  const overwrites = {};
158
232
  for (const credentialsTypeName of credentialTypeData.extends) {
159
- Object.assign(overwrites, this.getOverwrites(credentialsTypeName));
233
+ Object.assign(overwrites, this.getOverwritesWithParents(credentialsTypeName));
160
234
  }
161
235
  if (this.overwriteData[type] !== undefined) {
162
236
  Object.assign(overwrites, this.overwriteData[type]);
@@ -177,19 +251,15 @@ let CredentialsOverwrites = class CredentialsOverwrites {
177
251
  getAll() {
178
252
  return this.overwriteData;
179
253
  }
254
+ getNewerAppProperties(type) {
255
+ const newer = this.versionValue(type, this.newerApps);
256
+ return newer ? Object.keys((0, managed_versions_1.withoutVersion)(newer)) : [];
257
+ }
180
258
  supportsManagedAuth(type) {
181
259
  return this.get(type) !== undefined;
182
260
  }
183
261
  isManagedOAuthType(type) {
184
- if (!this.credentialTypes.recognizes(type))
185
- return false;
186
- const parentTypes = this.credentialTypes.getParentTypes(type);
187
- const extendsBase = (base) => type === base || parentTypes.includes(base);
188
- const clientFields = extendsBase('oAuth2Api')
189
- ? ['clientId', 'clientSecret']
190
- : extendsBase('oAuth1Api')
191
- ? ['consumerKey', 'consumerSecret']
192
- : undefined;
262
+ const clientFields = this.getClientFields(type);
193
263
  if (!clientFields)
194
264
  return false;
195
265
  if (this.globalConfig.credentials.overwrite?.skipTypes?.includes(type))
@@ -198,11 +268,23 @@ let CredentialsOverwrites = class CredentialsOverwrites {
198
268
  return !!overwrites && clientFields.every((field) => field in overwrites);
199
269
  }
200
270
  usesManagedAuth(type, data) {
271
+ return this.getManagedAuthState(type, data) === 'managed';
272
+ }
273
+ getManagedAuthState(type, data) {
201
274
  const overwrites = this.get(type);
202
275
  if (overwrites === undefined)
203
- return false;
204
- const applied = this.applyOverwrite(type, data);
205
- return Object.keys(overwrites).some((key) => applied[key] !== data[key]);
276
+ return 'not-managed';
277
+ try {
278
+ const applied = this.applyOverwrite(type, data);
279
+ return Object.keys(overwrites).some((key) => applied[key] !== data[key])
280
+ ? 'managed'
281
+ : 'not-managed';
282
+ }
283
+ catch (error) {
284
+ if (error instanceof managed_app_unavailable_error_1.ManagedAppUnavailableError)
285
+ return 'missing-app';
286
+ throw error;
287
+ }
206
288
  }
207
289
  };
208
290
  exports.CredentialsOverwrites = CredentialsOverwrites;