bolt

chpy04 · chpy04 · commit fbbc94dcafd3 · 2025-11-01T10:00:46.000-04:00
diff --git a/src/backend/index.ts b/src/backend/index.ts
@@ -1,4 +1,4 @@
-import express from 'express';
+import express, { Router } from 'express';
 import cors from 'cors';
 import cookieParser from 'cookie-parser';
 import { getUserAndOrganization, prodHeaders, requireJwtDev, requireJwtProd } from './src/utils/auth.utils';
@@ -17,7 +17,7 @@ import wbsElementTemplatesRouter from './src/routes/wbs-element-templates.routes
 import carsRouter from './src/routes/cars.routes';
 import organizationRouter from './src/routes/organizations.routes';
 import recruitmentRouter from './src/routes/recruitment.routes';
-import { slackEvents } from './src/routes/slack.routes';
+import { receiver } from './src/integrations/slack';
 import announcementsRouter from './src/routes/announcements.routes';
 import onboardingRouter from './src/routes/onboarding.routes';
 import popUpsRouter from './src/routes/pop-up.routes';
@@ -48,9 +48,11 @@ const options: cors.CorsOptions = {
   allowedHeaders
 };
 
-// so we can listen to slack messages
-// NOTE: must be done before using json
-app.use('/slack', slackEvents.requestListener());
+// Mount Slack Bolt receiver BEFORE other middleware to handle raw body parsing
+// Bolt's receiver handles its own body parsing and request verification
+// The receiver is configured to handle requests at /slack/events
+app.use(receiver.router as unknown as Router);
+console.log('Registered Slack Bolt receiver at /slack/events');
 
 // so that we can use cookies and json
 app.use(cookieParser());
diff --git a/src/backend/package.json b/src/backend/package.json
@@ -10,8 +10,7 @@
   },
   "dependencies": {
     "@prisma/client": "^6.2.1",
-    "@slack/events-api": "^3.0.1",
-    "@slack/web-api": "^7.8.0",
+    "@slack/bolt": "^3.22.0",
     "@types/concat-stream": "^2.0.0",
     "@types/cookie-parser": "^1.4.3",
     "@types/cors": "^2.8.12",
diff --git a/src/backend/src/controllers/slack.controllers.ts b/src/backend/src/controllers/slack.controllers.ts
@@ -15,4 +15,41 @@ export default class SlackController {
       console.log(error);
     }
   }
+
+  static async handleSaboSubmittedAction(body: any) {
+    try {
+      // Extract action details from Bolt's BlockAction payload
+      const [action] = body.actions;
+
+      if (action.type !== 'button') {
+        // ignore non-button actions for sab submission confirmation
+        return;
+      }
+
+      const payload = {
+        type: body.type,
+        user: {
+          id: body.user.id,
+          username: body.user.username,
+          name: body.user.name
+        },
+        actions: [
+          {
+            action_id: action.action_id,
+            value: action.value || '',
+            type: action.type
+          }
+        ],
+        response_url: body.response_url
+      };
+
+      // Handle the action using existing service
+      await SlackServices.handleSaboSubmittedAction(payload);
+    } catch (error: unknown) {
+      console.error('Error handling Slack interactive action:', error);
+      const errorMessage = error instanceof Error ? error.message : 'Unknown error';
+      console.error('Error details:', errorMessage);
+      throw error; // Re-throw to be handled by Bolt's error handler
+    }
+  }
 }
diff --git a/src/backend/src/integrations/slack.ts b/src/backend/src/integrations/slack.ts
@@ -1,7 +1,19 @@
-import { ChatPostMessageResponse, WebClient } from '@slack/web-api';
+import { App, ExpressReceiver } from '@slack/bolt';
 import { HttpException } from '../utils/errors.utils';
 
