@taico/taico 0.2.17 → 0.2.18
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/agents/agent-template.catalog.js +20 -2
- package/dist/agents/agent-template.catalog.js.map +1 -1
- package/dist/app-init/agent/code-reviewer.agent.js +1 -1
- package/dist/app-init/agent/code-reviewer.agent.js.map +1 -1
- package/dist/app-init/agent/codex-dev.agent.js +2 -2
- package/dist/app-init/agent/codex-dev.agent.js.map +1 -1
- package/dist/authorization-server/dto/account-setup-status-request.dto.d.ts +3 -0
- package/dist/authorization-server/dto/account-setup-status-request.dto.js +24 -0
- package/dist/authorization-server/dto/account-setup-status-request.dto.js.map +1 -0
- package/dist/authorization-server/dto/account-setup-status-response.dto.d.ts +4 -0
- package/dist/authorization-server/dto/account-setup-status-response.dto.js +27 -0
- package/dist/authorization-server/dto/account-setup-status-response.dto.js.map +1 -0
- package/dist/authorization-server/dto/create-managed-user-request.dto.d.ts +5 -0
- package/dist/authorization-server/dto/create-managed-user-request.dto.js +31 -0
- package/dist/authorization-server/dto/create-managed-user-request.dto.js.map +1 -0
- package/dist/authorization-server/dto/managed-user-response.dto.d.ts +13 -0
- package/dist/authorization-server/dto/managed-user-response.dto.js +68 -0
- package/dist/authorization-server/dto/managed-user-response.dto.js.map +1 -0
- package/dist/authorization-server/dto/setup-managed-user-request.dto.d.ts +6 -0
- package/dist/authorization-server/dto/setup-managed-user-request.dto.js +45 -0
- package/dist/authorization-server/dto/setup-managed-user-request.dto.js.map +1 -0
- package/dist/authorization-server/web-auth.controller.d.ts +14 -0
- package/dist/authorization-server/web-auth.controller.js +165 -50
- package/dist/authorization-server/web-auth.controller.js.map +1 -1
- package/dist/authorization-server/web-auth.service.js +3 -2
- package/dist/authorization-server/web-auth.service.js.map +1 -1
- package/dist/executions/queue/task-execution-queue.service.js +1 -1
- package/dist/executions/queue/task-execution-queue.service.js.map +1 -1
- package/dist/executions/staleness/stale-active-task-execution-pruner.service.d.ts +3 -1
- package/dist/executions/staleness/stale-active-task-execution-pruner.service.js +20 -6
- package/dist/executions/staleness/stale-active-task-execution-pruner.service.js.map +1 -1
- package/dist/executions/staleness/stale-active-task-execution-pruner.service.spec.d.ts +1 -0
- package/dist/executions/staleness/stale-active-task-execution-pruner.service.spec.js +80 -0
- package/dist/executions/staleness/stale-active-task-execution-pruner.service.spec.js.map +1 -0
- package/dist/identity-provider/dto/service/identity-provider.service.types.d.ts +10 -0
- package/dist/identity-provider/identity-provider.service.d.ts +14 -1
- package/dist/identity-provider/identity-provider.service.js +119 -0
- package/dist/identity-provider/identity-provider.service.js.map +1 -1
- package/dist/meta/projects.service.js +5 -1
- package/dist/meta/projects.service.js.map +1 -1
- package/dist/tasks/dto/service/tasks.service.types.d.ts +1 -0
- package/dist/tasks/dto/task-list-response.dto.js +2 -2
- package/dist/tasks/dto/task-list-response.dto.js.map +1 -1
- package/dist/tasks/tasks.controller.js +1 -1
- package/dist/tasks/tasks.controller.js.map +1 -1
- package/dist/tasks/tasks.service.create-task-in-thread.spec.js +4 -2
- package/dist/tasks/tasks.service.create-task-in-thread.spec.js.map +1 -1
- package/dist/tasks/tasks.service.d.ts +1 -0
- package/dist/tasks/tasks.service.js +56 -63
- package/dist/tasks/tasks.service.js.map +1 -1
- package/dist/threads/thread-task-assignment-projector.service.d.ts +7 -0
- package/dist/threads/thread-task-assignment-projector.service.js +48 -0
- package/dist/threads/thread-task-assignment-projector.service.js.map +1 -0
- package/dist/threads/thread-task-assignment-projector.service.spec.d.ts +1 -0
- package/dist/threads/thread-task-assignment-projector.service.spec.js +70 -0
- package/dist/threads/thread-task-assignment-projector.service.spec.js.map +1 -0
- package/dist/threads/threads.module.js +2 -0
- package/dist/threads/threads.module.js.map +1 -1
- package/dist/threads/threads.service.d.ts +2 -0
- package/dist/threads/threads.service.js +57 -3
- package/dist/threads/threads.service.js.map +1 -1
- package/dist/threads/threads.service.spec.js +135 -0
- package/dist/threads/threads.service.spec.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +5 -5
|
@@ -30,6 +30,11 @@ const web_auth_service_1 = require("./web-auth.service");
|
|
|
30
30
|
const actor_service_1 = require("../identity-provider/actor.service");
|
|
31
31
|
const enums_1 = require("../identity-provider/enums");
|
|
32
32
|
const identity_provider_errors_1 = require("../identity-provider/errors/identity-provider.errors");
|
|
33
|
+
const create_managed_user_request_dto_1 = require("./dto/create-managed-user-request.dto");
|
|
34
|
+
const managed_user_response_dto_1 = require("./dto/managed-user-response.dto");
|
|
35
|
+
const account_setup_status_request_dto_1 = require("./dto/account-setup-status-request.dto");
|
|
36
|
+
const account_setup_status_response_dto_1 = require("./dto/account-setup-status-response.dto");
|
|
37
|
+
const setup_managed_user_request_dto_1 = require("./dto/setup-managed-user-request.dto");
|
|
33
38
|
let WebAuthController = WebAuthController_1 = class WebAuthController {
|
|
34
39
|
webAuthService;
|
|
35
40
|
tokenVerifierService;
|
|
@@ -45,22 +50,49 @@ let WebAuthController = WebAuthController_1 = class WebAuthController {
|
|
|
45
50
|
async login(loginDto, response) {
|
|
46
51
|
const { accessToken, refreshToken, expiresInSeconds, user, actor } = await this.webAuthService.login(loginDto.email, loginDto.password);
|
|
47
52
|
this.logger.log('Got access token');
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
53
|
+
this.setAuthCookies(response, accessToken, refreshToken, expiresInSeconds);
|
|
54
|
+
return {
|
|
55
|
+
user: {
|
|
56
|
+
id: actor.id,
|
|
57
|
+
email: user.email,
|
|
58
|
+
displayName: actor.displayName,
|
|
59
|
+
role: user.role,
|
|
60
|
+
actorId: user.actorId,
|
|
61
|
+
onboardingDisplayMode: user.onboardingDisplayMode,
|
|
62
|
+
},
|
|
63
|
+
expiresIn: expiresInSeconds,
|
|
55
64
|
};
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
65
|
+
}
|
|
66
|
+
async listUsers(request) {
|
|
67
|
+
await this.requireAdminUser(request);
|
|
68
|
+
const users = await this.identityProviderService.listManagedUsers();
|
|
69
|
+
return users.map((user) => this.toManagedUserResponse(user));
|
|
70
|
+
}
|
|
71
|
+
async createUser(request, createUserDto) {
|
|
72
|
+
await this.requireAdminUser(request);
|
|
73
|
+
const user = await this.identityProviderService.createManagedUser(createUserDto);
|
|
74
|
+
return this.toManagedUserResponse(user);
|
|
75
|
+
}
|
|
76
|
+
async resetUserPassword(request, userId) {
|
|
77
|
+
await this.requireAdminUser(request);
|
|
78
|
+
const user = await this.identityProviderService.resetManagedUserPassword(userId);
|
|
79
|
+
return this.toManagedUserResponse(user);
|
|
80
|
+
}
|
|
81
|
+
async deleteUser(request, userId) {
|
|
82
|
+
const adminUser = await this.requireAdminUser(request);
|
|
83
|
+
if (adminUser.id === userId) {
|
|
84
|
+
throw new common_1.BadRequestException('Admins cannot delete their own account');
|
|
85
|
+
}
|
|
86
|
+
const user = await this.identityProviderService.deactivateManagedUser(userId);
|
|
87
|
+
return this.toManagedUserResponse(user);
|
|
88
|
+
}
|
|
89
|
+
async getAccountSetupStatus(accountSetupDto) {
|
|
90
|
+
return this.identityProviderService.getManagedAccountSetupStatus(accountSetupDto.email);
|
|
91
|
+
}
|
|
92
|
+
async setupAccount(setupUserDto, response) {
|
|
93
|
+
await this.identityProviderService.setupManagedUser(setupUserDto);
|
|
94
|
+
const { accessToken, refreshToken, expiresInSeconds, user, actor } = await this.webAuthService.login(setupUserDto.email, setupUserDto.password);
|
|
95
|
+
this.setAuthCookies(response, accessToken, refreshToken, expiresInSeconds);
|
|
64
96
|
return {
|
|
65
97
|
user: {
|
|
66
98
|
id: actor.id,
|
|
@@ -82,22 +114,7 @@ let WebAuthController = WebAuthController_1 = class WebAuthController {
|
|
|
82
114
|
if (!user) {
|
|
83
115
|
throw new common_1.UnauthorizedException('User not found');
|
|
84
116
|
}
|
|
85
|
-
|
|
86
|
-
const isProduction = config.nodeEnv === 'production';
|
|
87
|
-
const cookieOptions = {
|
|
88
|
-
httpOnly: true,
|
|
89
|
-
secure: isProduction,
|
|
90
|
-
sameSite: 'lax',
|
|
91
|
-
path: '/',
|
|
92
|
-
};
|
|
93
|
-
response.cookie(cookie_keys_constant_1.COOKIE_KEYS.ACCESS_TOKEN, accessToken, {
|
|
94
|
-
...cookieOptions,
|
|
95
|
-
maxAge: expiresIn * 1000,
|
|
96
|
-
});
|
|
97
|
-
response.cookie(cookie_keys_constant_1.COOKIE_KEYS.REFRESH_TOKEN, refreshToken, {
|
|
98
|
-
...cookieOptions,
|
|
99
|
-
maxAge: 24 * 60 * 60 * 1000,
|
|
100
|
-
});
|
|
117
|
+
this.setAuthCookies(response, accessToken, refreshToken, expiresIn);
|
|
101
118
|
return {
|
|
102
119
|
user: {
|
|
103
120
|
id: user.id,
|
|
@@ -133,7 +150,7 @@ let WebAuthController = WebAuthController_1 = class WebAuthController {
|
|
|
133
150
|
if (!actor) {
|
|
134
151
|
throw new common_1.UnauthorizedException('Actor not found');
|
|
135
152
|
}
|
|
136
|
-
if (!actor.user) {
|
|
153
|
+
if (!actor.user || !actor.user.isActive) {
|
|
137
154
|
this.logger.error('Actor returned no user. This should not happen');
|
|
138
155
|
throw new common_1.InternalServerErrorException('Failed to retrieve actor');
|
|
139
156
|
}
|
|
@@ -156,7 +173,7 @@ let WebAuthController = WebAuthController_1 = class WebAuthController {
|
|
|
156
173
|
if (!actor) {
|
|
157
174
|
throw new common_1.UnauthorizedException('Actor not found');
|
|
158
175
|
}
|
|
159
|
-
if (!actor.user) {
|
|
176
|
+
if (!actor.user || !actor.user.isActive) {
|
|
160
177
|
this.logger.error('Actor returned no user. This should not happen');
|
|
161
178
|
throw new common_1.InternalServerErrorException('Failed to retrieve actor');
|
|
162
179
|
}
|
|
@@ -184,22 +201,7 @@ let WebAuthController = WebAuthController_1 = class WebAuthController {
|
|
|
184
201
|
throw new common_1.InternalServerErrorException('Failed to retrieve actor');
|
|
185
202
|
}
|
|
186
203
|
const { accessToken, refreshToken, expiresInSeconds } = await this.webAuthService.login(onboardingDto.email, onboardingDto.password);
|
|
187
|
-
|
|
188
|
-
const isProduction = config.nodeEnv === 'production';
|
|
189
|
-
const cookieOptions = {
|
|
190
|
-
httpOnly: true,
|
|
191
|
-
secure: isProduction,
|
|
192
|
-
sameSite: 'lax',
|
|
193
|
-
path: '/',
|
|
194
|
-
};
|
|
195
|
-
response.cookie(cookie_keys_constant_1.COOKIE_KEYS.ACCESS_TOKEN, accessToken, {
|
|
196
|
-
...cookieOptions,
|
|
197
|
-
maxAge: expiresInSeconds * 1000,
|
|
198
|
-
});
|
|
199
|
-
response.cookie(cookie_keys_constant_1.COOKIE_KEYS.REFRESH_TOKEN, refreshToken, {
|
|
200
|
-
...cookieOptions,
|
|
201
|
-
maxAge: 24 * 60 * 60 * 1000,
|
|
202
|
-
});
|
|
204
|
+
this.setAuthCookies(response, accessToken, refreshToken, expiresInSeconds);
|
|
203
205
|
this.logger.log(`First admin user created: ${onboardingDto.email}`);
|
|
204
206
|
return {
|
|
205
207
|
user: {
|
|
@@ -223,7 +225,7 @@ let WebAuthController = WebAuthController_1 = class WebAuthController {
|
|
|
223
225
|
if (!actor) {
|
|
224
226
|
throw new common_1.UnauthorizedException('Actor not found');
|
|
225
227
|
}
|
|
226
|
-
if (!actor.user) {
|
|
228
|
+
if (!actor.user || !actor.user.isActive) {
|
|
227
229
|
this.logger.error('Actor returned no user. This should not happen');
|
|
228
230
|
throw new common_1.InternalServerErrorException('Failed to retrieve actor');
|
|
229
231
|
}
|
|
@@ -231,6 +233,53 @@ let WebAuthController = WebAuthController_1 = class WebAuthController {
|
|
|
231
233
|
this.logger.log(`Walkthrough marked as seen for user: ${actor.user.email}`);
|
|
232
234
|
return { ok: true };
|
|
233
235
|
}
|
|
236
|
+
async requireAdminUser(request) {
|
|
237
|
+
const accessToken = request.cookies?.[cookie_keys_constant_1.COOKIE_KEYS.ACCESS_TOKEN];
|
|
238
|
+
if (!accessToken) {
|
|
239
|
+
throw new common_1.UnauthorizedException('Not authenticated');
|
|
240
|
+
}
|
|
241
|
+
const payload = await this.tokenVerifierService.verifyAndDecode(accessToken);
|
|
242
|
+
const actor = await this.actorService.getActorById(payload.actor_id, true);
|
|
243
|
+
if (!actor?.user || !actor.user.isActive) {
|
|
244
|
+
throw new common_1.UnauthorizedException('User not found');
|
|
245
|
+
}
|
|
246
|
+
if (actor.user.role !== enums_1.UserRole.ADMIN) {
|
|
247
|
+
throw new common_1.ForbiddenException('Admin access required');
|
|
248
|
+
}
|
|
249
|
+
return actor.user;
|
|
250
|
+
}
|
|
251
|
+
setAuthCookies(response, accessToken, refreshToken, expiresInSeconds) {
|
|
252
|
+
const config = (0, env_config_1.getConfig)();
|
|
253
|
+
const isProduction = config.nodeEnv === 'production';
|
|
254
|
+
const cookieOptions = {
|
|
255
|
+
httpOnly: true,
|
|
256
|
+
secure: isProduction,
|
|
257
|
+
sameSite: 'lax',
|
|
258
|
+
path: '/',
|
|
259
|
+
};
|
|
260
|
+
response.cookie(cookie_keys_constant_1.COOKIE_KEYS.ACCESS_TOKEN, accessToken, {
|
|
261
|
+
...cookieOptions,
|
|
262
|
+
maxAge: expiresInSeconds * 1000,
|
|
263
|
+
});
|
|
264
|
+
response.cookie(cookie_keys_constant_1.COOKIE_KEYS.REFRESH_TOKEN, refreshToken, {
|
|
265
|
+
...cookieOptions,
|
|
266
|
+
maxAge: 24 * 60 * 60 * 1000,
|
|
267
|
+
});
|
|
268
|
+
}
|
|
269
|
+
toManagedUserResponse(user) {
|
|
270
|
+
return {
|
|
271
|
+
id: user.id,
|
|
272
|
+
email: user.email,
|
|
273
|
+
displayName: user.actor?.displayName ?? user.email,
|
|
274
|
+
slug: user.actor?.slug ?? user.email,
|
|
275
|
+
actorId: user.actorId,
|
|
276
|
+
role: user.role,
|
|
277
|
+
isActive: user.isActive,
|
|
278
|
+
passwordSetupPending: this.identityProviderService.isPasswordSetupPending(user),
|
|
279
|
+
createdAt: user.createdAt,
|
|
280
|
+
updatedAt: user.updatedAt,
|
|
281
|
+
};
|
|
282
|
+
}
|
|
234
283
|
};
|
|
235
284
|
exports.WebAuthController = WebAuthController;
|
|
236
285
|
__decorate([
|
|
@@ -253,6 +302,72 @@ __decorate([
|
|
|
253
302
|
__metadata("design:paramtypes", [login_request_dto_1.LoginRequestDto, Object]),
|
|
254
303
|
__metadata("design:returntype", Promise)
|
|
255
304
|
], WebAuthController.prototype, "login", null);
|
|
305
|
+
__decorate([
|
|
306
|
+
(0, common_1.Get)('users'),
|
|
307
|
+
(0, swagger_1.ApiOperation)({ summary: 'List human users for admin user management' }),
|
|
308
|
+
(0, swagger_1.ApiResponse)({ status: 200, type: [managed_user_response_dto_1.ManagedUserResponseDto] }),
|
|
309
|
+
__param(0, (0, common_1.Req)()),
|
|
310
|
+
__metadata("design:type", Function),
|
|
311
|
+
__metadata("design:paramtypes", [Object]),
|
|
312
|
+
__metadata("design:returntype", Promise)
|
|
313
|
+
], WebAuthController.prototype, "listUsers", null);
|
|
314
|
+
__decorate([
|
|
315
|
+
(0, common_1.Post)('users'),
|
|
316
|
+
(0, common_1.HttpCode)(common_1.HttpStatus.CREATED),
|
|
317
|
+
(0, swagger_1.ApiOperation)({ summary: 'Create an invited human user' }),
|
|
318
|
+
(0, swagger_1.ApiBody)({ type: create_managed_user_request_dto_1.CreateManagedUserRequestDto }),
|
|
319
|
+
(0, swagger_1.ApiResponse)({ status: 201, type: managed_user_response_dto_1.ManagedUserResponseDto }),
|
|
320
|
+
__param(0, (0, common_1.Req)()),
|
|
321
|
+
__param(1, (0, common_1.Body)()),
|
|
322
|
+
__metadata("design:type", Function),
|
|
323
|
+
__metadata("design:paramtypes", [Object, create_managed_user_request_dto_1.CreateManagedUserRequestDto]),
|
|
324
|
+
__metadata("design:returntype", Promise)
|
|
325
|
+
], WebAuthController.prototype, "createUser", null);
|
|
326
|
+
__decorate([
|
|
327
|
+
(0, common_1.Post)('users/:userId/reset-password'),
|
|
328
|
+
(0, common_1.HttpCode)(common_1.HttpStatus.OK),
|
|
329
|
+
(0, swagger_1.ApiOperation)({ summary: 'Reset a managed user password so they can set a new one' }),
|
|
330
|
+
(0, swagger_1.ApiResponse)({ status: 200, type: managed_user_response_dto_1.ManagedUserResponseDto }),
|
|
331
|
+
__param(0, (0, common_1.Req)()),
|
|
332
|
+
__param(1, (0, common_1.Param)('userId')),
|
|
333
|
+
__metadata("design:type", Function),
|
|
334
|
+
__metadata("design:paramtypes", [Object, String]),
|
|
335
|
+
__metadata("design:returntype", Promise)
|
|
336
|
+
], WebAuthController.prototype, "resetUserPassword", null);
|
|
337
|
+
__decorate([
|
|
338
|
+
(0, common_1.Delete)('users/:userId'),
|
|
339
|
+
(0, common_1.HttpCode)(common_1.HttpStatus.OK),
|
|
340
|
+
(0, swagger_1.ApiOperation)({ summary: 'Deactivate a managed user' }),
|
|
341
|
+
(0, swagger_1.ApiResponse)({ status: 200, type: managed_user_response_dto_1.ManagedUserResponseDto }),
|
|
342
|
+
__param(0, (0, common_1.Req)()),
|
|
343
|
+
__param(1, (0, common_1.Param)('userId')),
|
|
344
|
+
__metadata("design:type", Function),
|
|
345
|
+
__metadata("design:paramtypes", [Object, String]),
|
|
346
|
+
__metadata("design:returntype", Promise)
|
|
347
|
+
], WebAuthController.prototype, "deleteUser", null);
|
|
348
|
+
__decorate([
|
|
349
|
+
(0, common_1.Post)('account-setup-status'),
|
|
350
|
+
(0, common_1.HttpCode)(common_1.HttpStatus.OK),
|
|
351
|
+
(0, swagger_1.ApiOperation)({ summary: 'Check whether an invited or reset account can be set up' }),
|
|
352
|
+
(0, swagger_1.ApiBody)({ type: account_setup_status_request_dto_1.AccountSetupStatusRequestDto }),
|
|
353
|
+
(0, swagger_1.ApiResponse)({ status: 200, type: account_setup_status_response_dto_1.AccountSetupStatusResponseDto }),
|
|
354
|
+
__param(0, (0, common_1.Body)()),
|
|
355
|
+
__metadata("design:type", Function),
|
|
356
|
+
__metadata("design:paramtypes", [account_setup_status_request_dto_1.AccountSetupStatusRequestDto]),
|
|
357
|
+
__metadata("design:returntype", Promise)
|
|
358
|
+
], WebAuthController.prototype, "getAccountSetupStatus", null);
|
|
359
|
+
__decorate([
|
|
360
|
+
(0, common_1.Post)('setup-account'),
|
|
361
|
+
(0, common_1.HttpCode)(common_1.HttpStatus.OK),
|
|
362
|
+
(0, swagger_1.ApiOperation)({ summary: 'Set up an invited or reset account and log in' }),
|
|
363
|
+
(0, swagger_1.ApiBody)({ type: setup_managed_user_request_dto_1.SetupManagedUserRequestDto }),
|
|
364
|
+
(0, swagger_1.ApiResponse)({ status: 200, type: login_response_dto_1.LoginResponseDto }),
|
|
365
|
+
__param(0, (0, common_1.Body)()),
|
|
366
|
+
__param(1, (0, common_1.Res)({ passthrough: true })),
|
|
367
|
+
__metadata("design:type", Function),
|
|
368
|
+
__metadata("design:paramtypes", [setup_managed_user_request_dto_1.SetupManagedUserRequestDto, Object]),
|
|
369
|
+
__metadata("design:returntype", Promise)
|
|
370
|
+
], WebAuthController.prototype, "setupAccount", null);
|
|
256
371
|
__decorate([
|
|
257
372
|
(0, common_1.Post)('refresh'),
|
|
258
373
|
(0, common_1.HttpCode)(common_1.HttpStatus.OK),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-auth.controller.js","sourceRoot":"","sources":["../../src/authorization-server/web-auth.controller.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"web-auth.controller.js","sourceRoot":"","sources":["../../src/authorization-server/web-auth.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,8 +61,6 @@ let WebAuthService = WebAuthService_1 = class WebAuthService {
|
|
|
61
61
|
const privateKey = await (0, jose_1.importPKCS8)(signingKey.privateKeyPem, signingKey.algorithm);
|
|
62
62
|
const now = Math.floor(Date.now() / 1000);
|
|
63
63
|
const config = (0, env_config_1.getConfig)();
|
|
64
|
-
console.log("USER ROLE");
|
|
65
|
-
console.log(user.role);
|
|
66
64
|
const scopes = [
|
|
67
65
|
...all_web_scopes_1.ALL_WEB_SCOPES,
|
|
68
66
|
...mcp_registry_scopes_1.ALL_MCP_REGISTRY_SCOPES,
|
|
@@ -143,6 +141,9 @@ let WebAuthService = WebAuthService_1 = class WebAuthService {
|
|
|
143
141
|
this.logger.error('User not found for refresh token. This should not happen');
|
|
144
142
|
throw new web_auth_errors_1.RefreshTokenUserMissingError(storedToken.id);
|
|
145
143
|
}
|
|
144
|
+
if (!user.isActive || this.identityProviderService.isPasswordSetupPending(user)) {
|
|
145
|
+
throw new common_1.UnauthorizedException('Invalid refresh token');
|
|
146
|
+
}
|
|
146
147
|
const actor = storedToken.user.actor;
|
|
147
148
|
if (!actor) {
|
|
148
149
|
this.logger.error('Actor not found for refresh token. This should not happen');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-auth.service.js","sourceRoot":"","sources":["../../src/authorization-server/web-auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA2E;AAC3E,mCAAiD;AACjD,+BAA4C;AAC5C,0EAAqE;AACrE,6CAAmD;AACnD,qCAAqC;AACrC,8FAAyF;AACzF,qDAAiD;AACjD,8DAA0D;AAG1D,iEAA8D;AAG9D,sEAAmE;AACnE,uEAAqE;AACrE,6EAA+E;AAC/E,8DAGkC;AAG3B,IAAM,cAAc,sBAApB,MAAM,cAAc;IAIN;IACA;IACA;IAEA;IAPX,MAAM,GAAG,IAAI,eAAM,CAAC,gBAAc,CAAC,IAAI,CAAC,CAAC;IAEjD,YACmB,uBAAgD,EAChD,YAA0B,EAC1B,WAAwB,EAExB,sBAAsD;QAJtD,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,iBAAY,GAAZ,YAAY,CAAc;QAC1B,gBAAW,GAAX,WAAW,CAAa;QAExB,2BAAsB,GAAtB,sBAAsB,CAAgC;IACtE,CAAC;IAMJ,KAAK,CAAC,KAAK,CACT,KAAa,EACb,QAAgB;QAQhB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,KAAK,EAAE,CAAC,CAAC;QAGvD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,YAAY,CACrE,KAAK,EACL,QAAQ,CACT,CAAC;QAGF,MAAM,MAAM,GAAG,IAAA,sBAAS,GAAE,CAAC;QAC3B,MAAM,eAAe,GAAG,MAAM,CAAC,6BAA6B,CAAC;QAC7D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,sBAAsB,CACnD,eAAe,EACf,KAAK,EACL,IAAI,CACL,CAAC;QAGF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEtE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gCAAgC,KAAK,EAAE,CAAC,CAAC;QAEzD,OAAO;YACL,IAAI;YACJ,KAAK;YACL,WAAW;YACX,YAAY;YACZ,gBAAgB,EAAE,eAAe,GAAG,EAAE;SACvC,CAAC;IACJ,CAAC;IAKO,KAAK,CAAC,sBAAsB,CAClC,eAAuB,EACvB,KAAkB,EAClB,IAAU;QAGV,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAGhE,MAAM,UAAU,GAAG,MAAM,IAAA,kBAAW,EAClC,UAAU,CAAC,aAAa,EACxB,UAAU,CAAC,SAAS,CACrB,CAAC;QAGF,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,IAAA,sBAAS,GAAE,CAAC;QAG3B,
|
|
1
|
+
{"version":3,"file":"web-auth.service.js","sourceRoot":"","sources":["../../src/authorization-server/web-auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ let TaskExecutionQueueService = class TaskExecutionQueueService {
|
|
|
28
28
|
const skip = (page - 1) * limit;
|
|
29
29
|
const [items, total] = await this.taskExecutionQueueRepository.findAndCount({
|
|
30
30
|
relations: ['task'],
|
|
31
|
-
order: {
|
|
31
|
+
order: { createdAt: 'ASC' },
|
|
32
32
|
skip,
|
|
33
33
|
take: limit,
|
|
34
34
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-execution-queue.service.js","sourceRoot":"","sources":["../../../src/executions/queue/task-execution-queue.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAAqC;AACrC,+EAAyE;AAOlE,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAGjB;IAFnB,YAEmB,4BAAkE;QAAlE,iCAA4B,GAA5B,4BAA4B,CAAsC;IAClF,CAAC;IAEJ,KAAK,CAAC,SAAS,CAAC,OAGf;QACC,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,CAAC,CAAC;QAChC,MAAM,KAAK,GAAG,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC;QACnC,MAAM,IAAI,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;QAEhC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,YAAY,CAAC;YAC1E,SAAS,EAAE,CAAC,MAAM,CAAC;YACnB,KAAK,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"task-execution-queue.service.js","sourceRoot":"","sources":["../../../src/executions/queue/task-execution-queue.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAAqC;AACrC,+EAAyE;AAOlE,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAGjB;IAFnB,YAEmB,4BAAkE;QAAlE,iCAA4B,GAA5B,4BAA4B,CAAsC;IAClF,CAAC;IAEJ,KAAK,CAAC,SAAS,CAAC,OAGf;QACC,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,CAAC,CAAC;QAChC,MAAM,KAAK,GAAG,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC;QACnC,MAAM,IAAI,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;QAEhC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,YAAY,CAAC;YAC1E,SAAS,EAAE,CAAC,MAAM,CAAC;YACnB,KAAK,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE;YAC3B,IAAI;YACJ,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC;QAEH,OAAO;YACL,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;YAC5D,KAAK;YACL,IAAI;YACJ,KAAK;SACN,CAAC;IACJ,CAAC;IAEO,qBAAqB,CAC3B,KAA+B;QAE/B,OAAO;YACL,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,IAAI,IAAI;YAClC,UAAU,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,IAAI,IAAI;SACvC,CAAC;IACJ,CAAC;CACF,CAAA;AAtCY,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,sDAAwB,CAAC,CAAA;qCACI,oBAAU;GAHhD,yBAAyB,CAsCrC"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import { EventEmitter2 } from '@nestjs/event-emitter';
|
|
1
2
|
import { DataSource } from 'typeorm';
|
|
2
3
|
import { ActiveTaskExecutionEntity } from '../active/active-task-execution.entity';
|
|
3
4
|
export declare class StaleActiveTaskExecutionPrunerService {
|
|
4
5
|
private readonly dataSource;
|
|
5
|
-
|
|
6
|
+
private readonly eventEmitter;
|
|
7
|
+
constructor(dataSource: DataSource, eventEmitter: EventEmitter2);
|
|
6
8
|
pruneExecutions(executions: ActiveTaskExecutionEntity[]): Promise<number>;
|
|
7
9
|
pruneExecutionById(executionId: string): Promise<boolean>;
|
|
8
10
|
private resolveSnapshotTags;
|
|
@@ -11,16 +11,21 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.StaleActiveTaskExecutionPrunerService = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
|
+
const event_emitter_1 = require("@nestjs/event-emitter");
|
|
14
15
|
const typeorm_1 = require("typeorm");
|
|
15
16
|
const active_task_execution_entity_1 = require("../active/active-task-execution.entity");
|
|
16
17
|
const tag_entity_1 = require("../../meta/tag.entity");
|
|
17
18
|
const task_entity_1 = require("../../tasks/task.entity");
|
|
18
19
|
const task_execution_history_entity_1 = require("../history/task-execution-history.entity");
|
|
19
20
|
const task_execution_history_status_enum_1 = require("../history/task-execution-history-status.enum");
|
|
21
|
+
const execution_interrupt_event_1 = require("../events/execution-interrupt.event");
|
|
22
|
+
const STALE_EXECUTION_INTERRUPT_ACTOR_ID = 'system';
|
|
20
23
|
let StaleActiveTaskExecutionPrunerService = class StaleActiveTaskExecutionPrunerService {
|
|
21
24
|
dataSource;
|
|
22
|
-
|
|
25
|
+
eventEmitter;
|
|
26
|
+
constructor(dataSource, eventEmitter) {
|
|
23
27
|
this.dataSource = dataSource;
|
|
28
|
+
this.eventEmitter = eventEmitter;
|
|
24
29
|
}
|
|
25
30
|
async pruneExecutions(executions) {
|
|
26
31
|
let prunedCount = 0;
|
|
@@ -33,12 +38,12 @@ let StaleActiveTaskExecutionPrunerService = class StaleActiveTaskExecutionPruner
|
|
|
33
38
|
return prunedCount;
|
|
34
39
|
}
|
|
35
40
|
async pruneExecutionById(executionId) {
|
|
36
|
-
|
|
41
|
+
const prunedExecution = await this.dataSource.transaction(async (manager) => {
|
|
37
42
|
const activeExecution = await manager.findOne(active_task_execution_entity_1.ActiveTaskExecutionEntity, {
|
|
38
43
|
where: { id: executionId },
|
|
39
44
|
});
|
|
40
45
|
if (!activeExecution) {
|
|
41
|
-
return
|
|
46
|
+
return null;
|
|
42
47
|
}
|
|
43
48
|
const task = await manager.findOne(task_entity_1.TaskEntity, {
|
|
44
49
|
where: { id: activeExecution.taskId },
|
|
@@ -46,7 +51,7 @@ let StaleActiveTaskExecutionPrunerService = class StaleActiveTaskExecutionPruner
|
|
|
46
51
|
});
|
|
47
52
|
if (!task) {
|
|
48
53
|
await manager.delete(active_task_execution_entity_1.ActiveTaskExecutionEntity, { id: activeExecution.id });
|
|
49
|
-
return
|
|
54
|
+
return activeExecution;
|
|
50
55
|
}
|
|
51
56
|
task.status = activeExecution.taskStatusBeforeClaim;
|
|
52
57
|
task.assigneeActorId = activeExecution.taskAssigneeActorIdBeforeClaim;
|
|
@@ -62,8 +67,16 @@ let StaleActiveTaskExecutionPrunerService = class StaleActiveTaskExecutionPruner
|
|
|
62
67
|
status: task_execution_history_status_enum_1.TaskExecutionHistoryStatus.STALE,
|
|
63
68
|
errorCode: null,
|
|
64
69
|
}));
|
|
65
|
-
return
|
|
70
|
+
return activeExecution;
|
|
66
71
|
});
|
|
72
|
+
if (!prunedExecution) {
|
|
73
|
+
return false;
|
|
74
|
+
}
|
|
75
|
+
this.eventEmitter.emit(execution_interrupt_event_1.ExecutionInterruptEvent.INTERNAL, new execution_interrupt_event_1.ExecutionInterruptEvent({ id: STALE_EXECUTION_INTERRUPT_ACTOR_ID }, {
|
|
76
|
+
executionId: prunedExecution.id,
|
|
77
|
+
workerClientId: prunedExecution.workerClientId,
|
|
78
|
+
}));
|
|
79
|
+
return true;
|
|
67
80
|
}
|
|
68
81
|
async resolveSnapshotTags(manager, snapshotTags) {
|
|
69
82
|
if (snapshotTags.length === 0) {
|
|
@@ -111,6 +124,7 @@ let StaleActiveTaskExecutionPrunerService = class StaleActiveTaskExecutionPruner
|
|
|
111
124
|
exports.StaleActiveTaskExecutionPrunerService = StaleActiveTaskExecutionPrunerService;
|
|
112
125
|
exports.StaleActiveTaskExecutionPrunerService = StaleActiveTaskExecutionPrunerService = __decorate([
|
|
113
126
|
(0, common_1.Injectable)(),
|
|
114
|
-
__metadata("design:paramtypes", [typeorm_1.DataSource
|
|
127
|
+
__metadata("design:paramtypes", [typeorm_1.DataSource,
|
|
128
|
+
event_emitter_1.EventEmitter2])
|
|
115
129
|
], StaleActiveTaskExecutionPrunerService);
|
|
116
130
|
//# sourceMappingURL=stale-active-task-execution-pruner.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stale-active-task-execution-pruner.service.js","sourceRoot":"","sources":["../../../src/executions/staleness/stale-active-task-execution-pruner.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAwD;AACxD,yFAGgD;AAChD,sDAAkD;AAClD,yDAAqD;AACrD,4FAAsF;AACtF,sGAA2F;
|
|
1
|
+
{"version":3,"file":"stale-active-task-execution-pruner.service.js","sourceRoot":"","sources":["../../../src/executions/staleness/stale-active-task-execution-pruner.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const active_task_execution_entity_1 = require("../active/active-task-execution.entity");
|
|
4
|
+
const execution_interrupt_event_1 = require("../events/execution-interrupt.event");
|
|
5
|
+
const task_execution_history_status_enum_1 = require("../history/task-execution-history-status.enum");
|
|
6
|
+
const enums_1 = require("../../tasks/enums");
|
|
7
|
+
const stale_active_task_execution_pruner_service_1 = require("./stale-active-task-execution-pruner.service");
|
|
8
|
+
describe('StaleActiveTaskExecutionPrunerService', () => {
|
|
9
|
+
let dataSource;
|
|
10
|
+
let eventEmitter;
|
|
11
|
+
let emit;
|
|
12
|
+
let service;
|
|
13
|
+
beforeEach(() => {
|
|
14
|
+
dataSource = {
|
|
15
|
+
transaction: jest.fn(),
|
|
16
|
+
};
|
|
17
|
+
emit = jest.fn();
|
|
18
|
+
eventEmitter = {
|
|
19
|
+
emit,
|
|
20
|
+
};
|
|
21
|
+
service = new stale_active_task_execution_pruner_service_1.StaleActiveTaskExecutionPrunerService(dataSource, eventEmitter);
|
|
22
|
+
});
|
|
23
|
+
it('emits an interrupt request after pruning a stale execution', async () => {
|
|
24
|
+
const execution = {
|
|
25
|
+
id: 'execution-1',
|
|
26
|
+
taskId: 'task-1',
|
|
27
|
+
claimedAt: new Date('2026-04-30T10:00:00.000Z'),
|
|
28
|
+
taskStatusBeforeClaim: enums_1.TaskStatus.IN_PROGRESS,
|
|
29
|
+
taskTagsBeforeClaim: [],
|
|
30
|
+
taskAssigneeActorIdBeforeClaim: 'actor-1',
|
|
31
|
+
agentActorId: 'agent-1',
|
|
32
|
+
workerClientId: 'worker-1',
|
|
33
|
+
lastHeartbeatAt: null,
|
|
34
|
+
runnerSessionId: null,
|
|
35
|
+
toolCallCount: 0,
|
|
36
|
+
stats: null,
|
|
37
|
+
rowVersion: 1,
|
|
38
|
+
createdAt: new Date('2026-04-30T10:00:00.000Z'),
|
|
39
|
+
updatedAt: new Date('2026-04-30T10:00:00.000Z'),
|
|
40
|
+
deletedAt: null,
|
|
41
|
+
};
|
|
42
|
+
const task = {
|
|
43
|
+
id: 'task-1',
|
|
44
|
+
tags: [],
|
|
45
|
+
};
|
|
46
|
+
const manager = {
|
|
47
|
+
findOne: jest.fn()
|
|
48
|
+
.mockResolvedValueOnce(execution)
|
|
49
|
+
.mockResolvedValueOnce(task),
|
|
50
|
+
save: jest.fn(),
|
|
51
|
+
delete: jest.fn(),
|
|
52
|
+
create: jest.fn((_, value) => value),
|
|
53
|
+
};
|
|
54
|
+
dataSource.transaction.mockImplementation(async (callback) => callback(manager));
|
|
55
|
+
await expect(service.pruneExecutionById(execution.id)).resolves.toBe(true);
|
|
56
|
+
expect(manager.delete).toHaveBeenCalledWith(active_task_execution_entity_1.ActiveTaskExecutionEntity, {
|
|
57
|
+
id: execution.id,
|
|
58
|
+
});
|
|
59
|
+
expect(manager.save).toHaveBeenCalledWith(expect.any(Function), expect.objectContaining({
|
|
60
|
+
taskId: execution.taskId,
|
|
61
|
+
status: task_execution_history_status_enum_1.TaskExecutionHistoryStatus.STALE,
|
|
62
|
+
}));
|
|
63
|
+
expect(emit).toHaveBeenCalledWith(execution_interrupt_event_1.ExecutionInterruptEvent.INTERNAL, expect.objectContaining({
|
|
64
|
+
actor: { id: 'system' },
|
|
65
|
+
payload: {
|
|
66
|
+
executionId: execution.id,
|
|
67
|
+
workerClientId: execution.workerClientId,
|
|
68
|
+
},
|
|
69
|
+
}));
|
|
70
|
+
});
|
|
71
|
+
it('does not emit an interrupt request when no execution is pruned', async () => {
|
|
72
|
+
const manager = {
|
|
73
|
+
findOne: jest.fn().mockResolvedValue(null),
|
|
74
|
+
};
|
|
75
|
+
dataSource.transaction.mockImplementation(async (callback) => callback(manager));
|
|
76
|
+
await expect(service.pruneExecutionById('missing-execution')).resolves.toBe(false);
|
|
77
|
+
expect(emit).not.toHaveBeenCalled();
|
|
78
|
+
});
|
|
79
|
+
});
|
|
80
|
+
//# sourceMappingURL=stale-active-task-execution-pruner.service.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stale-active-task-execution-pruner.service.spec.js","sourceRoot":"","sources":["../../../src/executions/staleness/stale-active-task-execution-pruner.service.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,16 @@ export type CreateUserInput = {
|
|
|
6
6
|
password: string;
|
|
7
7
|
introduction?: string;
|
|
8
8
|
};
|
|
9
|
+
export type CreateManagedUserInput = {
|
|
10
|
+
email: string;
|
|
11
|
+
role: UserRole;
|
|
12
|
+
};
|
|
13
|
+
export type SetupManagedUserInput = {
|
|
14
|
+
email: string;
|
|
15
|
+
displayName: string;
|
|
16
|
+
slug: string;
|
|
17
|
+
password: string;
|
|
18
|
+
};
|
|
9
19
|
export type UpdateUserRoleInput = {
|
|
10
20
|
role: UserRole;
|
|
11
21
|
};
|