n8n 1.109.1 → 1.110.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.
- package/dist/auth/auth.service.js +3 -2
- package/dist/auth/auth.service.js.map +1 -1
- package/dist/auth/methods/email.js +1 -1
- package/dist/auth/methods/email.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/base-command.js +1 -0
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/import/credentials.js +8 -3
- package/dist/commands/import/credentials.js.map +1 -1
- package/dist/commands/import/workflow.js +6 -3
- package/dist/commands/import/workflow.js.map +1 -1
- package/dist/commands/ldap/reset.js +4 -1
- package/dist/commands/ldap/reset.js.map +1 -1
- package/dist/commands/start.d.ts +1 -1
- package/dist/commands/start.js +1 -2
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/user-management/reset.js +6 -2
- package/dist/commands/user-management/reset.js.map +1 -1
- package/dist/config/index.d.ts +0 -2
- package/dist/config/schema.d.ts +0 -12
- package/dist/config/schema.js +0 -12
- package/dist/config/schema.js.map +1 -1
- package/dist/controllers/api-keys.controller.js +3 -4
- package/dist/controllers/api-keys.controller.js.map +1 -1
- package/dist/controllers/auth.controller.js +2 -2
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/dynamic-node-parameters.controller.js +19 -3
- package/dist/controllers/dynamic-node-parameters.controller.js.map +1 -1
- package/dist/controllers/e2e.controller.js +9 -3
- package/dist/controllers/e2e.controller.js.map +1 -1
- package/dist/controllers/invitation.controller.js +4 -1
- package/dist/controllers/invitation.controller.js.map +1 -1
- package/dist/controllers/me.controller.js +1 -0
- package/dist/controllers/me.controller.js.map +1 -1
- package/dist/controllers/mfa.controller.js +4 -1
- package/dist/controllers/mfa.controller.js.map +1 -1
- package/dist/controllers/owner.controller.js +2 -1
- package/dist/controllers/owner.controller.js.map +1 -1
- package/dist/controllers/password-reset.controller.js +2 -2
- package/dist/controllers/password-reset.controller.js.map +1 -1
- package/dist/controllers/project.controller.js +18 -15
- package/dist/controllers/project.controller.js.map +1 -1
- package/dist/controllers/role.controller.d.ts +7 -1
- package/dist/controllers/role.controller.js +56 -3
- package/dist/controllers/role.controller.js.map +1 -1
- package/dist/controllers/third-party-licenses.controller.d.ts +4 -0
- package/dist/controllers/third-party-licenses.controller.js +40 -0
- package/dist/controllers/third-party-licenses.controller.js.map +1 -0
- package/dist/controllers/users.controller.d.ts +1 -1
- package/dist/controllers/users.controller.js +20 -7
- package/dist/controllers/users.controller.js.map +1 -1
- package/dist/credentials/credentials.controller.d.ts +3 -3
- package/dist/credentials/credentials.controller.js +6 -4
- package/dist/credentials/credentials.controller.js.map +1 -1
- package/dist/credentials/credentials.service.d.ts +1 -1
- package/dist/credentials/credentials.service.js +2 -2
- package/dist/credentials/credentials.service.js.map +1 -1
- package/dist/credentials-helper.js +11 -2
- package/dist/credentials-helper.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-export.service.ee.js +5 -4
- package/dist/environments.ee/source-control/source-control-export.service.ee.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-git.service.ee.js +5 -1
- package/dist/environments.ee/source-control/source-control-git.service.ee.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-import.service.ee.d.ts +4 -4
- package/dist/environments.ee/source-control/source-control-import.service.ee.js +17 -12
- package/dist/environments.ee/source-control/source-control-import.service.ee.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-preferences.service.ee.js +12 -2
- package/dist/environments.ee/source-control/source-control-preferences.service.ee.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-scoped.service.d.ts +2 -2
- package/dist/environments.ee/source-control/source-control-scoped.service.js +14 -8
- package/dist/environments.ee/source-control/source-control-scoped.service.js.map +1 -1
- package/dist/eventbus/index.d.ts +2 -2
- package/dist/events/maps/relay.event-map.d.ts +9 -5
- package/dist/events/relays/telemetry.event-relay.d.ts +2 -2
- package/dist/events/relays/telemetry.event-relay.js +12 -8
- package/dist/events/relays/telemetry.event-relay.js.map +1 -1
- package/dist/executions/executions.controller.d.ts +2 -2
- package/dist/executions/executions.controller.js +6 -5
- package/dist/executions/executions.controller.js.map +1 -1
- package/dist/ldap.ee/helpers.ee.d.ts +1 -0
- package/dist/ldap.ee/helpers.ee.js +15 -3
- package/dist/ldap.ee/helpers.ee.js.map +1 -1
- package/dist/ldap.ee/ldap.service.ee.js +1 -1
- package/dist/ldap.ee/ldap.service.ee.js.map +1 -1
- package/dist/load-nodes-and-credentials.d.ts +2 -0
- package/dist/load-nodes-and-credentials.js +81 -10
- package/dist/load-nodes-and-credentials.js.map +1 -1
- package/dist/mfa/mfa.service.js +4 -1
- package/dist/mfa/mfa.service.js.map +1 -1
- package/dist/modules/community-packages/community-node-types.service.d.ts +1 -0
- package/dist/modules/community-packages/community-node-types.service.js +9 -2
- package/dist/modules/community-packages/community-node-types.service.js.map +1 -1
- package/dist/modules/community-packages/strapi-utils.js +2 -0
- package/dist/modules/community-packages/strapi-utils.js.map +1 -1
- package/dist/modules/{data-store → data-table}/data-store-aggregate.controller.d.ts +1 -1
- package/dist/modules/{data-store → data-table}/data-store-aggregate.controller.js +1 -1
- package/dist/modules/{data-store → data-table}/data-store-aggregate.controller.js.map +1 -1
- package/dist/modules/{data-store → data-table}/data-store-aggregate.service.d.ts +1 -1
- package/dist/modules/{data-store → data-table}/data-store-aggregate.service.js +1 -1
- package/dist/modules/{data-store → data-table}/data-store-aggregate.service.js.map +1 -1
- package/dist/modules/data-table/data-store-column.repository.d.ts +13 -0
- package/dist/modules/{data-store → data-table}/data-store-column.repository.js +30 -25
- package/dist/modules/data-table/data-store-column.repository.js.map +1 -0
- package/dist/modules/{data-store → data-table}/data-store-proxy.service.d.ts +3 -3
- package/dist/modules/{data-store → data-table}/data-store-proxy.service.js +19 -10
- package/dist/modules/data-table/data-store-proxy.service.js.map +1 -0
- package/dist/modules/{data-store → data-table}/data-store-rows.repository.d.ts +16 -10
- package/dist/modules/data-table/data-store-rows.repository.js +314 -0
- package/dist/modules/data-table/data-store-rows.repository.js.map +1 -0
- package/dist/modules/{data-store → data-table}/data-store.controller.d.ts +15 -9
- package/dist/modules/{data-store → data-table}/data-store.controller.js +3 -3
- package/dist/modules/{data-store → data-table}/data-store.controller.js.map +1 -1
- package/dist/modules/{data-store → data-table}/data-store.repository.d.ts +5 -5
- package/dist/modules/{data-store → data-table}/data-store.repository.js +17 -17
- package/dist/modules/{data-store → data-table}/data-store.repository.js.map +1 -1
- package/dist/modules/{data-store → data-table}/data-store.service.d.ts +13 -9
- package/dist/modules/{data-store → data-table}/data-store.service.js +48 -22
- package/dist/modules/data-table/data-store.service.js.map +1 -0
- package/dist/modules/data-table/data-store.types.d.ts +1 -0
- package/dist/modules/data-table/data-store.types.js.map +1 -0
- package/dist/modules/data-table/data-table-column.entity.d.ts +9 -0
- package/dist/modules/{data-store/data-store-column.entity.js → data-table/data-table-column.entity.js} +14 -14
- package/dist/modules/{data-store/data-store-column.entity.js.map → data-table/data-table-column.entity.js.map} +1 -1
- package/dist/modules/data-table/data-table.entity.d.ts +9 -0
- package/dist/modules/{data-store/data-store.entity.js → data-table/data-table.entity.js} +12 -16
- package/dist/modules/data-table/data-table.entity.js.map +1 -0
- package/dist/modules/data-table/data-table.module.d.ts +9 -0
- package/dist/modules/{data-store/data-store.module.js → data-table/data-table.module.js} +16 -5
- package/dist/modules/data-table/data-table.module.js.map +1 -0
- package/dist/modules/{data-store → data-table}/errors/data-store-column-name-conflict.error.d.ts +1 -1
- package/dist/modules/{data-store → data-table}/errors/data-store-column-name-conflict.error.js +2 -2
- package/dist/modules/{data-store → data-table}/errors/data-store-column-name-conflict.error.js.map +1 -1
- package/dist/modules/{data-store → data-table}/errors/data-store-column-not-found.error.js.map +1 -1
- package/dist/modules/{data-store → data-table}/errors/data-store-name-conflict.error.js.map +1 -1
- package/dist/modules/{data-store → data-table}/errors/data-store-not-found.error.js +1 -1
- package/dist/modules/{data-store → data-table}/errors/data-store-not-found.error.js.map +1 -1
- package/dist/modules/{data-store → data-table}/errors/data-store-validation.error.js.map +1 -1
- package/dist/modules/{data-store → data-table}/utils/sql-utils.d.ts +12 -11
- package/dist/modules/{data-store → data-table}/utils/sql-utils.js +68 -23
- package/dist/modules/data-table/utils/sql-utils.js.map +1 -0
- package/dist/modules/insights/insights.controller.d.ts +1 -2
- package/dist/modules/insights/insights.controller.js.map +1 -1
- package/dist/permissions.ee/check-access.js +11 -11
- package/dist/permissions.ee/check-access.js.map +1 -1
- package/dist/public-api/v1/handlers/credentials/credentials.handler.js +1 -1
- package/dist/public-api/v1/handlers/credentials/credentials.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js +1 -1
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/workflows/workflows.service.d.ts +1 -1
- package/dist/public-api/v1/handlers/workflows/workflows.service.js +3 -2
- package/dist/public-api/v1/handlers/workflows/workflows.service.js.map +1 -1
- package/dist/public-api/v1/openapi.yml +2 -6
- package/dist/requests.d.ts +3 -3
- package/dist/requests.js.map +1 -1
- package/dist/scaling/job-processor.d.ts +3 -1
- package/dist/scaling/job-processor.js +7 -8
- package/dist/scaling/job-processor.js.map +1 -1
- package/dist/server.js +1 -0
- package/dist/server.js.map +1 -1
- package/dist/services/access.service.js +1 -1
- package/dist/services/access.service.js.map +1 -1
- package/dist/services/frontend.service.js +2 -2
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/ownership.service.d.ts +7 -4
- package/dist/services/ownership.service.js +52 -10
- package/dist/services/ownership.service.js.map +1 -1
- package/dist/services/project.service.ee.d.ts +24 -11
- package/dist/services/project.service.ee.js +25 -12
- package/dist/services/project.service.ee.js.map +1 -1
- package/dist/services/public-api-key.service.d.ts +2 -2
- package/dist/services/public-api-key.service.js +8 -6
- package/dist/services/public-api-key.service.js.map +1 -1
- package/dist/services/role.service.d.ts +39 -5
- package/dist/services/role.service.js +105 -14
- package/dist/services/role.service.js.map +1 -1
- package/dist/services/user.service.d.ts +3 -1
- package/dist/services/user.service.js +19 -8
- package/dist/services/user.service.js.map +1 -1
- package/dist/sso.ee/oidc/oidc.service.ee.js +10 -3
- package/dist/sso.ee/oidc/oidc.service.ee.js.map +1 -1
- package/dist/sso.ee/saml/saml-helpers.js +10 -3
- package/dist/sso.ee/saml/saml-helpers.js.map +1 -1
- package/dist/sso.ee/saml/saml.service.ee.js +1 -1
- package/dist/sso.ee/saml/saml.service.ee.js.map +1 -1
- package/dist/task-runners/task-broker/errors/task-runner-execution-timeout.error.d.ts +1 -1
- package/dist/user-management/email/user-management-mailer.d.ts +5 -4
- package/dist/user-management/email/user-management-mailer.js +1 -1
- package/dist/user-management/email/user-management-mailer.js.map +1 -1
- package/dist/workflow-execute-additional-data.js +0 -5
- package/dist/workflow-execute-additional-data.js.map +1 -1
- package/dist/workflow-runner.d.ts +3 -1
- package/dist/workflow-runner.js +11 -8
- package/dist/workflow-runner.js.map +1 -1
- package/dist/workflows/workflow-sharing.service.js +2 -2
- package/dist/workflows/workflow-sharing.service.js.map +1 -1
- package/dist/workflows/workflow.request.d.ts +1 -0
- package/dist/workflows/workflow.service.ee.d.ts +1 -1
- package/dist/workflows/workflow.service.ee.js +1 -1
- package/dist/workflows/workflow.service.ee.js.map +1 -1
- package/dist/workflows/workflow.service.js +1 -2
- package/dist/workflows/workflow.service.js.map +1 -1
- package/dist/workflows/workflows.controller.d.ts +7 -7
- package/dist/workflows/workflows.controller.js +10 -8
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +19 -19
- package/dist/modules/data-store/data-store-column.entity.d.ts +0 -9
- package/dist/modules/data-store/data-store-column.repository.d.ts +0 -13
- package/dist/modules/data-store/data-store-column.repository.js.map +0 -1
- package/dist/modules/data-store/data-store-proxy.service.js.map +0 -1
- package/dist/modules/data-store/data-store-rows.repository.js +0 -221
- package/dist/modules/data-store/data-store-rows.repository.js.map +0 -1
- package/dist/modules/data-store/data-store.entity.d.ts +0 -10
- package/dist/modules/data-store/data-store.entity.js.map +0 -1
- package/dist/modules/data-store/data-store.module.d.ts +0 -7
- package/dist/modules/data-store/data-store.module.js.map +0 -1
- package/dist/modules/data-store/data-store.service.js.map +0 -1
- package/dist/modules/data-store/data-store.types.d.ts +0 -1
- package/dist/modules/data-store/data-store.types.js.map +0 -1
- package/dist/modules/data-store/utils/sql-utils.js.map +0 -1
- /package/dist/modules/{data-store → data-table}/data-store.types.js +0 -0
- /package/dist/modules/{data-store → data-table}/errors/data-store-column-not-found.error.d.ts +0 -0
- /package/dist/modules/{data-store → data-table}/errors/data-store-column-not-found.error.js +0 -0
- /package/dist/modules/{data-store → data-table}/errors/data-store-name-conflict.error.d.ts +0 -0
- /package/dist/modules/{data-store → data-table}/errors/data-store-name-conflict.error.js +0 -0
- /package/dist/modules/{data-store → data-table}/errors/data-store-not-found.error.d.ts +0 -0
- /package/dist/modules/{data-store → data-table}/errors/data-store-validation.error.d.ts +0 -0
- /package/dist/modules/{data-store → data-table}/errors/data-store-validation.error.js +0 -0
|
@@ -108,7 +108,7 @@ let AuthService = class AuthService {
|
|
|
108
108
|
issueCookie(res, user, usedMfa, browserId) {
|
|
109
109
|
const isWithinUsersLimit = this.license.isWithinUsersLimit();
|
|
110
110
|
if (config_2.default.getEnv('userManagement.isInstanceOwnerSetUp') &&
|
|
111
|
-
user.role !==
|
|
111
|
+
user.role.slug !== db_1.GLOBAL_OWNER_ROLE.slug &&
|
|
112
112
|
!isWithinUsersLimit) {
|
|
113
113
|
throw new forbidden_error_1.ForbiddenError(constants_2.RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
|
|
114
114
|
}
|
|
@@ -138,6 +138,7 @@ let AuthService = class AuthService {
|
|
|
138
138
|
});
|
|
139
139
|
const user = await this.userRepository.findOne({
|
|
140
140
|
where: { id: jwtPayload.id },
|
|
141
|
+
relations: ['role'],
|
|
141
142
|
});
|
|
142
143
|
if (!user ||
|
|
143
144
|
user.disabled ||
|
|
@@ -186,7 +187,7 @@ let AuthService = class AuthService {
|
|
|
186
187
|
}
|
|
187
188
|
const user = await this.userRepository.findOne({
|
|
188
189
|
where: { id: decodedToken.sub },
|
|
189
|
-
relations: ['authIdentities'],
|
|
190
|
+
relations: ['authIdentities', 'role'],
|
|
190
191
|
});
|
|
191
192
|
if (!user) {
|
|
192
193
|
this.logger.debug('Request to resolve password token failed because no user was found for the provided user ID', { userId: decodedToken.sub, token });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/auth/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAA2C;AAC3C,8CAAsC;AAEtC,
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/auth/auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ const password_utility_1 = require("../../services/password.utility");
|
|
|
10
10
|
const handleEmailLogin = async (email, password) => {
|
|
11
11
|
const user = await di_1.Container.get(db_1.UserRepository).findOne({
|
|
12
12
|
where: { email },
|
|
13
|
-
relations: ['authIdentities'],
|
|
13
|
+
relations: ['authIdentities', 'role'],
|
|
14
14
|
});
|
|
15
15
|
if (user?.password && (await di_1.Container.get(password_utility_1.PasswordUtility).compare(password, user.password))) {
|
|
16
16
|
return user;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email.js","sourceRoot":"","sources":["../../../src/auth/methods/email.ts"],"names":[],"mappings":";;;AACA,gCAAyC;AACzC,gCAAoC;AAEpC,oEAAgE;AAChE,0DAAsD;AACtD,qDAA0D;AAC1D,kEAA8D;AAEvD,MAAM,gBAAgB,GAAG,KAAK,EACpC,KAAa,EACb,QAAgB,EACY,EAAE;IAC9B,MAAM,IAAI,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,mBAAc,CAAC,CAAC,OAAO,CAAC;QACxD,KAAK,EAAE,EAAE,KAAK,EAAE;QAChB,SAAS,EAAE,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"email.js","sourceRoot":"","sources":["../../../src/auth/methods/email.ts"],"names":[],"mappings":";;;AACA,gCAAyC;AACzC,gCAAoC;AAEpC,oEAAgE;AAChE,0DAAsD;AACtD,qDAA0D;AAC1D,kEAA8D;AAEvD,MAAM,gBAAgB,GAAG,KAAK,EACpC,KAAa,EACb,QAAgB,EACY,EAAE;IAC9B,MAAM,IAAI,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,mBAAc,CAAC,CAAC,OAAO,CAAC;QACxD,KAAK,EAAE,EAAE,KAAK,EAAE;QAChB,SAAS,EAAE,CAAC,gBAAgB,EAAE,MAAM,CAAC;KACrC,CAAC,CAAC;IAEH,IAAI,IAAI,EAAE,QAAQ,IAAI,CAAC,MAAM,cAAS,CAAC,GAAG,CAAC,kCAAe,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;QAC/F,OAAO,IAAI,CAAC;IACb,CAAC;IAID,MAAM,YAAY,GAAG,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,MAAM,CAAC,CAAC;IAClF,IAAI,IAAI,IAAI,YAAY,IAAI,CAAC,IAAA,+BAAkB,GAAE,EAAE,CAAC;QACnD,cAAS,CAAC,GAAG,CAAC,4BAAY,CAAC,CAAC,IAAI,CAAC,mCAAmC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAE3F,MAAM,IAAI,sBAAS,CAAC,qDAAqD,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO,SAAS,CAAC;AAClB,CAAC,CAAC;AAvBW,QAAA,gBAAgB,oBAuB3B"}
|