-const slack = new WebClient(process.env.SLACK_BOT_TOKEN);
+const receiver = new ExpressReceiver({
+  signingSecret: process.env.SLACK_SIGNING_SECRET || '',
+  endpoints: '/slack/events'
+});
+
+// Initialize the Bolt app
+const slackApp = new App({
+  token: process.env.SLACK_BOT_TOKEN,
+  receiver
+});
+
+// Get the WebClient from the Bolt app
+const slack = slackApp.client;
 
 /**
  * Send a slack message
@@ -18,8 +30,7 @@ export const sendMessage = async (slackId: string, message: string, link?: strin
   const block = generateSlackTextBlock(message, link, linkButtonText);
 
   try {
-    const response: ChatPostMessageResponse = await slack.chat.postMessage({
-      token: SLACK_BOT_TOKEN,
+    const response = await slack.chat.postMessage({
       channel: slackId,
       text: message,
       blocks: [block],
@@ -54,7 +65,6 @@ export const replyToMessageInThread = async (
 
   try {
     await slack.chat.postMessage({
-      token: SLACK_BOT_TOKEN,
       channel: slackId,
       thread_ts: parentTimestamp,
       text: message,
@@ -87,7 +97,6 @@ export const editMessage = async (
 
   try {
     await slack.chat.update({
-      token: SLACK_BOT_TOKEN,
       channel: slackId,
       ts: timestamp,
       text: message,
@@ -110,7 +119,6 @@ export const reactToMessage = async (slackId: string, parentTimestamp: string, e
 
   try {
     await slack.reactions.add({
-      token: SLACK_BOT_TOKEN,
       channel: slackId,
       timestamp: parentTimestamp,
       name: emoji
@@ -230,4 +238,59 @@ export const getWorkspaceId = async () => {
   }
 };
 
+export async function sendEphemeralConfirmation(
+  channelId: string,
+  threadTs: string,
+  userId: string,
+  reimbursementRequestId: string
+) {
+  try {
+    await slack.chat.postEphemeral({
+      channel: channelId,
+      user: userId,
+      thread_ts: threadTs,
+      text: 'Approve the request on concur and then click the button below to mark it as submitted on Finishline.',
+      blocks: [
+        {
+          type: 'section',
+          text: {
+            type: 'mrkdwn',
+            text: 'Approve the request on concur and then click the button below to mark it as submitted on Finishline.'
+          }
+        },
+        {
+          type: 'section',
+          text: {
+            type: 'mrkdwn',
+            text: '<https://us2.concursolutions.com/home|*Click here to go to concur*>'
+          }
+        },
+        {
+          type: 'actions',
+          elements: [
+            {
+              type: 'button',
+              text: {
+                type: 'plain_text',
+                text: "✓ I've approved the request on Concur"
+              },
+              style: 'primary',
+              action_id: 'sabo_submitted_confirmation',
+              value: JSON.stringify({
+                reimbursementRequestId
+              })
+            }
+          ]
+        }
+      ]
+    });
+  } catch (err: unknown) {
+    if (err instanceof Error) {
+      throw new HttpException(500, `Failed to send slack notifications: ${err.message}`);
+    }
+  }
+}
+
+// Export the slack client, bolt app, and receiver for any direct usage if needed
+export { slack, slackApp, receiver };
 export default slack;
diff --git a/src/backend/src/routes/slack.routes.ts b/src/backend/src/routes/slack.routes.ts
@@ -1,8 +1,29 @@
-import { createEventAdapter } from '@slack/events-api';
+import { slackApp } from '../integrations/slack';
 import SlackController from '../controllers/slack.controllers';
 
-export const slackEvents = createEventAdapter(process.env.SLACK_SIGNING_SECRET || '');
+// Register message event listener
+slackApp.message(async ({ message, logger }: any) => {
+  try {
+    await SlackController.processMessageEvent(message);
+  } catch (error) {
+    logger.error('Error processing message event:', error);
+    console.error(error);
+  }
+});
 
-slackEvents.on('message', SlackController.processMessageEvent);
+// Register interactive action handler for SABO submission confirmation
+slackApp.action('sabo_submitted_confirmation', async ({ ack, body, logger }: any) => {
+  await ack();
 
-slackEvents.on('error', console.log);
+  try {
+    await SlackController.handleSaboSubmittedAction(body);
+  } catch (error) {
+    logger.error('Error handling sabo_submitted_confirmation action:', error);
+    console.error(error);
+  }
+});
+
+// Error handler
+slackApp.error(async (error: Error) => {
+  console.error('Slack app error:', error);
+});
diff --git a/src/backend/src/services/notifications.services.ts b/src/backend/src/services/notifications.services.ts
@@ -265,6 +265,13 @@ export default class NotificationsService {
                 type: Reimbursement_Status_Type.SABO_SUBMITTED
               }
             }
+          },
+          {
+            reimbursementStatuses: {
+              none: {
+                type: Reimbursement_Status_Type.DENIED
+              }
+            }
           }
         ]
       },
diff --git a/src/backend/src/services/reimbursement-requests.services.ts b/src/backend/src/services/reimbursement-requests.services.ts
@@ -418,12 +418,26 @@ export default class ReimbursementRequestService {
         totalCost,
         accountCodeId: accountCode.accountCodeId,
         vendorId: vendor.vendorId
+      },
+      include: {
+        notificationSlackThreads: true
       }
     });
 
     //set any deleted receipts with a dateDeleted
     await removeDeletedReceiptPictures(receiptPictures, oldReimbursementRequest.receiptPictures || [], submitter);
 
+    try {
+      await sendPendingSaboSubmissionNotification(
+        updatedReimbursementRequest.notificationSlackThreads,
+        submitter.userId,
+        updatedReimbursementRequest.recipientId,
+        updatedReimbursementRequest.reimbursementRequestId
+      );
+    } catch (e: unknown) {
+      console.error('Error sending pending SABO submission notification:', e);
+    }
+
     return updatedReimbursementRequest;
   }
 
@@ -1292,7 +1306,8 @@ export default class ReimbursementRequestService {
       await sendPendingSaboSubmissionNotification(
         reimbursementRequest.notificationSlackThreads,
         submitter.userId,
-        reimbursementRequest.recipientId
+        reimbursementRequest.recipientId,
+        reimbursementRequest.reimbursementRequestId
       );
     } catch (e: unknown) {
       console.error('Error sending pending SABO submission notification:', e);
diff --git a/src/backend/src/services/slack.services.ts b/src/backend/src/services/slack.services.ts
@@ -66,7 +66,83 @@ export interface SlackRichTextBlock {
   usergroup_id?: string;
 }
 
+/**
+ * Represents a Slack interactive payload from a button click
+ */
+export interface SlackInteractivePayload {
+  type: string;
+  user: {
+    id: string;
+    username: string;
+    name: string;
+  };
+  actions: Array<{
+    action_id: string;
+    value: string;
+    type: string;
+  }>;
+  response_url: string;
+}
+
 export default class SlackServices {
+  /**
+   * Handles the Slack button click for marking a reimbursement request as SABO submitted
+   * @param payload the Slack interactive payload
+   * @param organizationId the organization ID
+   */
+  static async handleSaboSubmittedAction(payload: SlackInteractivePayload): Promise<void> {
+    const [action] = payload.actions;
+    if (action.action_id !== 'sabo_submitted_confirmation') {
+      console.log('Ignoring action with id:', action.action_id);
+      return;
+    }
+
+    console.log('Processing sabo_submitted_confirmation action');
+    const { reimbursementRequestId } = JSON.parse(action.value);
+    const slackUserId = payload.user.id;
+
+    console.log('Looking up user with slack ID:', slackUserId);
+    console.log('Reimbursement Request ID:', reimbursementRequestId);
+
+    // Find the user by their slack ID
+    const user = await prisma.user.findFirst({
+      where: {
+        userSettings: {
+          slackId: slackUserId
+        }
+      }
+    });
+
+    if (!user) {
+      console.error('User not found for slack ID:', slackUserId);
+      throw new NotFoundException('User', slackUserId);
+    }
+
+    const reimbursementRequest = await prisma.reimbursement_Request.findUnique({
+      where: {
+        reimbursementRequestId
+      },
+      include: {
+        organization: true
+      }
+    });
+
+    if (!reimbursementRequest) {
+      throw new NotFoundException('Reimbursement Request', reimbursementRequestId);
+    }
+
+
+    // Import the service dynamically to avoid circular dependencies
+    const ReimbursementRequestService = (await import('./reimbursement-requests.services')).default;
+
+    // Call the service function to mark as SABO submitted
+    await ReimbursementRequestService.markReimbursementRequestAsSaboSubmitted(
+      reimbursementRequestId,
+      user,
+      reimbursementRequest.organization
+    );
+  }
+
   /**
    * Given a slack event representing a message in a channel,
    * make the appropriate announcement change in prisma.
diff --git a/src/backend/src/utils/auth.utils.ts b/src/backend/src/utils/auth.utils.ts
@@ -33,7 +33,7 @@ export const requireJwtProd = (req: Request, res: Response, next: NextFunction)
     req.path === '/users/auth/login' || // logins dont have cookies yet
     req.path === '/' || // base route is available so aws can listen and check the health
     req.method === 'OPTIONS' || // this is a pre-flight request and those don't send cookies
-    req.path === '/slack' // slack http endpoint is only used from slack api
+    req.path.startsWith('/slack') // slack endpoints (events and interactions) are only used from slack api
   ) {
     return next();
   } else if (
@@ -65,7 +65,7 @@ export const requireJwtDev = (req: Request, res: Response, next: NextFunction) =
     req.path === '/' || // base route is available so aws can listen and check the health
     req.method === 'OPTIONS' || // this is a pre-flight request and those don't send cookies
     req.path === '/users' || // dev login needs the list of users to log in
-    req.path === '/slack' // slack http endpoint is only used from slack api
+    req.path.startsWith('/slack') // slack endpoints (events and interactions) are only used from slack api
   ) {
     next();
   } else if (
@@ -185,7 +185,7 @@ export const getUserAndOrganization = async (req: Request, res: Response, next:
     req.path === '/' || // base route is available so aws can listen and check the health
     req.method === 'OPTIONS' || // this is a pre-flight request and those don't send cookies
     req.path === '/users' || // dev login needs the list of users to log in
-    req.path === '/slack' || // slack http endpoint is only used from slack api
+    req.path.startsWith('/slack') || // slack endpoints (events and interactions) are only used from slack api
     req.path.startsWith('/notifications') // Notifications route has its own auth, only called from gh
   ) {
     return next();
diff --git a/src/backend/src/utils/slack.utils.ts b/src/backend/src/utils/slack.utils.ts
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -265,6 +265,13 @@ export default class NotificationsService {`
`265`	`265`	`type: Reimbursement_Status_Type.SABO_SUBMITTED`
`266`	`266`	`}`
`267`	`267`	`}`
	`268`	`+ },`
	`269`	`+ {`
	`270`	`+ reimbursementStatuses: {`
	`271`	`+ none: {`
	`272`	`+ type: Reimbursement_Status_Type.DENIED`
	`273`	`+ }`
	`274`	`+ }`
`268`	`275`	`}`
`269`	`276`	`]`
`270`	`277`	`},`