⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.
TypeScript honoissue-managementissue-trackerjira-alternativekanbanlinear-alternativemcpproject-managementreactself-hostedtypescript
fix(import): grant importer access before writing
Andrej387a0ed03c24
diff --git a/apps/api/src/import/writer/create-import-project.test.ts b/apps/api/src/import/writer/create-import-project.test.tsindex c8dd1caf6..8949d2eff 100644--- a/apps/api/src/import/writer/create-import-project.test.ts+++ b/apps/api/src/import/writer/create-import-project.test.ts@@ -72,13 +72,13 @@ describe("createImportProject", () => {name: "Website",icon: "Layout",slug: "WEB",+ userId: "user-1",});expect(fill).toHaveBeenCalledWith(tx, { id: "project-WEB", slug: "WEB" });expect(mocks.placeProject).toHaveBeenCalledWith(tx, {workspaceId: "workspace-1",projectId: "project-WEB",slug: "WEB",- userId: "user-1",});expect(mocks.transactions).toEqual([{ id: 1, outcome: "committed" }]);});diff --git a/apps/api/src/import/writer/create-import-project.ts b/apps/api/src/import/writer/create-import-project.tsindex b34921b6b..c0708d332 100644--- a/apps/api/src/import/writer/create-import-project.ts+++ b/apps/api/src/import/writer/create-import-project.ts@@ -39,15 +39,11 @@ export async function createImportProject<T>(name,icon: "Layout",slug,+ userId,});if (!project) throw new Error("Failed to create the imported project");const result = await fill(tx, project);- await placeProject(tx, {- workspaceId,- projectId: project.id,- slug,- userId,- });+ await placeProject(tx, { workspaceId, projectId: project.id, slug });return result;}),{ preferredKey },diff --git a/apps/api/src/project/controllers/insert-project.ts b/apps/api/src/project/controllers/insert-project.tsindex 3e4cfc5d7..cd9c3a49d 100644--- a/apps/api/src/project/controllers/insert-project.ts+++ b/apps/api/src/project/controllers/insert-project.ts@@ -22,7 +22,6 @@ export type ProjectPlacement = {workspaceId: string;projectId: string;slug: string;- userId: string;};export const DEFAULT_PROJECT_COLUMNS = [@@ -77,20 +76,28 @@ export async function insertProject(export async function insertUnplacedProject(tx: Transaction,- { workspaceId, name, icon, slug }: Omit<NewProject, "userId">,+ { workspaceId, name, icon, slug, userId }: NewProject,) {const [createdProject] = await tx.insert(projectTable).values({ workspaceId, name, icon, slug, position: 0 }).returning();- if (createdProject) await seedDefaultColumns(tx, createdProject.id);+ if (createdProject) {+ await seedDefaultColumns(tx, createdProject.id);+ await grantProjectToRestrictedMember(tx, {+ workspaceId,+ userId,+ projectId: createdProject.id,+ });+ }+return createdProject;}export async function placeProject(tx: Transaction,- { workspaceId, projectId, slug, userId }: ProjectPlacement,+ { workspaceId, projectId, slug }: ProjectPlacement,) {await lockProjectOrdering(tx, workspaceId);await assertProjectKeyAvailable(tx, workspaceId, slug, projectId);@@ -100,6 +107,4 @@ export async function placeProject(.update(projectTable).set({ position }).where(eq(projectTable.id, projectId));-- await grantProjectToRestrictedMember(tx, { workspaceId, userId, projectId });}diff --git a/tests/api-integration/import.test.ts b/tests/api-integration/import.test.tsindex b25219b18..3cdb762c6 100644--- a/tests/api-integration/import.test.ts+++ b/tests/api-integration/import.test.ts@@ -738,6 +738,45 @@ describe("API integration: import from other tools", () => {expect(((await created.json()) as { number: number }).number).toBe(10);});+ it("keeps assignments to an importer limited to selected projects", async () => {+ const admin = await createAdmin();+ const workspaceId = admin.workspace.id;+ await db.insert(schema.workspaceMemberAccessTable).values({+ workspaceId,+ userId: admin.user.id,+ projectAccess: "selected",+ });+ const project = numberedProject();+ const [first] = project.tasks;+ if (first) first.assignee = { email: admin.user.email };+ importers.connectSource.mockResolvedValue(fakeSource(async () => project));+ mockAuthenticatedSession(admin.user);++ const imported = await importProject(workspaceId);++ const grants = await db+ .select()+ .from(schema.workspaceMemberProjectTable)+ .where(+ and(+ eq(schema.workspaceMemberProjectTable.userId, admin.user.id),+ eq(schema.workspaceMemberProjectTable.projectId, imported.projectId),+ ),+ );+ expect(grants).toHaveLength(1);++ const [assigned] = await db+ .select({ userId: schema.taskTable.userId })+ .from(schema.taskTable)+ .where(+ and(+ eq(schema.taskTable.projectId, imported.projectId),+ eq(schema.taskTable.number, 7),+ ),+ );+ expect(assigned?.userId).toBe(admin.user.id);+ });+it("suffixes the source key when the workspace already uses it", async () => {const admin = await createAdmin();const workspaceId = admin.workspace.id;