misc: addressed review comments

backend/src/ee/services/access-approval-request/access-approval-request-fns.ts

@@ -1,11 +1,6 @@
 import { PackRule, unpackRules } from "@casl/ability/extra";
 
 import { UnauthorizedError } from "@app/lib/errors";
-import { TKmsServiceFactory } from "@app/services/kms/kms-service";
-import { TProjectDALFactory } from "@app/services/project/project-dal";
-import { TProjectSlackConfigDALFactory } from "@app/services/slack/project-slack-config-dal";
-import { triggerSlackNotification } from "@app/services/slack/slack-fns";
-import { SlackTriggerFeature } from "@app/services/slack/slack-types";
 
 import { TVerifyPermission } from "./access-approval-request-types";
 
@@ -56,67 +51,3 @@ export const verifyRequestedPermissions = ({ permissions }: TVerifyPermission) =
     accessTypes: requestedPermissions.filter(filterUnique)
   };
 };
-
-export const triggerAccessRequestSlackNotif = async ({
-  projectId,
-  projectName,
-  requesterFullName,
-  isTemporary,
-  requesterEmail,
-  secretPath,
-  environment,
-  permissions,
-  approvalUrl,
-  projectDAL,
-  kmsService,
-  projectSlackConfigDAL
-}: {
-  projectId: string;
-  projectName: string;
-  requesterFullName: string;
-  isTemporary: boolean;
-  requesterEmail: string;
-  secretPath: string;
-  environment: string;
-  permissions: string[];
-  approvalUrl: string;
-  projectDAL: Pick<TProjectDALFactory, "findById" | "findProjectWithOrg">;
-  kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;
-  projectSlackConfigDAL: Pick<TProjectSlackConfigDALFactory, "getIntegrationDetailsByProject">;
-}) => {
-  const messageBody = `${requesterFullName} (${requesterEmail}) has requested ${
-    isTemporary ? "temporary" : "permanent"
-  } access to ${secretPath} in the ${environment} environment of ${projectName}.
-
-The following permissions are requested: ${permissions.join(", ")}
-
-View the request and approve or deny it <${approvalUrl}|here>.`;
-
-  const payloadBlocks = [
-    {
-      type: "header",
-      text: {
-        type: "plain_text",
-        text: "New access approval request pending for review",
-        emoji: true
-      }
-    },
-    {
-      type: "section",
-      text: {
-        type: "mrkdwn",
-        text: messageBody
-      }
-    }
-  ];
-
-  await triggerSlackNotification({
-    projectId,
-    projectDAL,
-    kmsService,
-    payloadMessage: messageBody,
-    projectSlackConfigDAL,
-    payloadBlocks,
-    feature: SlackTriggerFeature.ACCESS_REQUEST
-  });
-};

backend/src/ee/services/access-approval-request/access-approval-request-service.ts

@@ -10,6 +10,8 @@ import { TProjectDALFactory } from "@app/services/project/project-dal";
 import { TProjectEnvDALFactory } from "@app/services/project-env/project-env-dal";
 import { TProjectMembershipDALFactory } from "@app/services/project-membership/project-membership-dal";
 import { TProjectSlackConfigDALFactory } from "@app/services/slack/project-slack-config-dal";
+import { triggerSlackNotification } from "@app/services/slack/slack-fns";
+import { SlackTriggerFeature } from "@app/services/slack/slack-types";
 import { SmtpTemplates, TSmtpService } from "@app/services/smtp/smtp-service";
 import { TUserDALFactory } from "@app/services/user/user-dal";
 
@@ -20,7 +22,7 @@ import { TPermissionServiceFactory } from "../permission/permission-service";
 import { TProjectUserAdditionalPrivilegeDALFactory } from "../project-user-additional-privilege/project-user-additional-privilege-dal";
 import { ProjectUserAdditionalPrivilegeTemporaryMode } from "../project-user-additional-privilege/project-user-additional-privilege-types";
 import { TAccessApprovalRequestDALFactory } from "./access-approval-request-dal";
