Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

fix(auth): revoke admins after account-owned workspace deletion

Tina2dcc65c42f1
diff --git a/apps/api/src/user/controllers/delete-account-data.ts b/apps/api/src/user/controllers/delete-account-data.ts
index dca125f2e..4b5347186 100644
--- a/apps/api/src/user/controllers/delete-account-data.ts
+++ b/apps/api/src/user/controllers/delete-account-data.ts
@@ -7,7 +7,12 @@ import {
import { syncWorkspaceSeats } from "../../billing/controllers/sync-seats";
import db from "../../database";
import { revokeWorkspaceConnections } from "../../ws";
-import { workspaceTable, workspaceUserTable } from "../../database/schema";
+import {
+ userTable,
+ workspaceTable,
+ workspaceUserTable,
+} from "../../database/schema";
+import { instanceAdminRoleSql } from "../../utils/instance-admin-role";
import {
formatBlockedWorkspacesMessage,
hasOwnerRole,
@@ -80,9 +85,24 @@ export async function deleteAccountData(userId: string) {
}
if (plan.workspaceIdsToDelete.length > 0) {
+ const admins = await db
+ .select({ userId: userTable.id })
+ .from(userTable)
+ .where(instanceAdminRoleSql(userTable.role));
+ const recipients = new Set([
+ userId,
+ ...admins.map((admin) => admin.userId),
+ ]);
await db
.delete(workspaceTable)
.where(inArray(workspaceTable.id, plan.workspaceIdsToDelete));
+ for (const workspaceId of plan.workspaceIdsToDelete) {
+ await Promise.all(
+ [...recipients].map((recipient) =>
+ revokeWorkspaceConnections(recipient, workspaceId, { force: true }),
+ ),
+ );
+ }
}
if (plan.workspaceIdsToLeave.length > 0) {
@@ -106,10 +126,7 @@ export async function deleteAccountData(userId: string) {
}
}
- for (const workspaceId of [
- ...plan.workspaceIdsToDelete,
- ...plan.workspaceIdsToLeave,
- ]) {
+ for (const workspaceId of plan.workspaceIdsToLeave) {
await revokeWorkspaceConnections(userId, workspaceId, { force: true });
}
diff --git a/tests/api-integration/account-deletion.test.ts b/tests/api-integration/account-deletion.test.ts
index 6dc85cb19..fc05c988c 100644
--- a/tests/api-integration/account-deletion.test.ts
+++ b/tests/api-integration/account-deletion.test.ts
@@ -60,6 +60,57 @@ describe("API integration: account deletion", () => {
expect(workspaces).toHaveLength(0);
});
+ it("revokes implicit administrators when deleting a sole-member workspace", async () => {
+ const owner = await createWorkspaceMember({ role: "owner" });
+ const admin = await createWorkspaceMember();
+ await db
+ .update(schema.userTable)
+ .set({ role: "user,admin" })
+ .where(eq(schema.userTable.id, admin.user.id));
+ const { project } = await createProjectFixture({
+ workspaceId: owner.workspace.id,
+ });
+ const board = { send: vi.fn(), close: vi.fn() };
+ const global = { send: vi.fn(), close: vi.fn() };
+ const projectConnection = addConnection(
+ project.id,
+ board as unknown as WSContext,
+ admin.user.id,
+ "window",
+ owner.workspace.id,
+ );
+ const userConnection = addUserConnection(
+ admin.user.id,
+ global as unknown as WSContext,
+ );
+ try {
+ await deleteAccountData(owner.user.id);
+ expect(board.close).toHaveBeenCalledWith(
+ 1008,
+ "Workspace access revoked",
+ );
+ expect(
+ global.send.mock.calls.map(([message]) => JSON.parse(message)),
+ ).toContainEqual({
+ type: "WORKSPACE_ACCESS_REVOKED",
+ workspaceId: owner.workspace.id,
+ });
+ expect(
+ await db.query.workspaceTable.findFirst({
+ where: eq(schema.workspaceTable.id, owner.workspace.id),
+ }),
+ ).toBeUndefined();
+ expect(
+ await db.query.workspaceTable.findFirst({
+ where: eq(schema.workspaceTable.id, admin.workspace.id),
+ }),
+ ).toBeDefined();
+ } finally {
+ removeConnection(project.id, projectConnection);
+ removeUserConnection(admin.user.id, userConnection);
+ }
+ });
+
it("refuses to delete while the account is the only owner of a shared workspace", async () => {
const owner = await createWorkspaceMember({
role: "owner",