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.

refactor(api): share workspace member side effects

Andrejd3746068ea83
diff --git a/apps/api/src/auth.ts b/apps/api/src/auth.ts
index 16e9d872e..8db7da4e2 100644
--- a/apps/api/src/auth.ts
+++ b/apps/api/src/auth.ts
@@ -41,7 +41,6 @@ import {
findBillableWorkspaces,
formatBillableWorkspacesMessage,
} from "./billing/controllers/find-billable-workspaces";
-import { syncWorkspaceSeats } from "./billing/controllers/sync-seats";
import db, { schema } from "./database";
import { authDatabaseAdapter } from "./database/auth-adapter";
import { publishEvent } from "./events";
@@ -50,6 +49,9 @@ import { resolveInvitationProjectAccess } from "./project-access/resolve-invitat
import { clearMemberProjectAccess } from "./project-access/clear-member-project-access";
import { isOwnerRole } from "./project-access/is-owner-role";
import { publishMemberProjects } from "./project-access/publish-member-projects";
+import { handleMemberAdded } from "./workspace-members/handle-member-added";
+import { handleMemberRemoved } from "./workspace-members/handle-member-removed";
+import { handleOwnerPromoted } from "./workspace-members/handle-owner-promoted";
import { hideInaccessibleInvitationProjects } from "./project-access/hide-inaccessible-invitation-projects";
import clearEmailVerificationOnAdminChange from "./user/controllers/clear-email-verification-on-admin-change";
import deleteAccountData from "./user/controllers/delete-account-data";
@@ -575,51 +577,21 @@ export const auth = betterAuth({
});
},
afterUpdateMemberRole: async ({ member }) => {
- if (!isOwnerRole(member.role)) return;
- await clearMemberProjectAccess(member.organizationId, member.userId)
- .then(() =>
- publishEvent("project_access.updated", {
- workspaceId: member.organizationId,
- userId: member.userId,
- }),
- )
- .catch((error) => {
- console.error("Project access cleanup failed:", error);
- });
+ if (isOwnerRole(member.role)) {
+ await handleOwnerPromoted(member.organizationId, member.userId);
+ }
},
afterAddMember: async ({ member }) => {
if (member?.organizationId) {
- await publishMemberProjects(
- member.organizationId,
- member.userId,
- ).catch((error) => {
- console.error("Project member refresh failed:", error);
- });
- void syncWorkspaceSeats(member.organizationId).catch((error) => {
- console.error("Seat sync after member add failed:", error);
- });
+ await handleMemberAdded(member.organizationId, member.userId);
}
},
afterRemoveMember: async ({ member, user }) => {
if (member?.organizationId) {
- await clearMemberProjectAccess(
- member.organizationId,
- member.userId,
- ).catch((error) => {
- console.error("Project access cleanup failed:", error);
- });
- await publishEvent("project_members.updated", {
+ await handleMemberRemoved({
workspaceId: member.organizationId,
- });
- if (!hasInstanceAdminRole(user.role)) {
- await revokeWorkspaceConnections(
- member.userId,
- member.organizationId,
- { role: user.role ?? null },
- );
- }
- void syncWorkspaceSeats(member.organizationId).catch((error) => {
- console.error("Seat sync after member remove failed:", error);
+ userId: member.userId,
+ userRole: user.role,
});
}
},
diff --git a/apps/api/src/workspace-members/handle-member-added.ts b/apps/api/src/workspace-members/handle-member-added.ts
new file mode 100644
index 000000000..0d3191d56
--- /dev/null
+++ b/apps/api/src/workspace-members/handle-member-added.ts
@@ -0,0 +1,11 @@
+import { syncWorkspaceSeats } from "../billing/controllers/sync-seats";
+import { publishMemberProjects } from "../project-access/publish-member-projects";
+
+export async function handleMemberAdded(workspaceId: string, userId: string) {
+ await publishMemberProjects(workspaceId, userId).catch((error) => {
+ console.error("Project member refresh failed:", error);
+ });
+ void syncWorkspaceSeats(workspaceId).catch((error) => {
+ console.error("Seat sync after member add failed:", error);
+ });
+}
diff --git a/apps/api/src/workspace-members/handle-member-removed.ts b/apps/api/src/workspace-members/handle-member-removed.ts
new file mode 100644
index 000000000..a7afd0322
--- /dev/null
+++ b/apps/api/src/workspace-members/handle-member-removed.ts
@@ -0,0 +1,25 @@
+import { syncWorkspaceSeats } from "../billing/controllers/sync-seats";
+import { publishEvent } from "../events";
+import { clearMemberProjectAccess } from "../project-access/clear-member-project-access";
+import { hasInstanceAdminRole } from "../utils/instance-admin-role";
+import { revokeWorkspaceConnections } from "../ws";
+
+export async function handleMemberRemoved(removal: {
+ workspaceId: string;
+ userId: string;
+ userRole: string | null | undefined;
+}) {
+ const { workspaceId, userId, userRole } = removal;
+ await clearMemberProjectAccess(workspaceId, userId).catch((error) => {
+ console.error("Project access cleanup failed:", error);
+ });
+ await publishEvent("project_members.updated", { workspaceId });
+ if (!hasInstanceAdminRole(userRole)) {
+ await revokeWorkspaceConnections(userId, workspaceId, {
+ role: userRole ?? null,
+ });
+ }
+ void syncWorkspaceSeats(workspaceId).catch((error) => {
+ console.error("Seat sync after member remove failed:", error);
+ });
+}
diff --git a/apps/api/src/workspace-members/handle-owner-promoted.ts b/apps/api/src/workspace-members/handle-owner-promoted.ts
new file mode 100644
index 000000000..b9ce27d57
--- /dev/null
+++ b/apps/api/src/workspace-members/handle-owner-promoted.ts
@@ -0,0 +1,10 @@
+import { publishEvent } from "../events";
+import { clearMemberProjectAccess } from "../project-access/clear-member-project-access";
+
+export async function handleOwnerPromoted(workspaceId: string, userId: string) {
+ await clearMemberProjectAccess(workspaceId, userId)
+ .then(() => publishEvent("project_access.updated", { workspaceId, userId }))
+ .catch((error) => {
+ console.error("Project access cleanup failed:", error);
+ });
+}