-import { triggerAccessRequestSlackNotif, verifyRequestedPermissions } from "./access-approval-request-fns";
+import { verifyRequestedPermissions } from "./access-approval-request-fns";
 import { TAccessApprovalRequestReviewerDALFactory } from "./access-approval-request-reviewer-dal";
 import {
   ApprovalStatus,
@@ -178,19 +180,24 @@ export const accessApprovalRequestServiceFactory = ({
       const requesterFullName = `${requestedByUser.firstName} ${requestedByUser.lastName}`;
       const approvalUrl = `${cfg.SITE_URL}/project/${project.id}/approval`;
 
-      await triggerAccessRequestSlackNotif({
+      await triggerSlackNotification({
         projectId: project.id,
-        projectName: project.name,
-        requesterFullName,
-        isTemporary,
-        requesterEmail: requestedByUser.email as string,
-        secretPath,
-        environment: envSlug,
-        permissions: accessTypes,
-        approvalUrl,
+        projectSlackConfigDAL,
         projectDAL,
         kmsService,
-        projectSlackConfigDAL
+        notification: {
+          type: SlackTriggerFeature.ACCESS_REQUEST,
+          payload: {
+            projectName: project.name,
+            requesterFullName,
+            isTemporary,
+            requesterEmail: requestedByUser.email as string,
+            secretPath,
+            environment: envSlug,
+            permissions: accessTypes,
+            approvalUrl
+          }
+        }
       });
 
       await smtpService.sendMail({

backend/src/ee/services/secret-approval-request/secret-approval-request-fns.ts

@@ -1,12 +1,7 @@
 import { TSecretApprovalRequests } from "@app/db/schemas";
 import { getConfig } from "@app/lib/config/env";
-import { TKmsServiceFactory } from "@app/services/kms/kms-service";
 import { TProjectDALFactory } from "@app/services/project/project-dal";
-import { TProjectSlackConfigDALFactory } from "@app/services/slack/project-slack-config-dal";
-import { triggerSlackNotification } from "@app/services/slack/slack-fns";
-import { SlackTriggerFeature } from "@app/services/slack/slack-types";
 import { SmtpTemplates, TSmtpService } from "@app/services/smtp/smtp-service";
-import { TUserDALFactory } from "@app/services/user/user-dal";
 
 import { TSecretApprovalPolicyDALFactory } from "../secret-approval-policy/secret-approval-policy-dal";
 
@@ -18,68 +13,6 @@ type TSendApprovalEmails = {
   secretApprovalRequest: TSecretApprovalRequests;
 };
 
-type TTriggerSecretApprovalSlackNotif = {
-  environment: string;
-  projectId: string;
-  projectDAL: Pick<TProjectDALFactory, "findById" | "findProjectWithOrg">;
-  kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;
-  projectSlackConfigDAL: Pick<TProjectSlackConfigDALFactory, "getIntegrationDetailsByProject">;
-  secretApprovalRequest: TSecretApprovalRequests;
-  secretPath: string;
-  userDAL: Pick<TUserDALFactory, "findById">;
-};
-
-export const triggerSecretApprovalSlackNotif = async ({
-  projectId,
-  projectDAL,
-  kmsService,
-  secretApprovalRequest,
-  projectSlackConfigDAL,
-  userDAL,
-  environment,
-  secretPath
-}: TTriggerSecretApprovalSlackNotif) => {
-  const appCfg = getConfig();
-  const project = await projectDAL.findProjectWithOrg(projectId);
-  const user = await userDAL.findById(secretApprovalRequest.committerUserId);
-
-  const messageBody = `A secret approval request has been opened by ${user.email}.
-*Environment*: ${environment}
-*Secret path*: ${secretPath || "/"}
-
-View the complete details <${appCfg.SITE_URL}/project/${project.id}/approval?requestId=${
-    secretApprovalRequest.id
-  }|here>.`;
-
-  const payloadBlocks = [
-    {
-      type: "header",
-      text: {
-        type: "plain_text",
-        text: "Secret approval request",
-        emoji: true
-      }
-    },
-    {
-      type: "section",
-      text: {
-        type: "mrkdwn",
-        text: messageBody
-      }
-    }
-  ];
-
-  await triggerSlackNotification({
-    projectId,
-    projectDAL,
-    kmsService,
-    payloadMessage: messageBody,
-    projectSlackConfigDAL,
-    payloadBlocks,
-    feature: SlackTriggerFeature.SECRET_APPROVAL
-  });
-};
-
 export const sendApprovalEmailsFn = async ({
   secretApprovalPolicyDAL,
   projectDAL,

backend/src/ee/services/secret-approval-request/secret-approval-request-service.ts

@@ -48,6 +48,8 @@ import {
 import { TSecretVersionV2DALFactory } from "@app/services/secret-v2-bridge/secret-version-dal";
 import { TSecretVersionV2TagDALFactory } from "@app/services/secret-v2-bridge/secret-version-tag-dal";
 import { TProjectSlackConfigDALFactory } from "@app/services/slack/project-slack-config-dal";
+import { triggerSlackNotification } from "@app/services/slack/slack-fns";
+import { SlackTriggerFeature } from "@app/services/slack/slack-types";
 import { SmtpTemplates, TSmtpService } from "@app/services/smtp/smtp-service";
 import { TUserDALFactory } from "@app/services/user/user-dal";
 
@@ -57,7 +59,7 @@ import { ProjectPermissionActions, ProjectPermissionSub } from "../permission/pr
 import { TSecretApprovalPolicyDALFactory } from "../secret-approval-policy/secret-approval-policy-dal";
 import { TSecretSnapshotServiceFactory } from "../secret-snapshot/secret-snapshot-service";
 import { TSecretApprovalRequestDALFactory } from "./secret-approval-request-dal";
-import { sendApprovalEmailsFn, triggerSecretApprovalSlackNotif } from "./secret-approval-request-fns";
+import { sendApprovalEmailsFn } from "./secret-approval-request-fns";
 import { TSecretApprovalRequestReviewerDALFactory } from "./secret-approval-request-reviewer-dal";
 import { TSecretApprovalRequestSecretDALFactory } from "./secret-approval-request-secret-dal";
 import {
@@ -1073,15 +1075,22 @@ export const secretApprovalRequestServiceFactory = ({
     });
 
     const env = await projectEnvDAL.findOne({ id: policy.envId });
-    await triggerSecretApprovalSlackNotif({
+    const user = await userDAL.findById(secretApprovalRequest.committerUserId);
+    await triggerSlackNotification({
       projectId,
-      secretPath: policy.secretPath as string,
-      environment: env.name,
       projectDAL,
       kmsService,
-      secretApprovalRequest,
-      userDAL,
-      projectSlackConfigDAL
+      projectSlackConfigDAL,
+      notification: {
+        type: SlackTriggerFeature.SECRET_APPROVAL,
+        payload: {
+          userEmail: user.email as string,
+          environment: env.name,
+          secretPath,
+          projectId,
+          requestId: secretApprovalRequest.id
+        }
+      }
     });
 
     await sendApprovalEmailsFn({
@@ -1346,16 +1355,23 @@ export const secretApprovalRequestServiceFactory = ({
       return { ...doc, commits: approvalCommits };
     });
 
+    const user = await userDAL.findById(secretApprovalRequest.committerUserId);
     const env = await projectEnvDAL.findOne({ id: policy.envId });
-    await triggerSecretApprovalSlackNotif({
-      secretPath: policy.secretPath as string,
-      environment: env.name,
+    await triggerSlackNotification({
       projectId,
       projectDAL,
       kmsService,
-      secretApprovalRequest,
-      userDAL,
-      projectSlackConfigDAL
+      projectSlackConfigDAL,
+      notification: {
+        type: SlackTriggerFeature.SECRET_APPROVAL,
+        payload: {
+          userEmail: user.email as string,
+          environment: env.name,
+          secretPath,
+          projectId,
+          requestId: secretApprovalRequest.id
+        }
+      }
     });
 
     await sendApprovalEmailsFn({