fix(backend): properly delete MCP installations and notify satellites during team deletion

Lasim · Lasim · commit 6d82fb3582b5 · 2025-12-13T21:09:14.000+01:00
- Delete each MCP installation from database before team deletion
- Create satellite commands to kill running MCP server processes
- Preserve pending satellite commands by setting target_team_id to NULL
- Delete only completed/failed satellite commands to avoid foreign key constraints
- Add email notifications for team creation and deletion events
- Track installation deletion count and satellite commands created in logs
diff --git a/services/backend/src/email/templates/team-created.pug b/services/backend/src/email/templates/team-created.pug
@@ -0,0 +1,40 @@
+//- @description Email notification when a new team is created
+//- @variables userName, teamName, teamDescription
+extends layouts/base.pug
+
+block content
+  h1 Team Created Successfully
+
+  p Hi #{userName},
+
+  p Your new team has been created successfully!
+
+  .team-info
+    p
+      strong Team Name:
+      |  #{teamName}
+
+    if teamDescription
+      p
+        strong Description:
+        |  #{teamDescription}
+
+  h2 What's next?
+
+  p Now that your team is set up, here are some things you can do:
+
+  ul
+    li
+      strong Add MCP servers&nbsp;
+      | - Browse our catalog and add tools to your team. MCP servers give you access to powerful integrations like GitHub, databases, and more.
+    li
+      strong Add team members&nbsp;
+      | - Invite your colleagues to collaborate. Share secure access to MCP tools without sharing credentials.
+
+  p
+    | Visit your dashboard to get started with your new team.
+
+  p.text-muted
+    | Best regards,
+    br
+    | The DeployStack Team
diff --git a/services/backend/src/email/templates/team-deleted.pug b/services/backend/src/email/templates/team-deleted.pug
@@ -0,0 +1,30 @@
+//- @description Email notification when a team is deleted
+//- @variables userName, teamName
+extends layouts/base.pug
+
+block content
+  h1 Team Deleted
+
+  p Hi #{userName},
+
+  p Your team #[strong #{teamName}] has been removed from DeployStack.
+
+  h2 What was removed?
+
+  p The following items were removed as part of the team deletion:
+
+  ul
+    li
+      strong All team members&nbsp;
+      | - All users have been removed from the team
+    li
+      strong All MCP servers&nbsp;
+      | - All MCP server installations have been uninstalled
+
+  p
+    | If you need to use MCP servers again, you can create a new team or use your default team.
+
+  p.text-muted
+    | Best regards,
+    br
+    | The DeployStack Team
diff --git a/services/backend/src/email/types.ts b/services/backend/src/email/types.ts
@@ -152,6 +152,17 @@ export interface McpInstallationDeletedEmailVariables {
   teamName: string;
 }
 
+export interface TeamCreatedEmailVariables {
+  userName: string;
+  teamName: string;
+  teamDescription?: string;
+}
+
+export interface TeamDeletedEmailVariables {
+  userName: string;
+  teamName: string;
+}
+
 // Template registry for type safety
 export interface TemplateVariableMap {
   welcome: WelcomeEmailVariables;
@@ -162,6 +173,8 @@ export interface TemplateVariableMap {
   test: TestEmailVariables;
   'mcp-installation-created': McpInstallationCreatedEmailVariables;
   'mcp-installation-deleted': McpInstallationDeletedEmailVariables;
+  'team-created': TeamCreatedEmailVariables;
+  'team-deleted': TeamDeletedEmailVariables;
 }
 
 export type TemplateNames = keyof TemplateVariableMap;
diff --git a/services/backend/src/routes/teams/createTeam.ts b/services/backend/src/routes/teams/createTeam.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import type { FastifyInstance } from 'fastify';
 import { TeamService } from '../../services/teamService';
 import { requirePermission } from '../../middleware/roleMiddleware';
@@ -93,14 +94,39 @@ export default async function createTeamRoute(server: FastifyInstance) {
         owner_id: request.user.id,
       });
 
