n8n 1.109.0 → 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/webhooks/waiting-webhooks.d.ts +4 -3
- package/dist/webhooks/waiting-webhooks.js +11 -12
- package/dist/webhooks/waiting-webhooks.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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"e2e.controller.js","sourceRoot":"","sources":["../../src/controllers/e2e.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,wDAA6C;AAE7C,8CAA2F;AAC3F,
|
|
1
|
+
{"version":3,"file":"e2e.controller.js","sourceRoot":"","sources":["../../src/controllers/e2e.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -72,7 +72,10 @@ let InvitationController = class InvitationController {
|
|
|
72
72
|
}
|
|
73
73
|
async acceptInvitation(req, res, payload, inviteeId) {
|
|
74
74
|
const { inviterId, firstName, lastName, password } = payload;
|
|
75
|
-
const users = await this.userRepository.
|
|
75
|
+
const users = await this.userRepository.find({
|
|
76
|
+
where: [{ id: inviterId }, { id: inviteeId }],
|
|
77
|
+
relations: ['role'],
|
|
78
|
+
});
|
|
76
79
|
if (users.length !== 2) {
|
|
77
80
|
this.logger.debug('Request to fill out a user shell failed because the inviter ID and/or invitee ID were not found in database', {
|
|
78
81
|
inviterId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitation.controller.js","sourceRoot":"","sources":["../../src/controllers/invitation.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,8CAAmF;AACnF,wDAA6C;AAE7C,gCAA+D;AAC/D,gDAAiF;AAGjF,sDAAkD;AAClD,sDAA8B;AAC9B,2CAAsD;AACtD,kFAA6E;AAC7E,8EAA0E;AAC1E,0DAAsD;AACtD,qDAAiD;AACjD,uCAAoC;AACpC,uCAA0C;AAE1C,kEAA8D;AAC9D,0DAAsD;AACtD,6DAAsE;AAG/D,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAChC,YACkB,MAAc,EACd,aAA4B,EAC5B,WAAwB,EACxB,WAAwB,EACxB,OAAgB,EAChB,eAAgC,EAChC,cAA8B,EAC9B,OAAsB,EACtB,YAA0B;QAR1B,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;QACxB,gBAAW,GAAX,WAAW,CAAa;QACxB,YAAO,GAAP,OAAO,CAAS;QAChB,oBAAe,GAAf,eAAe,CAAiB;QAChC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,YAAO,GAAP,OAAO,CAAe;QACtB,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAQE,AAAN,KAAK,CAAC,UAAU,CACf,GAAyB,EACzB,IAAc,EACR,WAAkC;QAExC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAExC,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAE7D,IAAI,IAAA,uCAAwB,GAAE,EAAE,CAAC;YAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,oGAAoG,CACpG,CAAC;YACF,MAAM,IAAI,mCAAe,CACxB,oGAAoG,CACpG,CAAC;QACH,CAAC;QAED,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,iGAAiG,CACjG,CAAC;YACF,MAAM,IAAI,gCAAc,CAAC,mCAAuB,CAAC,mBAAmB,CAAC,CAAC;QACvE,CAAC;QAED,IAAI,CAAC,gBAAM,CAAC,MAAM,CAAC,qCAAqC,CAAC,EAAE,CAAC;YAC3D,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,2FAA2F,CAC3F,CAAC;YACF,MAAM,IAAI,mCAAe,CAAC,yDAAyD,CAAC,CAAC;QACtF,CAAC;QAED,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;YACtD,IAAI,IAAI,KAAK,cAAc,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,6BAA6B,EAAE,EAAE,CAAC;gBAC9E,MAAM,IAAI,gCAAc,CACvB,gHAAgH,CAChH,CAAC;YACH,CAAC;YACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAEhG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;QAE7D,OAAO,YAAY,CAAC;IACrB,CAAC;IAMK,AAAN,KAAK,CAAC,gBAAgB,CACrB,GAAoB,EACpB,GAAa,EACP,OAAmC,EAC5B,SAAiB;QAE9B,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAE7D,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"invitation.controller.js","sourceRoot":"","sources":["../../src/controllers/invitation.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,6 +76,7 @@ let MeController = class MeController {
|
|
|
76
76
|
await this.userService.update(userId, payload);
|
|
77
77
|
const user = await this.userRepository.findOneOrFail({
|
|
78
78
|
where: { id: userId },
|
|
79
|
+
relations: ['role'],
|
|
79
80
|
});
|
|
80
81
|
this.logger.info('User updated successfully', { userId });
|
|
81
82
|
this.authService.issueCookie(res, user, req.authInfo?.usedMfa ?? false, req.browserId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"me.controller.js","sourceRoot":"","sources":["../../src/controllers/me.controller.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"me.controller.js","sourceRoot":"","sources":["../../src/controllers/me.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -92,7 +92,10 @@ let MFAController = class MFAController {
|
|
|
92
92
|
else if (mfaRecoveryCodeDefined) {
|
|
93
93
|
await this.mfaService.disableMfaWithRecoveryCode(userId, mfaRecoveryCode);
|
|
94
94
|
}
|
|
95
|
-
const updatedUser = await this.userRepository.
|
|
95
|
+
const updatedUser = await this.userRepository.findOneOrFail({
|
|
96
|
+
where: { id: userId },
|
|
97
|
+
relations: ['role'],
|
|
98
|
+
});
|
|
96
99
|
this.authService.issueCookie(res, updatedUser, false, req.browserId);
|
|
97
100
|
}
|
|
98
101
|
async verifyMFA(req) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mfa.controller.js","sourceRoot":"","sources":["../../src/controllers/mfa.controller.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mfa.controller.js","sourceRoot":"","sources":["../../src/controllers/mfa.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,7 +48,8 @@ let OwnerController = class OwnerController {
|
|
|
48
48
|
throw new bad_request_error_1.BadRequestError('Instance owner already setup');
|
|
49
49
|
}
|
|
50
50
|
let owner = await this.userRepository.findOneOrFail({
|
|
51
|
-
where: { role:
|
|
51
|
+
where: { role: { slug: db_1.GLOBAL_OWNER_ROLE.slug } },
|
|
52
|
+
relations: ['role'],
|
|
52
53
|
});
|
|
53
54
|
owner.email = email;
|
|
54
55
|
owner.firstName = firstName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"owner.controller.js","sourceRoot":"","sources":["../../src/controllers/owner.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,8CAA+E;AAC/E,wDAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"owner.controller.js","sourceRoot":"","sources":["../../src/controllers/owner.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,7 +57,7 @@ let PasswordResetController = class PasswordResetController {
|
|
|
57
57
|
this.logger.debug('No user found in the system');
|
|
58
58
|
return;
|
|
59
59
|
}
|
|
60
|
-
if (user.role !==
|
|
60
|
+
if (user.role.slug !== db_1.GLOBAL_OWNER_ROLE.slug && !this.license.isWithinUsersLimit()) {
|
|
61
61
|
this.logger.debug('Request to send password reset email failed because the user limit was reached');
|
|
62
62
|
throw new forbidden_error_1.ForbiddenError(constants_1.RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
|
|
63
63
|
}
|
|
@@ -107,7 +107,7 @@ let PasswordResetController = class PasswordResetController {
|
|
|
107
107
|
const user = await this.authService.resolvePasswordResetToken(token);
|
|
108
108
|
if (!user)
|
|
109
109
|
throw new not_found_error_1.NotFoundError('');
|
|
110
|
-
if (user.role !==
|
|
110
|
+
if (user.role.slug !== db_1.GLOBAL_OWNER_ROLE.slug && !this.license.isWithinUsersLimit()) {
|
|
111
111
|
this.logger.debug('Request to resolve password token failed because the user limit was reached', { userId: user.id });
|
|
112
112
|
throw new forbidden_error_1.ForbiddenError(constants_1.RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
|
|
113
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"password-reset.controller.js","sourceRoot":"","sources":["../../src/controllers/password-reset.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAIwB;AACxB,wDAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"password-reset.controller.js","sourceRoot":"","sources":["../../src/controllers/password-reset.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,15 +41,17 @@ let ProjectController = class ProjectController {
|
|
|
41
41
|
const project = await this.projectsService.createTeamProject(req.user, payload);
|
|
42
42
|
this.eventService.emit('team-project-created', {
|
|
43
43
|
userId: req.user.id,
|
|
44
|
-
role: req.user.role,
|
|
44
|
+
role: req.user.role.slug,
|
|
45
|
+
uiContext: payload.uiContext,
|
|
45
46
|
});
|
|
47
|
+
const relation = await this.projectsService.getProjectRelationForUserAndProject(req.user.id, project.id);
|
|
46
48
|
return {
|
|
47
49
|
...project,
|
|
48
50
|
role: 'project:admin',
|
|
49
51
|
scopes: [
|
|
50
52
|
...(0, permissions_1.combineScopes)({
|
|
51
|
-
global: (0, permissions_1.
|
|
52
|
-
project: (
|
|
53
|
+
global: (0, permissions_1.getAuthPrincipalScopes)(req.user),
|
|
54
|
+
project: relation?.role.scopes.map((scope) => scope.slug) ?? [],
|
|
53
55
|
}),
|
|
54
56
|
],
|
|
55
57
|
};
|
|
@@ -71,22 +73,22 @@ let ProjectController = class ProjectController {
|
|
|
71
73
|
: [];
|
|
72
74
|
const results = [];
|
|
73
75
|
for (const pr of relations) {
|
|
74
|
-
const result = Object.assign(this.projectRepository.create(pr.project), { role: pr.role, scopes: [] });
|
|
76
|
+
const result = Object.assign(this.projectRepository.create(pr.project), { role: pr.role.slug, scopes: [] });
|
|
75
77
|
if (result.scopes) {
|
|
76
78
|
result.scopes.push(...(0, permissions_1.combineScopes)({
|
|
77
|
-
global: (0, permissions_1.
|
|
78
|
-
project: (
|
|
79
|
+
global: (0, permissions_1.getAuthPrincipalScopes)(req.user),
|
|
80
|
+
project: pr.role.scopes.map((scope) => scope.slug),
|
|
79
81
|
}));
|
|
80
82
|
}
|
|
81
83
|
results.push(result);
|
|
82
84
|
}
|
|
83
85
|
for (const project of otherTeamProject) {
|
|
84
86
|
const result = Object.assign(this.projectRepository.create(project), {
|
|
85
|
-
role: req.user.role,
|
|
87
|
+
role: req.user.role.slug,
|
|
86
88
|
scopes: [],
|
|
87
89
|
});
|
|
88
90
|
if (result.scopes) {
|
|
89
|
-
result.scopes.push(...(0, permissions_1.combineScopes)({ global: (0, permissions_1.
|
|
91
|
+
result.scopes.push(...(0, permissions_1.combineScopes)({ global: (0, permissions_1.getAuthPrincipalScopes)(req.user) }));
|
|
90
92
|
}
|
|
91
93
|
results.push(result);
|
|
92
94
|
}
|
|
@@ -102,10 +104,11 @@ let ProjectController = class ProjectController {
|
|
|
102
104
|
if (!project) {
|
|
103
105
|
throw new not_found_error_1.NotFoundError('Could not find a personal project for this user');
|
|
104
106
|
}
|
|
107
|
+
const relation = await this.projectsService.getProjectRelationForUserAndProject(req.user.id, project.id);
|
|
105
108
|
const scopes = [
|
|
106
109
|
...(0, permissions_1.combineScopes)({
|
|
107
|
-
global: (0, permissions_1.
|
|
108
|
-
project: (
|
|
110
|
+
global: (0, permissions_1.getAuthPrincipalScopes)(req.user),
|
|
111
|
+
project: relation?.role.scopes.map((scope) => scope.slug) ?? [],
|
|
109
112
|
}),
|
|
110
113
|
];
|
|
111
114
|
return {
|
|
@@ -130,12 +133,12 @@ let ProjectController = class ProjectController {
|
|
|
130
133
|
email: r.user.email,
|
|
131
134
|
firstName: r.user.firstName,
|
|
132
135
|
lastName: r.user.lastName,
|
|
133
|
-
role: r.role,
|
|
136
|
+
role: r.role.slug,
|
|
134
137
|
})),
|
|
135
138
|
scopes: [
|
|
136
139
|
...(0, permissions_1.combineScopes)({
|
|
137
|
-
global: (0, permissions_1.
|
|
138
|
-
...(myRelation ? { project:
|
|
140
|
+
global: (0, permissions_1.getAuthPrincipalScopes)(req.user),
|
|
141
|
+
...(myRelation ? { project: myRelation.role.scopes.map((scope) => scope.slug) } : {}),
|
|
139
142
|
}),
|
|
140
143
|
],
|
|
141
144
|
};
|
|
@@ -162,7 +165,7 @@ let ProjectController = class ProjectController {
|
|
|
162
165
|
}
|
|
163
166
|
this.eventService.emit('team-project-updated', {
|
|
164
167
|
userId: req.user.id,
|
|
165
|
-
role: req.user.role,
|
|
168
|
+
role: req.user.role.slug,
|
|
166
169
|
members: relations,
|
|
167
170
|
projectId,
|
|
168
171
|
});
|
|
@@ -174,7 +177,7 @@ let ProjectController = class ProjectController {
|
|
|
174
177
|
});
|
|
175
178
|
this.eventService.emit('team-project-deleted', {
|
|
176
179
|
userId: req.user.id,
|
|
177
|
-
role: req.user.role,
|
|
180
|
+
role: req.user.role.slug,
|
|
178
181
|
projectId,
|
|
179
182
|
removalType: query.transferId !== undefined ? 'transfer' : 'delete',
|
|
180
183
|
targetProjectId: query.transferId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.controller.js","sourceRoot":"","sources":["../../src/controllers/project.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAAsF;AAEtF,gCAAkE;AAClE,gDAYyB;AACzB,
|
|
1
|
+
{"version":3,"file":"project.controller.js","sourceRoot":"","sources":["../../src/controllers/project.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,12 @@
|
|
|
1
|
+
import { CreateRoleDto, UpdateRoleDto } from '@n8n/api-types';
|
|
2
|
+
import { Role as RoleDTO } from '@n8n/permissions';
|
|
1
3
|
import { RoleService } from '../services/role.service';
|
|
2
4
|
export declare class RoleController {
|
|
3
5
|
private readonly roleService;
|
|
4
6
|
constructor(roleService: RoleService);
|
|
5
|
-
getAllRoles():
|
|
7
|
+
getAllRoles(): Promise<Record<string, RoleDTO[]>>;
|
|
8
|
+
getRoleBySlug(slug: string): Promise<RoleDTO>;
|
|
9
|
+
updateRole(slug: string, body: UpdateRoleDto): Promise<RoleDTO>;
|
|
10
|
+
deleteRole(slug: string): Promise<RoleDTO>;
|
|
11
|
+
createRole(body: CreateRoleDto): Promise<RoleDTO>;
|
|
6
12
|
}
|
|
@@ -8,6 +8,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.RoleController = void 0;
|
|
13
16
|
const decorators_1 = require("@n8n/decorators");
|
|
@@ -16,8 +19,26 @@ let RoleController = class RoleController {
|
|
|
16
19
|
constructor(roleService) {
|
|
17
20
|
this.roleService = roleService;
|
|
18
21
|
}
|
|
19
|
-
getAllRoles() {
|
|
20
|
-
|
|
22
|
+
async getAllRoles() {
|
|
23
|
+
const allRoles = await this.roleService.getAllRoles();
|
|
24
|
+
return {
|
|
25
|
+
global: allRoles.filter((r) => r.roleType === 'global'),
|
|
26
|
+
project: allRoles.filter((r) => r.roleType === 'project'),
|
|
27
|
+
credential: allRoles.filter((r) => r.roleType === 'credential'),
|
|
28
|
+
workflow: allRoles.filter((r) => r.roleType === 'workflow'),
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
async getRoleBySlug(slug) {
|
|
32
|
+
return await this.roleService.getRole(slug);
|
|
33
|
+
}
|
|
34
|
+
async updateRole(slug, body) {
|
|
35
|
+
return await this.roleService.updateCustomRole(slug, body);
|
|
36
|
+
}
|
|
37
|
+
async deleteRole(slug) {
|
|
38
|
+
return await this.roleService.removeCustomRole(slug);
|
|
39
|
+
}
|
|
40
|
+
async createRole(body) {
|
|
41
|
+
return await this.roleService.createCustomRole(body);
|
|
21
42
|
}
|
|
22
43
|
};
|
|
23
44
|
exports.RoleController = RoleController;
|
|
@@ -25,8 +46,40 @@ __decorate([
|
|
|
25
46
|
(0, decorators_1.Get)('/'),
|
|
26
47
|
__metadata("design:type", Function),
|
|
27
48
|
__metadata("design:paramtypes", []),
|
|
28
|
-
__metadata("design:returntype",
|
|
49
|
+
__metadata("design:returntype", Promise)
|
|
29
50
|
], RoleController.prototype, "getAllRoles", null);
|
|
51
|
+
__decorate([
|
|
52
|
+
(0, decorators_1.Get)('/:slug'),
|
|
53
|
+
__param(0, (0, decorators_1.Param)('slug')),
|
|
54
|
+
__metadata("design:type", Function),
|
|
55
|
+
__metadata("design:paramtypes", [String]),
|
|
56
|
+
__metadata("design:returntype", Promise)
|
|
57
|
+
], RoleController.prototype, "getRoleBySlug", null);
|
|
58
|
+
__decorate([
|
|
59
|
+
(0, decorators_1.Patch)('/:slug'),
|
|
60
|
+
(0, decorators_1.GlobalScope)('role:manage'),
|
|
61
|
+
__param(0, (0, decorators_1.Param)('slug')),
|
|
62
|
+
__param(1, decorators_1.Body),
|
|
63
|
+
__metadata("design:type", Function),
|
|
64
|
+
__metadata("design:paramtypes", [String, Object]),
|
|
65
|
+
__metadata("design:returntype", Promise)
|
|
66
|
+
], RoleController.prototype, "updateRole", null);
|
|
67
|
+
__decorate([
|
|
68
|
+
(0, decorators_1.Delete)('/:slug'),
|
|
69
|
+
(0, decorators_1.GlobalScope)('role:manage'),
|
|
70
|
+
__param(0, (0, decorators_1.Param)('slug')),
|
|
71
|
+
__metadata("design:type", Function),
|
|
72
|
+
__metadata("design:paramtypes", [String]),
|
|
73
|
+
__metadata("design:returntype", Promise)
|
|
74
|
+
], RoleController.prototype, "deleteRole", null);
|
|
75
|
+
__decorate([
|
|
76
|
+
(0, decorators_1.Post)('/'),
|
|
77
|
+
(0, decorators_1.GlobalScope)('role:manage'),
|
|
78
|
+
__param(0, decorators_1.Body),
|
|
79
|
+
__metadata("design:type", Function),
|
|
80
|
+
__metadata("design:paramtypes", [Object]),
|
|
81
|
+
__metadata("design:returntype", Promise)
|
|
82
|
+
], RoleController.prototype, "createRole", null);
|
|
30
83
|
exports.RoleController = RoleController = __decorate([
|
|
31
84
|
(0, decorators_1.RestController)('/roles'),
|
|
32
85
|
__metadata("design:paramtypes", [role_service_1.RoleService])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.controller.js","sourceRoot":"","sources":["../../src/controllers/role.controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"role.controller.js","sourceRoot":"","sources":["../../src/controllers/role.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,gDASyB;AAGzB,0DAAsD;AAG/C,IAAM,cAAc,GAApB,MAAM,cAAc;IAC1B,YAA6B,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAGnD,AAAN,KAAK,CAAC,WAAW;QAChB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;QACtD,OAAO;YACN,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC;YACvD,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC;YACzD,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,YAAY,CAAC;YAC/D,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,UAAU,CAAC;SAC3D,CAAC;IACH,CAAC;IAGK,AAAN,KAAK,CAAC,aAAa,CAAgB,IAAY;QAC9C,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAIK,AAAN,KAAK,CAAC,UAAU,CAAgB,IAAY,EAAQ,IAAmB;QACtE,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5D,CAAC;IAIK,AAAN,KAAK,CAAC,UAAU,CAAgB,IAAY;QAC3C,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC;IAIK,AAAN,KAAK,CAAC,UAAU,CAAO,IAAmB;QACzC,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC;CACD,CAAA;AApCY,wCAAc;AAIpB;IADL,IAAA,gBAAG,EAAC,GAAG,CAAC;;;;iDASR;AAGK;IADL,IAAA,gBAAG,EAAC,QAAQ,CAAC;IACO,WAAA,IAAA,kBAAK,EAAC,MAAM,CAAC,CAAA;;;;mDAEjC;AAIK;IAFL,IAAA,kBAAK,EAAC,QAAQ,CAAC;IACf,IAAA,wBAAW,EAAC,aAAa,CAAC;IACT,WAAA,IAAA,kBAAK,EAAC,MAAM,CAAC,CAAA;IAAgB,WAAA,iBAAI,CAAA;;;;gDAElD;AAIK;IAFL,IAAA,mBAAM,EAAC,QAAQ,CAAC;IAChB,IAAA,wBAAW,EAAC,aAAa,CAAC;IACT,WAAA,IAAA,kBAAK,EAAC,MAAM,CAAC,CAAA;;;;gDAE9B;AAIK;IAFL,IAAA,iBAAI,EAAC,GAAG,CAAC;IACT,IAAA,wBAAW,EAAC,aAAa,CAAC;IACT,WAAA,iBAAI,CAAA;;;;gDAErB;yBAnCW,cAAc;IAD1B,IAAA,2BAAc,EAAC,QAAQ,CAAC;qCAEkB,0BAAW;GADzC,cAAc,CAoC1B"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.ThirdPartyLicensesController = void 0;
|
|
13
|
+
const constants_1 = require("../constants");
|
|
14
|
+
const decorators_1 = require("@n8n/decorators");
|
|
15
|
+
const promises_1 = require("fs/promises");
|
|
16
|
+
const path_1 = require("path");
|
|
17
|
+
let ThirdPartyLicensesController = class ThirdPartyLicensesController {
|
|
18
|
+
async getThirdPartyLicenses(_, res) {
|
|
19
|
+
const licenseFile = (0, path_1.resolve)(constants_1.CLI_DIR, 'THIRD_PARTY_LICENSES.md');
|
|
20
|
+
try {
|
|
21
|
+
const content = await (0, promises_1.readFile)(licenseFile, 'utf-8');
|
|
22
|
+
res.setHeader('Content-Type', 'text/markdown; charset=utf-8');
|
|
23
|
+
res.send(content);
|
|
24
|
+
}
|
|
25
|
+
catch {
|
|
26
|
+
res.status(404).send('Third-party licenses file not found');
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
};
|
|
30
|
+
exports.ThirdPartyLicensesController = ThirdPartyLicensesController;
|
|
31
|
+
__decorate([
|
|
32
|
+
(0, decorators_1.Get)('/'),
|
|
33
|
+
__metadata("design:type", Function),
|
|
34
|
+
__metadata("design:paramtypes", [Object, Object]),
|
|
35
|
+
__metadata("design:returntype", Promise)
|
|
36
|
+
], ThirdPartyLicensesController.prototype, "getThirdPartyLicenses", null);
|
|
37
|
+
exports.ThirdPartyLicensesController = ThirdPartyLicensesController = __decorate([
|
|
38
|
+
(0, decorators_1.RestController)('/third-party-licenses')
|
|
39
|
+
], ThirdPartyLicensesController);
|
|
40
|
+
//# sourceMappingURL=third-party-licenses.controller.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"third-party-licenses.controller.js","sourceRoot":"","sources":["../../src/controllers/third-party-licenses.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAsC;AACtC,gDAAsD;AAEtD,0CAAuC;AACvC,+BAA+B;AAGxB,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAMlC,AAAN,KAAK,CAAC,qBAAqB,CAAC,CAAU,EAAE,GAAa;QACpD,MAAM,WAAW,GAAG,IAAA,cAAO,EAAC,mBAAO,EAAE,yBAAyB,CAAC,CAAC;QAEhE,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,MAAM,IAAA,mBAAQ,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YACrD,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,8BAA8B,CAAC,CAAC;YAC9D,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnB,CAAC;QAAC,MAAM,CAAC;YACR,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;QAC7D,CAAC;IACF,CAAC;CACD,CAAA;AAjBY,oEAA4B;AAMlC;IADL,IAAA,gBAAG,EAAC,GAAG,CAAC;;;;yEAWR;uCAhBW,4BAA4B;IADxC,IAAA,2BAAc,EAAC,uBAAuB,CAAC;GAC3B,4BAA4B,CAiBxC"}
|
|
@@ -63,7 +63,7 @@ export declare class UsersController {
|
|
|
63
63
|
mfaEnabled?: boolean | undefined;
|
|
64
64
|
isOwner?: boolean | undefined;
|
|
65
65
|
projectRelations?: {
|
|
66
|
-
role:
|
|
66
|
+
role: string;
|
|
67
67
|
id: string;
|
|
68
68
|
name: string;
|
|
69
69
|
}[] | null | undefined;
|