@glwhappen/web-code 1.32.0 → 1.32.2
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/assets/index-C8RwnUp1.css +32 -0
- package/dist/assets/{index-u6XmIqLb.js → index-SzVXQJtA.js} +264 -264
- package/dist/index.html +2 -2
- package/dist-server/server/cursor-cli.js +33 -15
- package/dist-server/server/cursor-cli.js.map +1 -1
- package/dist-server/server/gemini-cli.js +48 -29
- package/dist-server/server/gemini-cli.js.map +1 -1
- package/dist-server/server/index.js +20 -17
- package/dist-server/server/index.js.map +1 -1
- package/dist-server/server/modules/database/index.js +1 -0
- package/dist-server/server/modules/database/index.js.map +1 -1
- package/dist-server/server/modules/database/migrations.js +3 -1
- package/dist-server/server/modules/database/migrations.js.map +1 -1
- package/dist-server/server/modules/database/repositories/push-subscriptions.js +11 -5
- package/dist-server/server/modules/database/repositories/push-subscriptions.js.map +1 -1
- package/dist-server/server/modules/database/repositories/queued-messages.db.integration.test.js +73 -0
- package/dist-server/server/modules/database/repositories/queued-messages.db.integration.test.js.map +1 -0
- package/dist-server/server/modules/database/repositories/queued-messages.db.js +80 -0
- package/dist-server/server/modules/database/repositories/queued-messages.db.js.map +1 -0
- package/dist-server/server/modules/database/schema.js +18 -0
- package/dist-server/server/modules/database/schema.js.map +1 -1
- package/dist-server/server/modules/projects/index.js +1 -0
- package/dist-server/server/modules/projects/index.js.map +1 -1
- package/dist-server/server/modules/projects/projects.routes.js +14 -0
- package/dist-server/server/modules/projects/projects.routes.js.map +1 -1
- package/dist-server/server/modules/projects/services/project-authorization.service.js +54 -0
- package/dist-server/server/modules/projects/services/project-authorization.service.js.map +1 -0
- package/dist-server/server/modules/projects/services/project-clone.service.js +13 -4
- package/dist-server/server/modules/projects/services/project-clone.service.js.map +1 -1
- package/dist-server/server/modules/projects/services/project-management.service.js +4 -2
- package/dist-server/server/modules/projects/services/project-management.service.js.map +1 -1
- package/dist-server/server/modules/projects/tests/project-authorization.service.test.js +51 -0
- package/dist-server/server/modules/projects/tests/project-authorization.service.test.js.map +1 -0
- package/dist-server/server/modules/projects/tests/project-clone.service.test.js +10 -1
- package/dist-server/server/modules/projects/tests/project-clone.service.test.js.map +1 -1
- package/dist-server/server/modules/projects/tests/project-management.service.test.js +31 -10
- package/dist-server/server/modules/projects/tests/project-management.service.test.js.map +1 -1
- package/dist-server/server/modules/providers/provider.routes.js +87 -0
- package/dist-server/server/modules/providers/provider.routes.js.map +1 -1
- package/dist-server/server/modules/websocket/services/chat-websocket.service.js +77 -13
- package/dist-server/server/modules/websocket/services/chat-websocket.service.js.map +1 -1
- package/dist-server/server/routes/agent.js +35 -7
- package/dist-server/server/routes/agent.js.map +1 -1
- package/dist-server/server/routes/settings.js +1 -1
- package/dist-server/server/routes/settings.js.map +1 -1
- package/dist-server/server/services/notification-orchestrator.js +1 -1
- package/dist-server/server/services/notification-orchestrator.js.map +1 -1
- package/dist-server/server/shared/utils.js +60 -9
- package/dist-server/server/shared/utils.js.map +1 -1
- package/package.json +1 -1
- package/server/cursor-cli.js +33 -15
- package/server/gemini-cli.js +48 -28
- package/server/index.js +21 -17
- package/server/modules/database/index.ts +1 -0
- package/server/modules/database/migrations.ts +3 -0
- package/server/modules/database/repositories/push-subscriptions.ts +14 -5
- package/server/modules/database/repositories/queued-messages.db.integration.test.ts +84 -0
- package/server/modules/database/repositories/queued-messages.db.ts +154 -0
- package/server/modules/database/schema.ts +19 -0
- package/server/modules/projects/index.ts +3 -0
- package/server/modules/projects/projects.routes.ts +16 -0
- package/server/modules/projects/services/project-authorization.service.ts +70 -0
- package/server/modules/projects/services/project-clone.service.ts +18 -4
- package/server/modules/projects/services/project-management.service.ts +12 -3
- package/server/modules/projects/tests/project-authorization.service.test.ts +68 -0
- package/server/modules/projects/tests/project-clone.service.test.ts +11 -1
- package/server/modules/projects/tests/project-management.service.test.ts +38 -10
- package/server/modules/providers/provider.routes.ts +109 -0
- package/server/modules/websocket/services/chat-websocket.service.ts +87 -19
- package/server/routes/agent.js +34 -7
- package/server/routes/settings.js +1 -1
- package/server/services/notification-orchestrator.js +1 -1
- package/server/shared/utils.ts +70 -9
- package/dist/assets/index-Ct6oPUQk.css +0 -32
|
@@ -25,6 +25,17 @@ function getAuthenticatedUserId(req) {
|
|
|
25
25
|
}
|
|
26
26
|
return numericId;
|
|
27
27
|
}
|
|
28
|
+
function getAuthenticatedUsername(req) {
|
|
29
|
+
const authenticatedUser = req.user;
|
|
30
|
+
const username = authenticatedUser?.username;
|
|
31
|
+
if (typeof username !== 'string' || username.length === 0) {
|
|
32
|
+
throw new AppError('Authenticated user is required', {
|
|
33
|
+
code: 'AUTHENTICATION_REQUIRED',
|
|
34
|
+
statusCode: 401,
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
return username;
|
|
38
|
+
}
|
|
28
39
|
function readQueryStringValue(value) {
|
|
29
40
|
if (typeof value === 'string') {
|
|
30
41
|
return value;
|
|
@@ -102,6 +113,7 @@ router.post('/create-project', asyncHandler(async (req, res) => {
|
|
|
102
113
|
}
|
|
103
114
|
const projectCreationResult = await createProject({
|
|
104
115
|
userId: getAuthenticatedUserId(req),
|
|
116
|
+
username: getAuthenticatedUsername(req),
|
|
105
117
|
projectPath,
|
|
106
118
|
customName,
|
|
107
119
|
});
|
|
@@ -154,12 +166,14 @@ router.get('/clone-progress', async (req, res) => {
|
|
|
154
166
|
statusCode: 401,
|
|
155
167
|
});
|
|
156
168
|
}
|
|
169
|
+
const username = getAuthenticatedUsername(req);
|
|
157
170
|
cloneOperation = await startCloneProject({
|
|
158
171
|
workspacePath,
|
|
159
172
|
githubUrl,
|
|
160
173
|
githubTokenId,
|
|
161
174
|
newGithubToken,
|
|
162
175
|
userId,
|
|
176
|
+
username,
|
|
163
177
|
}, {
|
|
164
178
|
onProgress: (message) => {
|
|
165
179
|
sendEvent('progress', { message });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projects.routes.js","sourceRoot":"","sources":["../../../../server/modules/projects/projects.routes.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,aAAa,EAAE,wBAAwB,EAAE,MAAM,2DAA2D,CAAC;AACpH,OAAO,EAAE,iBAAiB,EAAE,MAAM,sDAAsD,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,gEAAgE,CAAC;AACtG,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AACrF,OAAO,EAAE,+BAA+B,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,qEAAqE,CAAC;AACvK,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,uDAAuD,CAAC;AACvH,OAAO,EAAE,4BAA4B,EAAE,iBAAiB,EAAE,MAAM,qDAAqD,CAAC;AAEtH,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"projects.routes.js","sourceRoot":"","sources":["../../../../server/modules/projects/projects.routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import { projectsDb } from '../../../modules/database/index.js';
|
|
2
|
+
import { AppError, normalizeProjectPath } from '../../../shared/utils.js';
|
|
3
|
+
const defaultDependencies = {
|
|
4
|
+
getProjectPath: projectsDb.getProjectPath.bind(projectsDb),
|
|
5
|
+
};
|
|
6
|
+
function coerceNumericUserId(userId) {
|
|
7
|
+
if (userId === null || userId === undefined) {
|
|
8
|
+
throw new AppError('Authenticated user is required', {
|
|
9
|
+
code: 'AUTHENTICATION_REQUIRED',
|
|
10
|
+
statusCode: 401,
|
|
11
|
+
});
|
|
12
|
+
}
|
|
13
|
+
const numericId = typeof userId === 'number' ? userId : Number.parseInt(String(userId), 10);
|
|
14
|
+
if (Number.isNaN(numericId)) {
|
|
15
|
+
throw new AppError('Authenticated user is required', {
|
|
16
|
+
code: 'AUTHENTICATION_REQUIRED',
|
|
17
|
+
statusCode: 401,
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
return numericId;
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* Confirms that `requestedPath` is a project registered to `userId`, and
|
|
24
|
+
* returns its canonical (normalized) form.
|
|
25
|
+
*
|
|
26
|
+
* Use this anywhere the server is about to act on a path supplied over the
|
|
27
|
+
* wire — spawn a CLI, register a clone target, etc. — so a user with a valid
|
|
28
|
+
* session cannot pivot to another user's project simply by knowing its path.
|
|
29
|
+
*/
|
|
30
|
+
export function assertUserOwnsProjectPath(userId, requestedPath, dependencies = defaultDependencies) {
|
|
31
|
+
const numericUserId = coerceNumericUserId(userId);
|
|
32
|
+
if (typeof requestedPath !== 'string' || requestedPath.trim().length === 0) {
|
|
33
|
+
throw new AppError('A project path is required', {
|
|
34
|
+
code: 'PROJECT_PATH_REQUIRED',
|
|
35
|
+
statusCode: 400,
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
const normalized = normalizeProjectPath(requestedPath);
|
|
39
|
+
if (!normalized) {
|
|
40
|
+
throw new AppError('A project path is required', {
|
|
41
|
+
code: 'PROJECT_PATH_REQUIRED',
|
|
42
|
+
statusCode: 400,
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
const project = dependencies.getProjectPath(numericUserId, normalized);
|
|
46
|
+
if (!project) {
|
|
47
|
+
throw new AppError('The requested path is not a project owned by the authenticated user', {
|
|
48
|
+
code: 'PROJECT_NOT_OWNED_BY_USER',
|
|
49
|
+
statusCode: 403,
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
return normalized;
|
|
53
|
+
}
|
|
54
|
+
//# sourceMappingURL=project-authorization.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"project-authorization.service.js","sourceRoot":"","sources":["../../../../../server/modules/projects/services/project-authorization.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAMnE,MAAM,mBAAmB,GAA8B;IACrD,cAAc,EAAE,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC;CAC3D,CAAC;AAEF,SAAS,mBAAmB,CAAC,MAAe;IAC1C,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QAC5C,MAAM,IAAI,QAAQ,CAAC,gCAAgC,EAAE;YACnD,IAAI,EAAE,yBAAyB;YAC/B,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;IAC5F,IAAI,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,QAAQ,CAAC,gCAAgC,EAAE;YACnD,IAAI,EAAE,yBAAyB;YAC/B,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,yBAAyB,CACvC,MAAe,EACf,aAAsB,EACtB,eAA0C,mBAAmB;IAE7D,MAAM,aAAa,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAElD,IAAI,OAAO,aAAa,KAAK,QAAQ,IAAI,aAAa,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3E,MAAM,IAAI,QAAQ,CAAC,4BAA4B,EAAE;YAC/C,IAAI,EAAE,uBAAuB;YAC7B,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,UAAU,GAAG,oBAAoB,CAAC,aAAa,CAAC,CAAC;IACvD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,QAAQ,CAAC,4BAA4B,EAAE;YAC/C,IAAI,EAAE,uBAAuB;YAC7B,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,OAAO,GAAG,YAAY,CAAC,cAAc,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACvE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,QAAQ,CAAC,qEAAqE,EAAE;YACxF,IAAI,EAAE,2BAA2B;YACjC,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { access, mkdir, rm } from 'node:fs/promises';
|
|
|
3
3
|
import path from 'node:path';
|
|
4
4
|
import { githubTokensDb } from '../../../modules/database/index.js';
|
|
5
5
|
import { createProject } from '../../../modules/projects/services/project-management.service.js';
|
|
6
|
-
import { AppError, validateWorkspacePath } from '../../../shared/utils.js';
|
|
6
|
+
import { AppError, ensureUserWorkspaceRoot, validateWorkspacePath } from '../../../shared/utils.js';
|
|
7
7
|
async function defaultPathExists(targetPath) {
|
|
8
8
|
try {
|
|
9
9
|
await access(targetPath);
|
|
@@ -52,6 +52,7 @@ const defaultDependencies = {
|
|
|
52
52
|
ensureDirectory: async (directoryPath) => {
|
|
53
53
|
await mkdir(directoryPath, { recursive: true });
|
|
54
54
|
},
|
|
55
|
+
resolveUserWorkspaceRoot: ensureUserWorkspaceRoot,
|
|
55
56
|
pathExists: defaultPathExists,
|
|
56
57
|
removePath: async (targetPath) => {
|
|
57
58
|
await rm(targetPath, { recursive: true, force: true });
|
|
@@ -67,8 +68,9 @@ const defaultDependencies = {
|
|
|
67
68
|
GIT_TERMINAL_PROMPT: '0',
|
|
68
69
|
},
|
|
69
70
|
}),
|
|
70
|
-
registerProject: async (userId, projectPath, customName) => createProject({
|
|
71
|
+
registerProject: async (userId, username, projectPath, customName) => createProject({
|
|
71
72
|
userId,
|
|
73
|
+
username,
|
|
72
74
|
projectPath,
|
|
73
75
|
customName,
|
|
74
76
|
}),
|
|
@@ -97,7 +99,14 @@ export async function startCloneProject(input, handlers, dependencies = defaultD
|
|
|
97
99
|
statusCode: 400,
|
|
98
100
|
});
|
|
99
101
|
}
|
|
100
|
-
|
|
102
|
+
if (!input.username || typeof input.username !== 'string') {
|
|
103
|
+
throw new AppError('Authenticated user is required', {
|
|
104
|
+
code: 'AUTHENTICATION_REQUIRED',
|
|
105
|
+
statusCode: 401,
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
const userWorkspaceRoot = await dependencies.resolveUserWorkspaceRoot(input.username);
|
|
109
|
+
const pathValidation = await dependencies.validatePath(normalizedWorkspacePath, userWorkspaceRoot);
|
|
101
110
|
if (!pathValidation.valid || !pathValidation.resolvedPath) {
|
|
102
111
|
throw new AppError(pathValidation.error || 'Invalid workspace path', {
|
|
103
112
|
code: 'INVALID_PROJECT_PATH',
|
|
@@ -168,7 +177,7 @@ export async function startCloneProject(input, handlers, dependencies = defaultD
|
|
|
168
177
|
gitProcess.on('close', async (code) => {
|
|
169
178
|
if (code === 0) {
|
|
170
179
|
try {
|
|
171
|
-
const createdProject = await dependencies.registerProject(numericUserId, clonePath, repoName);
|
|
180
|
+
const createdProject = await dependencies.registerProject(numericUserId, input.username, clonePath, repoName);
|
|
172
181
|
handlers.onComplete({
|
|
173
182
|
project: createdProject.project,
|
|
174
183
|
message: 'Repository cloned successfully',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-clone.service.js","sourceRoot":"","sources":["../../../../../server/modules/projects/services/project-clone.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,2DAA2D,CAAC;AAE1F,OAAO,EAAE,QAAQ,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"project-clone.service.js","sourceRoot":"","sources":["../../../../../server/modules/projects/services/project-clone.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import fs from 'node:fs/promises';
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import { projectsDb } from '../../../modules/database/index.js';
|
|
4
|
-
import { AppError, normalizeProjectPath, validateWorkspacePath } from '../../../shared/utils.js';
|
|
4
|
+
import { AppError, ensureUserWorkspaceRoot, normalizeProjectPath, validateWorkspacePath, } from '../../../shared/utils.js';
|
|
5
5
|
const defaultDependencies = {
|
|
6
6
|
validatePath: validateWorkspacePath,
|
|
7
7
|
ensureWorkspaceDirectory: async (projectPath) => {
|
|
@@ -14,6 +14,7 @@ const defaultDependencies = {
|
|
|
14
14
|
});
|
|
15
15
|
}
|
|
16
16
|
},
|
|
17
|
+
resolveUserWorkspaceRoot: ensureUserWorkspaceRoot,
|
|
17
18
|
persistProjectPath: (userId, projectPath, customName) => projectsDb.createProjectPath(userId, projectPath, customName),
|
|
18
19
|
getProjectByPath: (userId, projectPath) => projectsDb.getProjectPath(userId, projectPath),
|
|
19
20
|
};
|
|
@@ -57,7 +58,8 @@ export async function createProject(input, dependencies = defaultDependencies) {
|
|
|
57
58
|
statusCode: 400,
|
|
58
59
|
});
|
|
59
60
|
}
|
|
60
|
-
const
|
|
61
|
+
const userWorkspaceRoot = await dependencies.resolveUserWorkspaceRoot(input.username);
|
|
62
|
+
const pathValidation = await dependencies.validatePath(normalizedPath, userWorkspaceRoot);
|
|
61
63
|
if (!pathValidation.valid || !pathValidation.resolvedPath) {
|
|
62
64
|
throw new AppError('Invalid project path', {
|
|
63
65
|
code: 'INVALID_PROJECT_PATH',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-management.service.js","sourceRoot":"","sources":["../../../../../server/modules/projects/services/project-management.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAMzD,OAAO,
|
|
1
|
+
{"version":3,"file":"project-management.service.js","sourceRoot":"","sources":["../../../../../server/modules/projects/services/project-management.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import assert from 'node:assert/strict';
|
|
2
|
+
import test from 'node:test';
|
|
3
|
+
import { assertUserOwnsProjectPath } from '../../../modules/projects/services/project-authorization.service.js';
|
|
4
|
+
import { AppError } from '../../../shared/utils.js';
|
|
5
|
+
const TEST_USER_ID = 7;
|
|
6
|
+
const OWNED_PATH = '/workspace/tester/my-project';
|
|
7
|
+
function buildDependencies(found) {
|
|
8
|
+
return {
|
|
9
|
+
getProjectPath: () => (found ? { project_id: 'p1' } : null),
|
|
10
|
+
};
|
|
11
|
+
}
|
|
12
|
+
test('assertUserOwnsProjectPath returns the normalized path when the user owns it', () => {
|
|
13
|
+
const result = assertUserOwnsProjectPath(TEST_USER_ID, `${OWNED_PATH}/`, buildDependencies(true));
|
|
14
|
+
assert.equal(result, OWNED_PATH);
|
|
15
|
+
});
|
|
16
|
+
test('assertUserOwnsProjectPath throws AUTHENTICATION_REQUIRED when userId is missing', () => {
|
|
17
|
+
assert.throws(() => assertUserOwnsProjectPath(undefined, OWNED_PATH, buildDependencies(true)), (error) => {
|
|
18
|
+
assert.ok(error instanceof AppError);
|
|
19
|
+
assert.equal(error.code, 'AUTHENTICATION_REQUIRED');
|
|
20
|
+
assert.equal(error.statusCode, 401);
|
|
21
|
+
return true;
|
|
22
|
+
});
|
|
23
|
+
});
|
|
24
|
+
test('assertUserOwnsProjectPath throws PROJECT_PATH_REQUIRED when path is blank', () => {
|
|
25
|
+
assert.throws(() => assertUserOwnsProjectPath(TEST_USER_ID, ' ', buildDependencies(true)), (error) => {
|
|
26
|
+
assert.ok(error instanceof AppError);
|
|
27
|
+
assert.equal(error.code, 'PROJECT_PATH_REQUIRED');
|
|
28
|
+
assert.equal(error.statusCode, 400);
|
|
29
|
+
return true;
|
|
30
|
+
});
|
|
31
|
+
});
|
|
32
|
+
test('assertUserOwnsProjectPath throws PROJECT_NOT_OWNED_BY_USER when the project is not registered for the user', () => {
|
|
33
|
+
assert.throws(() => assertUserOwnsProjectPath(TEST_USER_ID, OWNED_PATH, buildDependencies(false)), (error) => {
|
|
34
|
+
assert.ok(error instanceof AppError);
|
|
35
|
+
assert.equal(error.code, 'PROJECT_NOT_OWNED_BY_USER');
|
|
36
|
+
assert.equal(error.statusCode, 403);
|
|
37
|
+
return true;
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
test('assertUserOwnsProjectPath coerces stringified userIds', () => {
|
|
41
|
+
let receivedUserId = null;
|
|
42
|
+
const dependencies = {
|
|
43
|
+
getProjectPath: (userId) => {
|
|
44
|
+
receivedUserId = userId;
|
|
45
|
+
return { project_id: 'p1' };
|
|
46
|
+
},
|
|
47
|
+
};
|
|
48
|
+
assertUserOwnsProjectPath('42', OWNED_PATH, dependencies);
|
|
49
|
+
assert.equal(receivedUserId, 42);
|
|
50
|
+
});
|
|
51
|
+
//# sourceMappingURL=project-authorization.service.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"project-authorization.service.test.js","sourceRoot":"","sources":["../../../../../server/modules/projects/tests/project-authorization.service.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ function buildDependencies(overrides = {}) {
|
|
|
9
9
|
return {
|
|
10
10
|
validatePath: async () => ({ valid: true, resolvedPath: '/workspace/root' }),
|
|
11
11
|
ensureDirectory: async () => undefined,
|
|
12
|
+
resolveUserWorkspaceRoot: async () => '/workspace/root',
|
|
12
13
|
pathExists: async () => false,
|
|
13
14
|
removePath: async () => undefined,
|
|
14
15
|
getGithubTokenById: async () => ({ github_token: 'token-value' }),
|
|
@@ -34,6 +35,7 @@ test('startCloneProject rejects when workspace path is missing', async () => {
|
|
|
34
35
|
workspacePath: '',
|
|
35
36
|
githubUrl: 'https://github.com/example/repo',
|
|
36
37
|
userId: 1,
|
|
38
|
+
username: 'tester',
|
|
37
39
|
}, {
|
|
38
40
|
onProgress: () => undefined,
|
|
39
41
|
onComplete: () => undefined,
|
|
@@ -48,6 +50,7 @@ test('startCloneProject rejects when github URL is missing', async () => {
|
|
|
48
50
|
workspacePath: '/workspace/root',
|
|
49
51
|
githubUrl: '',
|
|
50
52
|
userId: 1,
|
|
53
|
+
username: 'tester',
|
|
51
54
|
}, {
|
|
52
55
|
onProgress: () => undefined,
|
|
53
56
|
onComplete: () => undefined,
|
|
@@ -62,6 +65,7 @@ test('startCloneProject rejects github URL values that begin with option prefixe
|
|
|
62
65
|
workspacePath: '/workspace/root',
|
|
63
66
|
githubUrl: '--upload-pack=malicious',
|
|
64
67
|
userId: 1,
|
|
68
|
+
username: 'tester',
|
|
65
69
|
}, {
|
|
66
70
|
onProgress: () => undefined,
|
|
67
71
|
onComplete: () => undefined,
|
|
@@ -77,6 +81,7 @@ test('startCloneProject rejects when selected github token does not exist', asyn
|
|
|
77
81
|
githubUrl: 'https://github.com/example/repo',
|
|
78
82
|
githubTokenId: 12,
|
|
79
83
|
userId: 1,
|
|
84
|
+
username: 'tester',
|
|
80
85
|
}, {
|
|
81
86
|
onProgress: () => undefined,
|
|
82
87
|
onComplete: () => undefined,
|
|
@@ -95,10 +100,12 @@ test('startCloneProject completes and emits complete payload when git exits succ
|
|
|
95
100
|
let capturedUserId = 0;
|
|
96
101
|
let capturedProjectPath = '';
|
|
97
102
|
let capturedCustomName = '';
|
|
103
|
+
let capturedUsername = '';
|
|
98
104
|
const operation = await startCloneProject({
|
|
99
105
|
workspacePath: '/workspace/root',
|
|
100
106
|
githubUrl: 'https://github.com/example/repo.git',
|
|
101
107
|
userId: 1,
|
|
108
|
+
username: 'tester',
|
|
102
109
|
}, {
|
|
103
110
|
onProgress: (message) => {
|
|
104
111
|
progressMessages.push(message);
|
|
@@ -108,8 +115,9 @@ test('startCloneProject completes and emits complete payload when git exits succ
|
|
|
108
115
|
},
|
|
109
116
|
}, buildDependencies({
|
|
110
117
|
spawnGitClone: () => gitProcess,
|
|
111
|
-
registerProject: async (userId, projectPath, customName) => {
|
|
118
|
+
registerProject: async (userId, username, projectPath, customName) => {
|
|
112
119
|
capturedUserId = userId;
|
|
120
|
+
capturedUsername = username;
|
|
113
121
|
capturedProjectPath = projectPath;
|
|
114
122
|
capturedCustomName = customName;
|
|
115
123
|
return { project: { projectId: 'project-1', path: projectPath } };
|
|
@@ -119,6 +127,7 @@ test('startCloneProject completes and emits complete payload when git exits succ
|
|
|
119
127
|
await operation.waitForCompletion;
|
|
120
128
|
assert.ok(progressMessages.some((message) => message.includes("Cloning into 'repo'")));
|
|
121
129
|
assert.equal(capturedUserId, 1);
|
|
130
|
+
assert.equal(capturedUsername, 'tester');
|
|
122
131
|
assert.equal(capturedCustomName, 'repo');
|
|
123
132
|
assert.equal(path.basename(capturedProjectPath), 'repo');
|
|
124
133
|
assert.notEqual(completePayload, null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-clone.service.test.js","sourceRoot":"","sources":["../../../../../server/modules/projects/tests/project-clone.service.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,sDAAsD,CAAC;AACzF,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAI7C,SAAS,iBAAiB,CAAC,YAAoD,EAAE;IAC/E,OAAO;QACL,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,iBAAiB,EAAE,CAAC;QAC5E,eAAe,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS;QACtC,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK;QAC7B,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS;QACjC,kBAAkB,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC;QACjE,aAAa,EAAE,GAAG,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;QACrE,CAAC;QACD,eAAe,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,CAAC;QACtE,QAAQ,EAAE,GAAG,EAAE,CAAC,SAAS;QACzB,GAAG,SAAS;KACb,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB;IAC3B,MAAM,OAAO,GAAG,IAAI,YAAY,EAI/B,CAAC;IAEF,OAAO,CAAC,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;IACnC,OAAO,CAAC,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;IACnC,OAAO,CAAC,IAAI,GAAG,GAAG,EAAE;QAClB,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC9B,CAAC,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,IAAI,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;IAC1E,MAAM,MAAM,CAAC,OAAO,CAClB,KAAK,IAAI,EAAE,CACT,iBAAiB,CACf;QACE,aAAa,EAAE,EAAE;QACjB,SAAS,EAAE,iCAAiC;QAC5C,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"project-clone.service.test.js","sourceRoot":"","sources":["../../../../../server/modules/projects/tests/project-clone.service.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,15 +3,18 @@ import test from 'node:test';
|
|
|
3
3
|
import { createProject } from '../../../modules/projects/services/project-management.service.js';
|
|
4
4
|
import { AppError } from '../../../shared/utils.js';
|
|
5
5
|
const TEST_USER_ID = 1;
|
|
6
|
+
const TEST_USERNAME = 'tester';
|
|
7
|
+
const TEST_USER_WORKSPACE_ROOT = '/workspace/tester';
|
|
6
8
|
const projectRow = {
|
|
7
9
|
project_id: 'project-1',
|
|
8
|
-
project_path: '/workspace/my-project',
|
|
10
|
+
project_path: '/workspace/tester/my-project',
|
|
9
11
|
custom_project_name: 'my-project',
|
|
10
12
|
isStarred: 0,
|
|
11
13
|
isArchived: 0,
|
|
12
14
|
};
|
|
15
|
+
const resolveUserWorkspaceRoot = async () => TEST_USER_WORKSPACE_ROOT;
|
|
13
16
|
test('createProject throws when project path is missing', async () => {
|
|
14
|
-
await assert.rejects(async () => createProject({ userId: TEST_USER_ID, projectPath: '' }), (error) => {
|
|
17
|
+
await assert.rejects(async () => createProject({ userId: TEST_USER_ID, username: TEST_USERNAME, projectPath: '' }), (error) => {
|
|
15
18
|
assert.ok(error instanceof AppError);
|
|
16
19
|
assert.equal(error.code, 'PROJECT_PATH_REQUIRED');
|
|
17
20
|
assert.equal(error.statusCode, 400);
|
|
@@ -19,9 +22,10 @@ test('createProject throws when project path is missing', async () => {
|
|
|
19
22
|
});
|
|
20
23
|
});
|
|
21
24
|
test('createProject throws when path validation fails', async () => {
|
|
22
|
-
await assert.rejects(async () => createProject({ userId: TEST_USER_ID, projectPath: '/invalid/path' }, {
|
|
25
|
+
await assert.rejects(async () => createProject({ userId: TEST_USER_ID, username: TEST_USERNAME, projectPath: '/invalid/path' }, {
|
|
23
26
|
validatePath: async () => ({ valid: false, error: 'blocked path' }),
|
|
24
27
|
ensureWorkspaceDirectory: async () => undefined,
|
|
28
|
+
resolveUserWorkspaceRoot,
|
|
25
29
|
persistProjectPath: () => ({ outcome: 'created', project: projectRow }),
|
|
26
30
|
getProjectByPath: () => projectRow,
|
|
27
31
|
}), (error) => {
|
|
@@ -33,25 +37,41 @@ test('createProject throws when path validation fails', async () => {
|
|
|
33
37
|
});
|
|
34
38
|
});
|
|
35
39
|
test('createProject throws conflict when active project path already exists', async () => {
|
|
36
|
-
await assert.rejects(async () => createProject({ userId: TEST_USER_ID, projectPath: '/workspace/my-project' }, {
|
|
37
|
-
validatePath: async () => ({ valid: true, resolvedPath: '/workspace/my-project' }),
|
|
40
|
+
await assert.rejects(async () => createProject({ userId: TEST_USER_ID, username: TEST_USERNAME, projectPath: '/workspace/tester/my-project' }, {
|
|
41
|
+
validatePath: async () => ({ valid: true, resolvedPath: '/workspace/tester/my-project' }),
|
|
38
42
|
ensureWorkspaceDirectory: async () => undefined,
|
|
43
|
+
resolveUserWorkspaceRoot,
|
|
39
44
|
persistProjectPath: () => ({ outcome: 'active_conflict', project: projectRow }),
|
|
40
45
|
getProjectByPath: () => projectRow,
|
|
41
46
|
}), (error) => {
|
|
42
47
|
assert.ok(error instanceof AppError);
|
|
43
48
|
assert.equal(error.code, 'PROJECT_ALREADY_EXISTS');
|
|
44
49
|
assert.equal(error.statusCode, 409);
|
|
45
|
-
assert.equal(error.details, 'Project path already exists: /workspace/my-project');
|
|
50
|
+
assert.equal(error.details, 'Project path already exists: /workspace/tester/my-project');
|
|
46
51
|
return true;
|
|
47
52
|
});
|
|
48
53
|
});
|
|
54
|
+
test('createProject passes the per-user workspace root to validatePath', async () => {
|
|
55
|
+
let capturedWorkspaceRoot = '';
|
|
56
|
+
await createProject({ userId: TEST_USER_ID, username: TEST_USERNAME, projectPath: '/workspace/tester/my-project' }, {
|
|
57
|
+
validatePath: async (_projectPath, workspaceRoot) => {
|
|
58
|
+
capturedWorkspaceRoot = workspaceRoot;
|
|
59
|
+
return { valid: true, resolvedPath: '/workspace/tester/my-project' };
|
|
60
|
+
},
|
|
61
|
+
ensureWorkspaceDirectory: async () => undefined,
|
|
62
|
+
resolveUserWorkspaceRoot,
|
|
63
|
+
persistProjectPath: () => ({ outcome: 'created', project: projectRow }),
|
|
64
|
+
getProjectByPath: () => projectRow,
|
|
65
|
+
});
|
|
66
|
+
assert.equal(capturedWorkspaceRoot, TEST_USER_WORKSPACE_ROOT);
|
|
67
|
+
});
|
|
49
68
|
test('createProject falls back to directory name when custom name is not provided', async () => {
|
|
50
69
|
let capturedUserId = 0;
|
|
51
70
|
let capturedCustomName = null;
|
|
52
|
-
const result = await createProject({ userId: TEST_USER_ID, projectPath: '/workspace/my-project', customName: '' }, {
|
|
53
|
-
validatePath: async () => ({ valid: true, resolvedPath: '/workspace/my-project' }),
|
|
71
|
+
const result = await createProject({ userId: TEST_USER_ID, username: TEST_USERNAME, projectPath: '/workspace/tester/my-project', customName: '' }, {
|
|
72
|
+
validatePath: async () => ({ valid: true, resolvedPath: '/workspace/tester/my-project' }),
|
|
54
73
|
ensureWorkspaceDirectory: async () => undefined,
|
|
74
|
+
resolveUserWorkspaceRoot,
|
|
55
75
|
persistProjectPath: (userId, _projectPath, customName) => {
|
|
56
76
|
capturedUserId = userId;
|
|
57
77
|
capturedCustomName = customName;
|
|
@@ -71,9 +91,10 @@ test('createProject falls back to directory name when custom name is not provide
|
|
|
71
91
|
assert.equal(result.project.displayName, 'my-project');
|
|
72
92
|
});
|
|
73
93
|
test('createProject returns archived reuse outcome when archived row is reused', async () => {
|
|
74
|
-
const result = await createProject({ userId: TEST_USER_ID, projectPath: '/workspace/my-project' }, {
|
|
75
|
-
validatePath: async () => ({ valid: true, resolvedPath: '/workspace/my-project' }),
|
|
94
|
+
const result = await createProject({ userId: TEST_USER_ID, username: TEST_USERNAME, projectPath: '/workspace/tester/my-project' }, {
|
|
95
|
+
validatePath: async () => ({ valid: true, resolvedPath: '/workspace/tester/my-project' }),
|
|
76
96
|
ensureWorkspaceDirectory: async () => undefined,
|
|
97
|
+
resolveUserWorkspaceRoot,
|
|
77
98
|
persistProjectPath: () => ({
|
|
78
99
|
outcome: 'reactivated_archived',
|
|
79
100
|
project: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-management.service.test.js","sourceRoot":"","sources":["../../../../../server/modules/projects/tests/project-management.service.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,aAAa,EAAE,MAAM,2DAA2D,CAAC;AAC1F,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,MAAM,YAAY,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"project-management.service.test.js","sourceRoot":"","sources":["../../../../../server/modules/projects/tests/project-management.service.test.ts"],"names":[],"mappings":"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"}
|