+      // Queue team creation email
+      try {
+        const jobQueueService = (server as any).jobQueueService;
+        if (jobQueueService) {
+          await jobQueueService.createJob('send_email', {
+            to: (request.user as any).email,
+            subject: 'Team Created Successfully',
+            template: 'team-created',
+            variables: {
+              userName: (request.user as any).username || (request.user as any).email,
+              teamName: team.name,
+              teamDescription: team.description || undefined
+            }
+          });
+          server.log.info({
+            operation: 'team_created',
+            teamId: team.id,
+            userEmail: (request.user as any).email
+          }, 'Team creation email queued');
+        }
+      } catch (emailError) {
+        server.log.error(emailError, 'Failed to queue team creation email - team creation succeeded but email not sent');
+        // Don't fail team creation if email queueing fails
+      }
+
       // Emit TEAM_CREATED event
       try {
         const eventContext: EventContext = {
           db: server.db,
           logger: server.log,
           user: {
             id: request.user.id,
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+             
             email: (request.user as any).email,
             roleId: 'unknown' // We'd need to fetch this from DB if needed
           },
@@ -122,7 +148,7 @@ export default async function createTeamRoute(server: FastifyInstance) {
             },
             createdBy: {
               id: request.user.id,
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
+               
               email: (request.user as any).email
             },
             metadata: {
diff --git a/services/backend/src/routes/teams/deleteTeam.ts b/services/backend/src/routes/teams/deleteTeam.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import type { FastifyInstance, FastifyRequest } from 'fastify';
 import { TeamService } from '../../services/teamService';
 import { requirePermission } from '../../middleware/roleMiddleware';
@@ -87,7 +88,31 @@ export default async function deleteTeamRoute(server: FastifyInstance) {
       }
 
       // Delete the team
-      await TeamService.deleteTeam(teamId);
+      await TeamService.deleteTeam(teamId, request.user!.id, server.log);
+
+      // Queue team deletion email
+      try {
+        const jobQueueService = (server as any).jobQueueService;
+        if (jobQueueService) {
+          await jobQueueService.createJob('send_email', {
+            to: (request.user as any).email,
+            subject: 'Team Deleted Successfully',
+            template: 'team-deleted',
+            variables: {
+              userName: (request.user as any).username || (request.user as any).email,
+              teamName: existingTeam.name
+            }
+          });
+          server.log.info({
+            operation: 'team_deleted',
+            teamId,
+            userEmail: (request.user as any).email
+          }, 'Team deletion email queued');
+        }
+      } catch (emailError) {
+        server.log.error(emailError, 'Failed to queue team deletion email - team deletion succeeded but email not sent');
+        // Don't fail team deletion if email queueing fails
+      }
 
       const successResponse: DeleteSuccessResponse = {
         success: true,
diff --git a/services/backend/src/services/teamService.ts b/services/backend/src/services/teamService.ts
@@ -1,9 +1,11 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { eq, and, count } from 'drizzle-orm';
+import { eq, and, count, or } from 'drizzle-orm';
 import { getDb, getSchema } from '../db/index';
 import { generateId } from 'lucia';
 import { GlobalSettings } from '../global-settings/helpers';
 import type { FastifyBaseLogger } from 'fastify';
+import { McpInstallationService } from './mcpInstallationService';
+import { SatelliteCommandService } from './satelliteCommandService';
 
 export interface Team {
   id: string;
@@ -281,9 +283,99 @@ export class TeamService {
   /**
    * Delete team
    */
-  static async deleteTeam(teamId: string): Promise<boolean> {
+  static async deleteTeam(teamId: string, userId: string, logger: FastifyBaseLogger): Promise<boolean> {
     const { db, schema } = this.getDbAndSchema();
-    // Delete team memberships first (cascade should handle this, but being explicit)
+
+    // Delete all MCP installations for this team
+    // This will remove the database records and create satellite commands to kill processes
+    try {
+      const installationService = new McpInstallationService(db, logger);
+      const satelliteCommandService = new SatelliteCommandService(db, logger);
+
+      // Get all MCP installations for this team
+      const installations = await installationService.getTeamInstallations(teamId, userId);
+
+      let deletedCount = 0;
+      let totalCommands = 0;
+
+      // Delete each installation and create satellite commands
+      for (const installation of installations) {
+        try {
+          // 1. Delete installation from database
+          const deleted = await installationService.deleteInstallation(installation.id, teamId);
+          if (deleted) {
+            deletedCount++;
+          }
+
+          // 2. Create satellite commands to kill processes (fire-and-forget)
+          try {
+            const commands = await satelliteCommandService.notifyMcpInstallation(
+              installation.id,
+              teamId,
+              userId
+            );
+            totalCommands += commands.length;
+          } catch (commandError) {
+            logger.error(commandError, `Failed to create satellite commands for installation ${installation.id}`);
+            // Continue even if satellite command creation fails
+          }
+        } catch (installationError) {
+          logger.error(installationError, `Failed to delete installation ${installation.id}`);
+          // Continue with other installations even if one fails
+        }
+      }
+
+      logger.info({
+        operation: 'team_deletion',
+        teamId,
+        totalInstallations: installations.length,
+        installationsDeleted: deletedCount,
+        satelliteCommandsCreated: totalCommands
+      }, 'MCP installations deleted and satellite commands created for team deletion');
+
+    } catch (error) {
+      logger.error(error, 'Failed to delete MCP installations - proceeding with team deletion anyway');
+      // Don't fail team deletion if installation deletion fails
+    }
+
+    // Handle satellite commands - preserve pending commands so satellites can pick them up
+    // Set target_team_id to NULL for pending commands (allows team deletion without blocking satellite execution)
+    await (db as any)
+      .update(schema.satelliteCommands)
+      .set({ target_team_id: null })
+      .where(
+        and(
+          eq(schema.satelliteCommands.target_team_id, teamId),
+          eq(schema.satelliteCommands.status, 'pending')
+        )
+      );
+
+    // Delete non-pending satellite commands (completed/failed/executing) since they're no longer needed
+    await (db as any)
+      .delete(schema.satelliteCommands)
+      .where(
+        and(
+          eq(schema.satelliteCommands.target_team_id, teamId),
+          or(
+            eq(schema.satelliteCommands.status, 'completed'),
+            eq(schema.satelliteCommands.status, 'failed'),
+            eq(schema.satelliteCommands.status, 'acknowledged'),
+            eq(schema.satelliteCommands.status, 'executing')
+          )
+        )
+      );
+
+    // Delete satellite processes for this team
+    await (db as any)
+      .delete(schema.satelliteProcesses)
+      .where(eq(schema.satelliteProcesses.team_id, teamId));
+
+    // Delete satellite usage logs for this team
+    await (db as any)
+      .delete(schema.satelliteUsageLogs)
+      .where(eq(schema.satelliteUsageLogs.team_id, teamId));
+
+    // Delete team memberships (cascade should handle this, but being explicit)
     await (db as any)
       .delete(schema.teamMemberships)
       .where(eq(schema.teamMemberships.team_id, teamId));
