n8n 1.54.4 → 1.55.1
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/AbstractServer.js +10 -10
- package/dist/AbstractServer.js.map +1 -1
- package/dist/ErrorReporting.js +1 -1
- package/dist/ErrorReporting.js.map +1 -1
- package/dist/GenericHelpers.d.ts +3 -2
- package/dist/GenericHelpers.js +39 -0
- package/dist/GenericHelpers.js.map +1 -1
- package/dist/Interfaces.d.ts +2 -2
- package/dist/InternalHooks.d.ts +1 -41
- package/dist/InternalHooks.js +1 -54
- package/dist/InternalHooks.js.map +1 -1
- package/dist/License.d.ts +2 -0
- package/dist/License.js +6 -0
- package/dist/License.js.map +1 -1
- package/dist/Mfa/mfa.service.d.ts +1 -1
- package/dist/Mfa/mfa.service.js +12 -7
- package/dist/Mfa/mfa.service.js.map +1 -1
- package/dist/PublicApi/v1/handlers/workflows/workflows.handler.js +7 -0
- package/dist/PublicApi/v1/handlers/workflows/workflows.handler.js.map +1 -1
- package/dist/Server.d.ts +1 -0
- package/dist/Server.js +3 -2
- package/dist/Server.js.map +1 -1
- package/dist/UserManagement/email/UserManagementMailer.js +10 -19
- package/dist/UserManagement/email/UserManagementMailer.js.map +1 -1
- package/dist/WorkflowRunner.d.ts +1 -1
- package/dist/WorkflowRunner.js +9 -10
- package/dist/WorkflowRunner.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/BaseCommand.d.ts +1 -1
- package/dist/commands/BaseCommand.js +3 -2
- package/dist/commands/BaseCommand.js.map +1 -1
- package/dist/commands/start.js +2 -5
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/webhook.js +25 -2
- package/dist/commands/webhook.js.map +1 -1
- package/dist/commands/worker.d.ts +7 -14
- package/dist/commands/worker.js +20 -168
- package/dist/commands/worker.js.map +1 -1
- package/dist/config/index.d.ts +3 -27
- package/dist/config/schema.d.ts +8 -112
- package/dist/config/schema.js +9 -113
- package/dist/config/schema.js.map +1 -1
- package/dist/constants.d.ts +2 -0
- package/dist/constants.js +2 -0
- package/dist/constants.js.map +1 -1
- package/dist/controllers/aiAssistant.controller.d.ts +10 -0
- package/dist/controllers/aiAssistant.controller.js +64 -0
- package/dist/controllers/aiAssistant.controller.js.map +1 -0
- package/dist/controllers/auth.controller.d.ts +1 -3
- package/dist/controllers/auth.controller.js +1 -5
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/dynamicNodeParameters.controller.d.ts +2 -1
- package/dist/controllers/dynamicNodeParameters.controller.js +14 -0
- package/dist/controllers/dynamicNodeParameters.controller.js.map +1 -1
- package/dist/controllers/me.controller.d.ts +3 -1
- package/dist/controllers/me.controller.js +19 -4
- package/dist/controllers/me.controller.js.map +1 -1
- package/dist/controllers/mfa.controller.d.ts +1 -1
- package/dist/controllers/mfa.controller.js +9 -5
- package/dist/controllers/mfa.controller.js.map +1 -1
- package/dist/controllers/owner.controller.d.ts +3 -3
- package/dist/controllers/owner.controller.js +5 -5
- package/dist/controllers/owner.controller.js.map +1 -1
- package/dist/controllers/passwordReset.controller.d.ts +1 -3
- package/dist/controllers/passwordReset.controller.js +8 -14
- package/dist/controllers/passwordReset.controller.js.map +1 -1
- package/dist/credentials/credentials.controller.js +5 -5
- package/dist/credentials/credentials.controller.js.map +1 -1
- package/dist/credentials/credentials.service.ee.d.ts +4 -2
- package/dist/credentials/credentials.service.ee.js +25 -6
- package/dist/credentials/credentials.service.ee.js.map +1 -1
- package/dist/credentials/credentials.service.js +14 -2
- package/dist/credentials/credentials.service.js.map +1 -1
- package/dist/databases/entities/User.d.ts +1 -1
- package/dist/databases/repositories/sharedCredentials.repository.d.ts +1 -0
- package/dist/databases/repositories/sharedCredentials.repository.js +8 -0
- package/dist/databases/repositories/sharedCredentials.repository.js.map +1 -1
- package/dist/databases/repositories/workflow.repository.d.ts +1 -1
- package/dist/errors/response-errors/invalid-mfa-code.error.d.ts +4 -0
- package/dist/errors/response-errors/invalid-mfa-code.error.js +11 -0
- package/dist/errors/response-errors/invalid-mfa-code.error.js.map +1 -0
- package/dist/events/relay-event-map.d.ts +31 -0
- package/dist/events/telemetry-event-relay.d.ts +11 -0
- package/dist/events/telemetry-event-relay.js +73 -0
- package/dist/events/telemetry-event-relay.js.map +1 -1
- package/dist/executions/execution-recovery.service.d.ts +1 -12
- package/dist/executions/execution-recovery.service.js +2 -116
- package/dist/executions/execution-recovery.service.js.map +1 -1
- package/dist/executions/execution.service.d.ts +1 -3
- package/dist/executions/execution.service.js +29 -6
- package/dist/executions/execution.service.js.map +1 -1
- package/dist/executions/execution.types.d.ts +0 -5
- package/dist/permissions/project-roles.js +1 -0
- package/dist/permissions/project-roles.js.map +1 -1
- package/dist/requests.d.ts +17 -1
- package/dist/requests.js.map +1 -1
- package/dist/scaling/constants.d.ts +2 -0
- package/dist/scaling/constants.js +6 -0
- package/dist/scaling/constants.js.map +1 -0
- package/dist/scaling/job-processor.d.ts +18 -0
- package/dist/scaling/job-processor.js +170 -0
- package/dist/scaling/job-processor.js.map +1 -0
- package/dist/scaling/scaling.service.d.ts +37 -0
- package/dist/scaling/scaling.service.js +273 -0
- package/dist/scaling/scaling.service.js.map +1 -0
- package/dist/scaling/types.d.ts +41 -0
- package/dist/scaling/types.js +3 -0
- package/dist/scaling/types.js.map +1 -0
- package/dist/services/aiAsisstant.service.d.ts +13 -0
- package/dist/services/aiAsisstant.service.js +63 -0
- package/dist/services/aiAsisstant.service.js.map +1 -0
- package/dist/services/communityPackages.service.d.ts +5 -1
- package/dist/services/communityPackages.service.js +18 -5
- package/dist/services/communityPackages.service.js.map +1 -1
- package/dist/services/dynamicNodeParameters.service.d.ts +2 -1
- package/dist/services/dynamicNodeParameters.service.js +7 -0
- package/dist/services/dynamicNodeParameters.service.js.map +1 -1
- package/dist/services/frontend.service.d.ts +3 -3
- package/dist/services/frontend.service.js +12 -5
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/orchestration/worker/types.d.ts +3 -2
- package/dist/services/redis/RedisConstants.d.ts +0 -4
- package/dist/services/redis/RedisConstants.js +1 -5
- package/dist/services/redis/RedisConstants.js.map +1 -1
- package/dist/services/redis/RedisServiceBaseClasses.js +1 -0
- package/dist/services/redis/RedisServiceBaseClasses.js.map +1 -1
- package/dist/services/redis/redis-client.service.d.ts +3 -1
- package/dist/services/redis/redis-client.service.js +9 -8
- package/dist/services/redis/redis-client.service.js.map +1 -1
- package/dist/services/user.service.js +7 -9
- package/dist/services/user.service.js.map +1 -1
- package/dist/services/workflow-statistics.service.d.ts +3 -1
- package/dist/services/workflow-statistics.service.js +18 -16
- package/dist/services/workflow-statistics.service.js.map +1 -1
- package/dist/telemetry/index.d.ts +1 -1
- package/dist/telemetry/index.js +8 -2
- package/dist/telemetry/index.js.map +1 -1
- package/dist/webhooks/{ActiveWebhooks.d.ts → LiveWebhooks.d.ts} +1 -1
- package/dist/webhooks/{ActiveWebhooks.js → LiveWebhooks.js} +6 -6
- package/dist/webhooks/LiveWebhooks.js.map +1 -0
- package/dist/webhooks/WebhookHelpers.d.ts +2 -5
- package/dist/webhooks/WebhookHelpers.js +0 -81
- package/dist/webhooks/WebhookHelpers.js.map +1 -1
- package/dist/webhooks/WebhookRequestHandler.d.ts +3 -0
- package/dist/webhooks/WebhookRequestHandler.js +108 -0
- package/dist/webhooks/WebhookRequestHandler.js.map +1 -0
- package/dist/webhooks/webhook.types.d.ts +1 -1
- package/dist/workflows/workflow.service.d.ts +1 -1
- package/dist/workflows/workflows.controller.d.ts +5 -7
- package/dist/workflows/workflows.controller.js +6 -5
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +15 -14
- package/dist/Queue.d.ts +0 -39
- package/dist/Queue.js +0 -140
- package/dist/Queue.js.map +0 -1
- package/dist/webhooks/ActiveWebhooks.js.map +0 -1
|
@@ -9,6 +9,7 @@ import { Logger } from '../Logger';
|
|
|
9
9
|
import { ExternalHooks } from '../ExternalHooks';
|
|
10
10
|
import { UserRepository } from '../databases/repositories/user.repository';
|
|
11
11
|
import { EventService } from '../events/event.service';
|
|
12
|
+
import { MfaService } from '../Mfa/mfa.service';
|
|
12
13
|
export declare const API_KEY_PREFIX = "n8n_api_";
|
|
13
14
|
export declare const isApiEnabledMiddleware: RequestHandler;
|
|
14
15
|
export declare class MeController {
|
|
@@ -19,7 +20,8 @@ export declare class MeController {
|
|
|
19
20
|
private readonly passwordUtility;
|
|
20
21
|
private readonly userRepository;
|
|
21
22
|
private readonly eventService;
|
|
22
|
-
|
|
23
|
+
private readonly mfaService;
|
|
24
|
+
constructor(logger: Logger, externalHooks: ExternalHooks, authService: AuthService, userService: UserService, passwordUtility: PasswordUtility, userRepository: UserRepository, eventService: EventService, mfaService: MfaService);
|
|
23
25
|
updateCurrentUser(req: MeRequest.UserUpdate, res: Response): Promise<PublicUser>;
|
|
24
26
|
updatePassword(req: MeRequest.Password, res: Response): Promise<{
|
|
25
27
|
success: boolean;
|
|
@@ -29,6 +29,8 @@ const bad_request_error_1 = require("../errors/response-errors/bad-request.error
|
|
|
29
29
|
const user_repository_1 = require("../databases/repositories/user.repository");
|
|
30
30
|
const PublicApi_1 = require("../PublicApi");
|
|
31
31
|
const event_service_1 = require("../events/event.service");
|
|
32
|
+
const mfa_service_1 = require("../Mfa/mfa.service");
|
|
33
|
+
const invalid_mfa_code_error_1 = require("../errors/response-errors/invalid-mfa-code.error");
|
|
32
34
|
exports.API_KEY_PREFIX = 'n8n_api_';
|
|
33
35
|
const isApiEnabledMiddleware = (_, res, next) => {
|
|
34
36
|
if ((0, PublicApi_1.isApiEnabled)()) {
|
|
@@ -40,7 +42,7 @@ const isApiEnabledMiddleware = (_, res, next) => {
|
|
|
40
42
|
};
|
|
41
43
|
exports.isApiEnabledMiddleware = isApiEnabledMiddleware;
|
|
42
44
|
let MeController = class MeController {
|
|
43
|
-
constructor(logger, externalHooks, authService, userService, passwordUtility, userRepository, eventService) {
|
|
45
|
+
constructor(logger, externalHooks, authService, userService, passwordUtility, userRepository, eventService, mfaService) {
|
|
44
46
|
this.logger = logger;
|
|
45
47
|
this.externalHooks = externalHooks;
|
|
46
48
|
this.authService = authService;
|
|
@@ -48,6 +50,7 @@ let MeController = class MeController {
|
|
|
48
50
|
this.passwordUtility = passwordUtility;
|
|
49
51
|
this.userRepository = userRepository;
|
|
50
52
|
this.eventService = eventService;
|
|
53
|
+
this.mfaService = mfaService;
|
|
51
54
|
}
|
|
52
55
|
async updateCurrentUser(req, res) {
|
|
53
56
|
const { id: userId, email: currentEmail } = req.user;
|
|
@@ -93,7 +96,7 @@ let MeController = class MeController {
|
|
|
93
96
|
}
|
|
94
97
|
async updatePassword(req, res) {
|
|
95
98
|
const { user } = req;
|
|
96
|
-
const { currentPassword, newPassword } = req.body;
|
|
99
|
+
const { currentPassword, newPassword, mfaCode } = req.body;
|
|
97
100
|
if ((0, samlHelpers_1.isSamlLicensedAndEnabled)()) {
|
|
98
101
|
this.logger.debug('Attempted to change password for user, while SAML is enabled', {
|
|
99
102
|
userId: user.id,
|
|
@@ -111,6 +114,15 @@ let MeController = class MeController {
|
|
|
111
114
|
throw new bad_request_error_1.BadRequestError('Provided current password is incorrect.');
|
|
112
115
|
}
|
|
113
116
|
const validPassword = this.passwordUtility.validate(newPassword);
|
|
117
|
+
if (user.mfaEnabled) {
|
|
118
|
+
if (typeof mfaCode !== 'string') {
|
|
119
|
+
throw new bad_request_error_1.BadRequestError('Two-factor code is required to change password.');
|
|
120
|
+
}
|
|
121
|
+
const isMfaTokenValid = await this.mfaService.validateMfa(user.id, mfaCode, undefined);
|
|
122
|
+
if (!isMfaTokenValid) {
|
|
123
|
+
throw new invalid_mfa_code_error_1.InvalidMfaCodeError();
|
|
124
|
+
}
|
|
125
|
+
}
|
|
114
126
|
user.password = await this.passwordUtility.hash(validPassword);
|
|
115
127
|
const updatedUser = await this.userRepository.save(user, { transaction: false });
|
|
116
128
|
this.logger.info('Password updated successfully', { userId: user.id });
|
|
@@ -127,6 +139,7 @@ let MeController = class MeController {
|
|
|
127
139
|
});
|
|
128
140
|
throw new bad_request_error_1.BadRequestError('Personalization answers are mandatory');
|
|
129
141
|
}
|
|
142
|
+
await (0, GenericHelpers_1.validateRecordNoXss)(personalizationAnswers);
|
|
130
143
|
await this.userRepository.save({
|
|
131
144
|
id: req.user.id,
|
|
132
145
|
personalizationAnswers,
|
|
@@ -157,6 +170,7 @@ let MeController = class MeController {
|
|
|
157
170
|
const payload = (0, class_transformer_1.plainToInstance)(requests_1.UserSettingsUpdatePayload, req.body, {
|
|
158
171
|
excludeExtraneousValues: true,
|
|
159
172
|
});
|
|
173
|
+
await (0, GenericHelpers_1.validateEntity)(payload);
|
|
160
174
|
const { id } = req.user;
|
|
161
175
|
await this.userService.updateSettings(id, payload);
|
|
162
176
|
const user = await this.userRepository.findOneOrFail({
|
|
@@ -182,7 +196,7 @@ __decorate([
|
|
|
182
196
|
__metadata("design:returntype", Promise)
|
|
183
197
|
], MeController.prototype, "updateCurrentUser", null);
|
|
184
198
|
__decorate([
|
|
185
|
-
(0, decorators_1.Patch)('/password'),
|
|
199
|
+
(0, decorators_1.Patch)('/password', { rateLimit: true }),
|
|
186
200
|
__metadata("design:type", Function),
|
|
187
201
|
__metadata("design:paramtypes", [Object, Object]),
|
|
188
202
|
__metadata("design:returntype", Promise)
|
|
@@ -225,6 +239,7 @@ exports.MeController = MeController = __decorate([
|
|
|
225
239
|
user_service_1.UserService,
|
|
226
240
|
password_utility_1.PasswordUtility,
|
|
227
241
|
user_repository_1.UserRepository,
|
|
228
|
-
event_service_1.EventService
|
|
242
|
+
event_service_1.EventService,
|
|
243
|
+
mfa_service_1.MfaService])
|
|
229
244
|
], MeController);
|
|
230
245
|
//# sourceMappingURL=me.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"me.controller.js","sourceRoot":"","sources":["../../src/controllers/me.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0DAAkC;AAClC,yDAAoD;AAEpD,mCAAqC;AAErC,sDAAkD;AAClD,6CAAwE;AACxE,kEAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"me.controller.js","sourceRoot":"","sources":["../../src/controllers/me.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,6 @@ export declare class MFAController {
|
|
|
9
9
|
qrCode: string;
|
|
10
10
|
}>;
|
|
11
11
|
activateMFA(req: MFA.Activate): Promise<void>;
|
|
12
|
-
disableMFA(req:
|
|
12
|
+
disableMFA(req: MFA.Disable): Promise<void>;
|
|
13
13
|
verifyMFA(req: MFA.Verify): Promise<void>;
|
|
14
14
|
}
|
|
@@ -60,8 +60,12 @@ let MFAController = class MFAController {
|
|
|
60
60
|
await this.mfaService.enableMfa(id);
|
|
61
61
|
}
|
|
62
62
|
async disableMFA(req) {
|
|
63
|
-
const { id } = req.user;
|
|
64
|
-
|
|
63
|
+
const { id: userId } = req.user;
|
|
64
|
+
const { token = null } = req.body;
|
|
65
|
+
if (typeof token !== 'string' || !token) {
|
|
66
|
+
throw new bad_request_error_1.BadRequestError('Token is required to disable MFA feature');
|
|
67
|
+
}
|
|
68
|
+
await this.mfaService.disableMfa(userId, token);
|
|
65
69
|
}
|
|
66
70
|
async verifyMFA(req) {
|
|
67
71
|
const { id } = req.user;
|
|
@@ -84,19 +88,19 @@ __decorate([
|
|
|
84
88
|
__metadata("design:returntype", Promise)
|
|
85
89
|
], MFAController.prototype, "getQRCode", null);
|
|
86
90
|
__decorate([
|
|
87
|
-
(0, decorators_1.Post)('/enable'),
|
|
91
|
+
(0, decorators_1.Post)('/enable', { rateLimit: true }),
|
|
88
92
|
__metadata("design:type", Function),
|
|
89
93
|
__metadata("design:paramtypes", [Object]),
|
|
90
94
|
__metadata("design:returntype", Promise)
|
|
91
95
|
], MFAController.prototype, "activateMFA", null);
|
|
92
96
|
__decorate([
|
|
93
|
-
(0, decorators_1.
|
|
97
|
+
(0, decorators_1.Post)('/disable', { rateLimit: true }),
|
|
94
98
|
__metadata("design:type", Function),
|
|
95
99
|
__metadata("design:paramtypes", [Object]),
|
|
96
100
|
__metadata("design:returntype", Promise)
|
|
97
101
|
], MFAController.prototype, "disableMFA", null);
|
|
98
102
|
__decorate([
|
|
99
|
-
(0, decorators_1.Post)('/verify'),
|
|
103
|
+
(0, decorators_1.Post)('/verify', { rateLimit: true }),
|
|
100
104
|
__metadata("design:type", Function),
|
|
101
105
|
__metadata("design:paramtypes", [Object]),
|
|
102
106
|
__metadata("design:returntype", Promise)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mfa.controller.js","sourceRoot":"","sources":["../../src/controllers/mfa.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"mfa.controller.js","sourceRoot":"","sources":["../../src/controllers/mfa.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,17 +7,17 @@ import { UserRepository } from '../databases/repositories/user.repository';
|
|
|
7
7
|
import { PostHogClient } from '../posthog';
|
|
8
8
|
import { UserService } from '../services/user.service';
|
|
9
9
|
import { Logger } from '../Logger';
|
|
10
|
-
import {
|
|
10
|
+
import { EventService } from '../events/event.service';
|
|
11
11
|
export declare class OwnerController {
|
|
12
12
|
private readonly logger;
|
|
13
|
-
private readonly
|
|
13
|
+
private readonly eventService;
|
|
14
14
|
private readonly settingsRepository;
|
|
15
15
|
private readonly authService;
|
|
16
16
|
private readonly userService;
|
|
17
17
|
private readonly passwordUtility;
|
|
18
18
|
private readonly postHog;
|
|
19
19
|
private readonly userRepository;
|
|
20
|
-
constructor(logger: Logger,
|
|
20
|
+
constructor(logger: Logger, eventService: EventService, settingsRepository: SettingsRepository, authService: AuthService, userService: UserService, passwordUtility: PasswordUtility, postHog: PostHogClient, userRepository: UserRepository);
|
|
21
21
|
setupOwner(req: OwnerRequest.Post, res: Response): Promise<import("../Interfaces").PublicUser>;
|
|
22
22
|
dismissBanner(req: OwnerRequest.DismissBanner): Promise<{
|
|
23
23
|
success: boolean;
|
|
@@ -25,11 +25,11 @@ const posthog_1 = require("../posthog");
|
|
|
25
25
|
const user_service_1 = require("../services/user.service");
|
|
26
26
|
const Logger_1 = require("../Logger");
|
|
27
27
|
const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
|
|
28
|
-
const
|
|
28
|
+
const event_service_1 = require("../events/event.service");
|
|
29
29
|
let OwnerController = class OwnerController {
|
|
30
|
-
constructor(logger,
|
|
30
|
+
constructor(logger, eventService, settingsRepository, authService, userService, passwordUtility, postHog, userRepository) {
|
|
31
31
|
this.logger = logger;
|
|
32
|
-
this.
|
|
32
|
+
this.eventService = eventService;
|
|
33
33
|
this.settingsRepository = settingsRepository;
|
|
34
34
|
this.authService = authService;
|
|
35
35
|
this.userService = userService;
|
|
@@ -68,7 +68,7 @@ let OwnerController = class OwnerController {
|
|
|
68
68
|
config_1.default.set('userManagement.isInstanceOwnerSetUp', true);
|
|
69
69
|
this.logger.debug('Setting isInstanceOwnerSetUp updated successfully');
|
|
70
70
|
this.authService.issueCookie(res, owner, req.browserId);
|
|
71
|
-
this.
|
|
71
|
+
this.eventService.emit('instance-owner-setup', { userId: owner.id });
|
|
72
72
|
return await this.userService.toPublic(owner, { posthog: this.postHog, withScopes: true });
|
|
73
73
|
}
|
|
74
74
|
async dismissBanner(req) {
|
|
@@ -93,7 +93,7 @@ __decorate([
|
|
|
93
93
|
exports.OwnerController = OwnerController = __decorate([
|
|
94
94
|
(0, decorators_1.RestController)('/owner'),
|
|
95
95
|
__metadata("design:paramtypes", [Logger_1.Logger,
|
|
96
|
-
|
|
96
|
+
event_service_1.EventService,
|
|
97
97
|
settings_repository_1.SettingsRepository,
|
|
98
98
|
auth_service_1.AuthService,
|
|
99
99
|
user_service_1.UserService,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"owner.controller.js","sourceRoot":"","sources":["../../src/controllers/owner.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0DAAkC;AAGlC,sDAAkD;AAClD,sDAA8B;AAC9B,qDAAkD;AAClD,6CAAiE;AACjE,kEAA8D;AAE9D,8EAA0E;AAC1E,sEAAkE;AAClE,uCAA0C;AAC1C,0DAAsD;AACtD,qCAAkC;AAClC,kFAA6E;AAC7E,
|
|
1
|
+
{"version":3,"file":"owner.controller.js","sourceRoot":"","sources":["../../src/controllers/owner.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,14 +8,12 @@ import { License } from '../License';
|
|
|
8
8
|
import { MfaService } from '../Mfa/mfa.service';
|
|
9
9
|
import { Logger } from '../Logger';
|
|
10
10
|
import { ExternalHooks } from '../ExternalHooks';
|
|
11
|
-
import { InternalHooks } from '../InternalHooks';
|
|
12
11
|
import { UrlService } from '../services/url.service';
|
|
13
12
|
import { UserRepository } from '../databases/repositories/user.repository';
|
|
14
13
|
import { EventService } from '../events/event.service';
|
|
15
14
|
export declare class PasswordResetController {
|
|
16
15
|
private readonly logger;
|
|
17
16
|
private readonly externalHooks;
|
|
18
|
-
private readonly internalHooks;
|
|
19
17
|
private readonly mailer;
|
|
20
18
|
private readonly authService;
|
|
21
19
|
private readonly userService;
|
|
@@ -25,7 +23,7 @@ export declare class PasswordResetController {
|
|
|
25
23
|
private readonly passwordUtility;
|
|
26
24
|
private readonly userRepository;
|
|
27
25
|
private readonly eventService;
|
|
28
|
-
constructor(logger: Logger, externalHooks: ExternalHooks,
|
|
26
|
+
constructor(logger: Logger, externalHooks: ExternalHooks, mailer: UserManagementMailer, authService: AuthService, userService: UserService, mfaService: MfaService, urlService: UrlService, license: License, passwordUtility: PasswordUtility, userRepository: UserRepository, eventService: EventService);
|
|
29
27
|
forgotPassword(req: PasswordResetRequest.Email): Promise<void>;
|
|
30
28
|
resolvePasswordToken(req: PasswordResetRequest.Credentials): Promise<void>;
|
|
31
29
|
changePassword(req: PasswordResetRequest.NewPassword, res: Response): Promise<void>;
|
|
@@ -25,7 +25,6 @@ const constants_1 = require("../constants");
|
|
|
25
25
|
const mfa_service_1 = require("../Mfa/mfa.service");
|
|
26
26
|
const Logger_1 = require("../Logger");
|
|
27
27
|
const ExternalHooks_1 = require("../ExternalHooks");
|
|
28
|
-
const InternalHooks_1 = require("../InternalHooks");
|
|
29
28
|
const url_service_1 = require("../services/url.service");
|
|
30
29
|
const internal_server_error_1 = require("../errors/response-errors/internal-server.error");
|
|
31
30
|
const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
|
|
@@ -35,10 +34,9 @@ const unprocessable_error_1 = require("../errors/response-errors/unprocessable.e
|
|
|
35
34
|
const user_repository_1 = require("../databases/repositories/user.repository");
|
|
36
35
|
const event_service_1 = require("../events/event.service");
|
|
37
36
|
let PasswordResetController = class PasswordResetController {
|
|
38
|
-
constructor(logger, externalHooks,
|
|
37
|
+
constructor(logger, externalHooks, mailer, authService, userService, mfaService, urlService, license, passwordUtility, userRepository, eventService) {
|
|
39
38
|
this.logger = logger;
|
|
40
39
|
this.externalHooks = externalHooks;
|
|
41
|
-
this.internalHooks = internalHooks;
|
|
42
40
|
this.mailer = mailer;
|
|
43
41
|
this.authService = authService;
|
|
44
42
|
this.userService = userService;
|
|
@@ -95,23 +93,21 @@ let PasswordResetController = class PasswordResetController {
|
|
|
95
93
|
});
|
|
96
94
|
}
|
|
97
95
|
catch (error) {
|
|
98
|
-
this.
|
|
96
|
+
this.eventService.emit('email-failed', {
|
|
99
97
|
user,
|
|
100
|
-
|
|
101
|
-
|
|
98
|
+
messageType: 'Reset password',
|
|
99
|
+
publicApi: false,
|
|
102
100
|
});
|
|
103
|
-
this.eventService.emit('email-failed', { user, messageType: 'Reset password' });
|
|
104
101
|
if (error instanceof Error) {
|
|
105
102
|
throw new internal_server_error_1.InternalServerError(`Please contact your administrator: ${error.message}`);
|
|
106
103
|
}
|
|
107
104
|
}
|
|
108
105
|
this.logger.info('Sent password reset email successfully', { userId: user.id, email });
|
|
109
|
-
this.
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
106
|
+
this.eventService.emit('user-transactional-email-sent', {
|
|
107
|
+
userId: id,
|
|
108
|
+
messageType: 'Reset password',
|
|
109
|
+
publicApi: false,
|
|
113
110
|
});
|
|
114
|
-
this.internalHooks.onUserPasswordResetRequestClick({ user });
|
|
115
111
|
this.eventService.emit('user-password-reset-request-click', { user });
|
|
116
112
|
}
|
|
117
113
|
async resolvePasswordToken(req) {
|
|
@@ -130,7 +126,6 @@ let PasswordResetController = class PasswordResetController {
|
|
|
130
126
|
throw new forbidden_error_1.ForbiddenError(constants_1.RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
|
|
131
127
|
}
|
|
132
128
|
this.logger.info('Reset-password token resolved successfully', { userId: user.id });
|
|
133
|
-
this.internalHooks.onUserPasswordResetEmailClick({ user });
|
|
134
129
|
this.eventService.emit('user-password-reset-email-click', { user });
|
|
135
130
|
}
|
|
136
131
|
async changePassword(req, res) {
|
|
@@ -193,7 +188,6 @@ exports.PasswordResetController = PasswordResetController = __decorate([
|
|
|
193
188
|
(0, decorators_1.RestController)(),
|
|
194
189
|
__metadata("design:paramtypes", [Logger_1.Logger,
|
|
195
190
|
ExternalHooks_1.ExternalHooks,
|
|
196
|
-
InternalHooks_1.InternalHooks,
|
|
197
191
|
email_1.UserManagementMailer,
|
|
198
192
|
auth_service_1.AuthService,
|
|
199
193
|
user_service_1.UserService,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"passwordReset.controller.js","sourceRoot":"","sources":["../../src/controllers/passwordReset.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,0DAAkC;AAElC,sDAAkD;AAClD,6CAAyD;AACzD,kEAA8D;AAC9D,kDAA8D;AAE9D,iDAAqE;AACrE,0DAAsD;AACtD,uCAAoC;AACpC,2CAAsD;AACtD,mDAA+C;AAC/C,qCAAkC;AAClC,mDAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"passwordReset.controller.js","sourceRoot":"","sources":["../../src/controllers/passwordReset.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -185,17 +185,17 @@ let CredentialsController = class CredentialsController {
|
|
|
185
185
|
let amountRemoved = null;
|
|
186
186
|
let newShareeIds = [];
|
|
187
187
|
await Db.transaction(async (trx) => {
|
|
188
|
-
const
|
|
188
|
+
const currentProjectIds = credential.shared
|
|
189
189
|
.filter((sc) => sc.role === 'credential:user')
|
|
190
190
|
.map((sc) => sc.projectId);
|
|
191
|
-
const
|
|
192
|
-
const toShare = utils.rightDiff([
|
|
193
|
-
const toUnshare = utils.rightDiff([
|
|
191
|
+
const newProjectIds = shareWithIds;
|
|
192
|
+
const toShare = utils.rightDiff([currentProjectIds, (id) => id], [newProjectIds, (id) => id]);
|
|
193
|
+
const toUnshare = utils.rightDiff([newProjectIds, (id) => id], [currentProjectIds, (id) => id]);
|
|
194
194
|
const deleteResult = await trx.delete(SharedCredentials_1.SharedCredentials, {
|
|
195
195
|
credentialsId: credentialId,
|
|
196
196
|
projectId: (0, typeorm_1.In)(toUnshare),
|
|
197
197
|
});
|
|
198
|
-
await this.enterpriseCredentialsService.shareWithProjects(credential, toShare, trx);
|
|
198
|
+
await this.enterpriseCredentialsService.shareWithProjects(req.user, credential, toShare, trx);
|
|
199
199
|
if (deleteResult.affected) {
|
|
200
200
|
amountRemoved = deleteResult.affected;
|
|
201
201
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials.controller.js","sourceRoot":"","sources":["../../src/credentials/credentials.controller.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"credentials.controller.js","sourceRoot":"","sources":["../../src/credentials/credentials.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,13 +7,15 @@ import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
|
|
|
7
7
|
import { OwnershipService } from '../services/ownership.service';
|
|
8
8
|
import { ProjectService } from '../services/project.service';
|
|
9
9
|
import { SharedCredentials } from '../databases/entities/SharedCredentials';
|
|
10
|
+
import { RoleService } from '../services/role.service';
|
|
10
11
|
export declare class EnterpriseCredentialsService {
|
|
11
12
|
private readonly sharedCredentialsRepository;
|
|
12
13
|
private readonly ownershipService;
|
|
13
14
|
private readonly credentialsService;
|
|
14
15
|
private readonly projectService;
|
|
15
|
-
|
|
16
|
-
|
|
16
|
+
private readonly roleService;
|
|
17
|
+
constructor(sharedCredentialsRepository: SharedCredentialsRepository, ownershipService: OwnershipService, credentialsService: CredentialsService, projectService: ProjectService, roleService: RoleService);
|
|
18
|
+
shareWithProjects(user: User, credential: CredentialsEntity, shareWithIds: string[], entityManager?: EntityManager): Promise<SharedCredentials[]>;
|
|
17
19
|
getOne(user: User, credentialId: string, includeDecryptedData: boolean): Promise<{
|
|
18
20
|
name: string;
|
|
19
21
|
type: string;
|
|
@@ -20,20 +20,38 @@ const Project_1 = require("../databases/entities/Project");
|
|
|
20
20
|
const project_service_1 = require("../services/project.service");
|
|
21
21
|
const transfer_credential_error_1 = require("../errors/response-errors/transfer-credential.error");
|
|
22
22
|
const SharedCredentials_1 = require("../databases/entities/SharedCredentials");
|
|
23
|
+
const role_service_1 = require("../services/role.service");
|
|
23
24
|
let EnterpriseCredentialsService = class EnterpriseCredentialsService {
|
|
24
|
-
constructor(sharedCredentialsRepository, ownershipService, credentialsService, projectService) {
|
|
25
|
+
constructor(sharedCredentialsRepository, ownershipService, credentialsService, projectService, roleService) {
|
|
25
26
|
this.sharedCredentialsRepository = sharedCredentialsRepository;
|
|
26
27
|
this.ownershipService = ownershipService;
|
|
27
28
|
this.credentialsService = credentialsService;
|
|
28
29
|
this.projectService = projectService;
|
|
30
|
+
this.roleService = roleService;
|
|
29
31
|
}
|
|
30
|
-
async shareWithProjects(credential, shareWithIds, entityManager) {
|
|
32
|
+
async shareWithProjects(user, credential, shareWithIds, entityManager) {
|
|
31
33
|
const em = entityManager !== null && entityManager !== void 0 ? entityManager : this.sharedCredentialsRepository.manager;
|
|
32
34
|
const projects = await em.find(Project_1.Project, {
|
|
33
|
-
where:
|
|
35
|
+
where: [
|
|
36
|
+
{
|
|
37
|
+
id: (0, typeorm_1.In)(shareWithIds),
|
|
38
|
+
type: 'team',
|
|
39
|
+
...(user.hasGlobalScope('project:list')
|
|
40
|
+
? {}
|
|
41
|
+
: {
|
|
42
|
+
projectRelations: {
|
|
43
|
+
userId: user.id,
|
|
44
|
+
role: (0, typeorm_1.In)(this.roleService.rolesWithScope('project', 'project:list')),
|
|
45
|
+
},
|
|
46
|
+
}),
|
|
47
|
+
},
|
|
48
|
+
{
|
|
49
|
+
id: (0, typeorm_1.In)(shareWithIds),
|
|
50
|
+
type: 'personal',
|
|
51
|
+
},
|
|
52
|
+
],
|
|
34
53
|
});
|
|
35
|
-
const newSharedCredentials = projects
|
|
36
|
-
.map((project) => this.sharedCredentialsRepository.create({
|
|
54
|
+
const newSharedCredentials = projects.map((project) => this.sharedCredentialsRepository.create({
|
|
37
55
|
credentialsId: credential.id,
|
|
38
56
|
role: 'credential:user',
|
|
39
57
|
projectId: project.id,
|
|
@@ -96,6 +114,7 @@ exports.EnterpriseCredentialsService = EnterpriseCredentialsService = __decorate
|
|
|
96
114
|
__metadata("design:paramtypes", [sharedCredentials_repository_1.SharedCredentialsRepository,
|
|
97
115
|
ownership_service_1.OwnershipService,
|
|
98
116
|
credentials_service_1.CredentialsService,
|
|
99
|
-
project_service_1.ProjectService
|
|
117
|
+
project_service_1.ProjectService,
|
|
118
|
+
role_service_1.RoleService])
|
|
100
119
|
], EnterpriseCredentialsService);
|
|
101
120
|
//# sourceMappingURL=credentials.service.ee.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials.service.ee.js","sourceRoot":"","sources":["../../src/credentials/credentials.service.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,0CAAsD;AAEtD,+DAA2D;AAC3D,gGAA4F;AAE5F,mCAAiC;AAEjC,8EAAyE;AACzE,oEAAgE;AAChE,0DAAuD;AACvD,gEAA4D;AAC5D,kGAA6F;AAC7F,8EAA2E;
|
|
1
|
+
{"version":3,"file":"credentials.service.ee.js","sourceRoot":"","sources":["../../src/credentials/credentials.service.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,0CAAsD;AAEtD,+DAA2D;AAC3D,gGAA4F;AAE5F,mCAAiC;AAEjC,8EAAyE;AACzE,oEAAgE;AAChE,0DAAuD;AACvD,gEAA4D;AAC5D,kGAA6F;AAC7F,8EAA2E;AAC3E,0DAAsD;AAG/C,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IACxC,YACkB,2BAAwD,EACxD,gBAAkC,EAClC,kBAAsC,EACtC,cAA8B,EAC9B,WAAwB;QAJxB,gCAA2B,GAA3B,2BAA2B,CAA6B;QACxD,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,gBAAW,GAAX,WAAW,CAAa;IACvC,CAAC;IAEJ,KAAK,CAAC,iBAAiB,CACtB,IAAU,EACV,UAA6B,EAC7B,YAAsB,EACtB,aAA6B;QAE7B,MAAM,EAAE,GAAG,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC;QAErE,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,iBAAO,EAAE;YACvC,KAAK,EAAE;gBACN;oBACC,EAAE,EAAE,IAAA,YAAE,EAAC,YAAY,CAAC;oBACpB,IAAI,EAAE,MAAM;oBAGZ,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC;wBACtC,CAAC,CAAC,EAAE;wBACJ,CAAC,CAAC;4BACA,gBAAgB,EAAE;gCACjB,MAAM,EAAE,IAAI,CAAC,EAAE;gCACf,IAAI,EAAE,IAAA,YAAE,EAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;6BACpE;yBACD,CAAC;iBACJ;gBACD;oBACC,EAAE,EAAE,IAAA,YAAE,EAAC,YAAY,CAAC;oBACpB,IAAI,EAAE,UAAU;iBAChB;aACD;SACD,CAAC,CAAC;QAEH,MAAM,oBAAoB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACrD,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC;YACvC,aAAa,EAAE,UAAU,CAAC,EAAE;YAC5B,IAAI,EAAE,iBAAiB;YACvB,SAAS,EAAE,OAAO,CAAC,EAAE;SACrB,CAAC,CACF,CAAC;QAEF,OAAO,MAAM,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAU,EAAE,YAAoB,EAAE,oBAA6B;QAC3E,IAAI,UAAU,GAA6B,IAAI,CAAC;QAChD,IAAI,aAAa,GAA0C,IAAI,CAAC;QAEhE,UAAU,GAAG,oBAAoB;YAChC,CAAC;gBAEA,MAAM,IAAI,CAAC,2BAA2B,CAAC,qBAAqB,CAC3D,YAAY,EACZ,IAAI,EAGJ,CAAC,iBAAiB,EAAE,mBAAmB,CAAC,CACxC;YACF,CAAC,CAAC,IAAI,CAAC;QAER,IAAI,UAAU,EAAE,CAAC;YAGhB,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAC7C,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,EAC3C,UAAU,CACV,CAAC;QACH,CAAC;aAAM,CAAC;YAGP,UAAU,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,qBAAqB,CACxE,YAAY,EACZ,IAAI,EACJ,CAAC,iBAAiB,CAAC,CACnB,CAAC;QACH,CAAC;QAED,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,MAAM,IAAI,+BAAa,CACtB,wGAAwG,CACxG,CAAC;QACH,CAAC;QAED,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC;QAEvE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,UAAU,CAAC;QAExC,IAAI,aAAa,EAAE,CAAC;YACnB,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,IAAI,EAAE,CAAC;QACzC,CAAC;QAED,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAAU,EAAE,YAAoB,EAAE,oBAA4B;QAE/E,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,qBAAqB,CAC9E,YAAY,EACZ,IAAI,EACJ,CAAC,iBAAiB,CAAC,CACnB,CAAC;QACF,+BAAa,CAAC,mBAAmB,CAChC,UAAU,EACV,8CAA8C,YAAY,kDAAkD,CAC5G,CAAC;QAGF,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,kBAAkB,CAAC,CAAC;QAClF,+BAAa,CAAC,mBAAmB,CAChC,YAAY,EACZ,wCAAwC,UAAU,CAAC,EAAE,GAAG,CACxD,CAAC;QAGF,MAAM,aAAa,GAAG,YAAY,CAAC,OAAO,CAAC;QAG3C,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CACvE,IAAI,EACJ,oBAAoB,EACpB,CAAC,mBAAmB,CAAC,CACrB,CAAC;QACF,+BAAa,CAAC,mBAAmB,CAChC,kBAAkB,EAClB,uCAAuC,oBAAoB,mEAAmE,CAC9H,CAAC;QAGF,IAAI,aAAa,CAAC,EAAE,KAAK,kBAAkB,CAAC,EAAE,EAAE,CAAC;YAChD,MAAM,IAAI,mDAAuB,CAChC,4EAA4E,CAC5E,CAAC;QACH,CAAC;QACD,IAAI,aAAa,CAAC,IAAI,KAAK,MAAM,IAAI,aAAa,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YACxE,MAAM,IAAI,mDAAuB,CAChC,qEAAqE,CACrE,CAAC;QACH,CAAC;QACD,IAAI,kBAAkB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACxC,MAAM,IAAI,mDAAuB,CAAC,uDAAuD,CAAC,CAAC;QAC5F,CAAC;QAED,MAAM,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAGxE,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YAGpC,MAAM,GAAG,CAAC,IAAI,CACb,GAAG,CAAC,MAAM,CAAC,qCAAiB,EAAE;gBAC7B,aAAa,EAAE,UAAU,CAAC,EAAE;gBAC5B,SAAS,EAAE,kBAAkB,CAAC,EAAE;gBAChC,IAAI,EAAE,kBAAkB;aACxB,CAAC,CACF,CAAC;QACH,CAAC,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AApKY,oEAA4B;uCAA5B,4BAA4B;IADxC,IAAA,gBAAO,GAAE;qCAGsC,0DAA2B;QACtC,oCAAgB;QACd,wCAAkB;QACtB,gCAAc;QACjB,0BAAW;GAN9B,4BAA4B,CAoKxC"}
|
|
@@ -72,7 +72,7 @@ let CredentialsService = class CredentialsService {
|
|
|
72
72
|
this.userRepository = userRepository;
|
|
73
73
|
}
|
|
74
74
|
async getMany(user, options = {}) {
|
|
75
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
75
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
76
76
|
const returnAll = user.hasGlobalScope('credential:list');
|
|
77
77
|
const isDefaultSelect = !((_a = options.listQueryOptions) === null || _a === void 0 ? void 0 : _a.select);
|
|
78
78
|
let projectRelations = undefined;
|
|
@@ -88,6 +88,12 @@ let CredentialsService = class CredentialsService {
|
|
|
88
88
|
if (returnAll) {
|
|
89
89
|
let credentials = await this.credentialsRepository.findMany(options.listQueryOptions);
|
|
90
90
|
if (isDefaultSelect) {
|
|
91
|
+
if ((_h = (_g = (_f = options.listQueryOptions) === null || _f === void 0 ? void 0 : _f.filter) === null || _g === void 0 ? void 0 : _g.shared) === null || _h === void 0 ? void 0 : _h.projectId) {
|
|
92
|
+
const relations = await this.sharedCredentialsRepository.getAllRelationsForCredentials(credentials.map((c) => c.id));
|
|
93
|
+
credentials.forEach((c) => {
|
|
94
|
+
c.shared = relations.filter((r) => r.credentialsId === c.id);
|
|
95
|
+
});
|
|
96
|
+
}
|
|
91
97
|
credentials = credentials.map((c) => this.ownershipService.addOwnedByAndSharedWith(c));
|
|
92
98
|
}
|
|
93
99
|
if (options.includeScopes) {
|
|
@@ -98,7 +104,7 @@ let CredentialsService = class CredentialsService {
|
|
|
98
104
|
});
|
|
99
105
|
return credentials;
|
|
100
106
|
}
|
|
101
|
-
if (typeof ((
|
|
107
|
+
if (typeof ((_k = (_j = options.listQueryOptions) === null || _j === void 0 ? void 0 : _j.filter) === null || _k === void 0 ? void 0 : _k.projectId) === 'string') {
|
|
102
108
|
const project = await this.projectService.getProject(options.listQueryOptions.filter.projectId);
|
|
103
109
|
if ((project === null || project === void 0 ? void 0 : project.type) === 'personal') {
|
|
104
110
|
const currentUsersPersonalProject = await this.projectService.getPersonalProject(user);
|
|
@@ -110,6 +116,12 @@ let CredentialsService = class CredentialsService {
|
|
|
110
116
|
});
|
|
111
117
|
let credentials = await this.credentialsRepository.findMany(options.listQueryOptions, ids);
|
|
112
118
|
if (isDefaultSelect) {
|
|
119
|
+
if ((_o = (_m = (_l = options.listQueryOptions) === null || _l === void 0 ? void 0 : _l.filter) === null || _m === void 0 ? void 0 : _m.shared) === null || _o === void 0 ? void 0 : _o.projectId) {
|
|
120
|
+
const relations = await this.sharedCredentialsRepository.getAllRelationsForCredentials(credentials.map((c) => c.id));
|
|
121
|
+
credentials.forEach((c) => {
|
|
122
|
+
c.shared = relations.filter((r) => r.credentialsId === c.id);
|
|
123
|
+
});
|
|
124
|
+
}
|
|
113
125
|
credentials = credentials.map((c) => this.ownershipService.addOwnedByAndSharedWith(c));
|
|
114
126
|
}
|
|
115
127
|
if (options.includeScopes) {
|