Revert "pass slack tokens from api service"

This reverts commit 51b73bc.

Author: tkotthakota-adobe

src/utils/slack-utils.js

@@ -26,10 +26,10 @@ export async function say(env, log, slackContext, message) {
       channelId: slackContext.channelId,
       threadTs: slackContext.threadTs,
       env: {
-        SLACK_BOT_TOKEN: slackContext.slackBotToken,
-        SLACK_SIGNING_SECRET: slackContext.slackSigningSecret,
-        SLACK_TOKEN_WORKSPACE_INTERNAL: slackContext.slackTokenWorkspaceInternal,
-        SLACK_OPS_CHANNEL_WORKSPACE_INTERNAL: slackContext.slackOpsChannelWorkspaceInternal,
+        SLACK_BOT_TOKEN: env.SLACK_BOT_TOKEN,
+        SLACK_SIGNING_SECRET: env.SLACK_SIGNING_SECRET,
+        SLACK_TOKEN_WORKSPACE_INTERNAL: env.SLACK_TOKEN_WORKSPACE_INTERNAL,
+        SLACK_OPS_CHANNEL_WORKSPACE_INTERNAL: env.SLACK_OPS_CHANNEL_WORKSPACE_INTERNAL,
       },
     };
     const slackTarget = SLACK_TARGETS.WORKSPACE_INTERNAL;

test/utils/slack-utils.test.js

@@ -66,17 +66,43 @@ describe('slack-utils', () => {
     beforeEach(() => {
       log = { error: sinon.spy() };
       env = {
-        slackBotToken: 'test-bot-token',
-        slackSigningSecret: 'test-signing-secret',
-        slackTokenWorkspaceInternal: 'test-workspace-token',
-        slackOpsChannelWorkspaceInternal: 'test-ops-channel',
+        SLACK_BOT_TOKEN: 'test-bot-token',
+        SLACK_SIGNING_SECRET: 'test-signing-secret',
+        SLACK_TOKEN_WORKSPACE_INTERNAL: 'test-workspace-token',
+        SLACK_OPS_CHANNEL_WORKSPACE_INTERNAL: 'test-ops-channel',
       };
       slackContext = {
         channelId: 'C12345678',
         threadTs: '12345.67890',
       };
     });
 
+    it('should send a message to Slack when all parameters are valid', async () => {
+      mockHasText.returns(true);
+
+      await say(env, log, slackContext, 'Test message');
+
+      expect(mockBaseSlackClient.createFrom.calledOnce).to.be.true;
+      expect(mockBaseSlackClient.createFrom.calledWith({
+        channelId: 'C12345678',
+        threadTs: '12345.67890',
+        env: {
+          SLACK_BOT_TOKEN: 'test-bot-token',
+          SLACK_SIGNING_SECRET: 'test-signing-secret',
+          SLACK_TOKEN_WORKSPACE_INTERNAL: 'test-workspace-token',
+          SLACK_OPS_CHANNEL_WORKSPACE_INTERNAL: 'test-ops-channel',
+        },
+      }, 'workspace_internal')).to.be.true;
+
+      expect(mockSlackClient.postMessage.calledOnce).to.be.true;
+      expect(mockSlackClient.postMessage.calledWith({
+        channel: 'C12345678',
+        thread_ts: '12345.67890',
+        text: 'Test message',
+        unfurl_links: false,
+      })).to.be.true;
+    });
+
     it('should not send message if threadTs is missing or empty', async () => {
       mockHasText.withArgs('C12345678').returns(true);
       mockHasText.withArgs('').returns(false);
@@ -156,6 +182,32 @@ describe('slack-utils', () => {
       })).to.be.true;
     });
 
+    it('should handle error when env is missing required properties', async () => {
+      const incompleteEnv = {
+        SLACK_BOT_TOKEN: 'test-bot-token',
+        // Missing other required properties
+      };
+
+      // Make BaseSlackClient.createFrom throw when it receives incomplete env
+      mockBaseSlackClient.createFrom.withArgs(sinon.match({
+        env: sinon.match({
+          SLACK_BOT_TOKEN: 'test-bot-token',
+          SLACK_SIGNING_SECRET: undefined,
+          SLACK_TOKEN_WORKSPACE_INTERNAL: undefined,
+          SLACK_OPS_CHANNEL_WORKSPACE_INTERNAL: undefined,
+        }),
+      })).throws(new Error('Missing required environment variables'));
+
+      await say(incompleteEnv, log, slackContext, 'Test message');
+
+      expect(log.error.calledOnce).to.be.true;
+      expect(log.error.calledWith('Error sending Slack message:', {
+        error: 'Missing required environment variables',
+        stack: sinon.match.string,
+        errorType: 'Error',
+      })).to.be.true;
+    });
+
     it('should handle empty message string', async () => {
       mockHasText.returns(true);