jenkins-slack-mcp 2.0.1 → 2.1.0

package/auth/jenkins-auth.js

@@ -1,5 +1,5 @@
 const axios = require('axios');
-e readconst open = require('open');
+const open = require('open');
 
 async function openJenkinsTokenPage(baseUrl) {
   const tokenUrl = `${baseUrl}/me/configure`;

package/auth/slack-auth.js

@@ -1,22 +1,88 @@
 const axios = require('axios');
+const express = require('express');
+const open = require('open');
+const crypto = require('crypto');
+
+const SCOPES = 'chat:write,users:read,im:write';
+
+async function slackOAuthLogin(clientId, clientSecret) {
+  if (!clientId || !clientSecret) {
+    throw new Error('Set SLACK_CLIENT_ID and SLACK_CLIENT_SECRET environment variables');
+  }
+
+  return new Promise((resolve, reject) => {
+    const app = express();
+    const state = crypto.randomBytes(16).toString('hex');
+    let server;
+
+    const timeout = setTimeout(() => {
+      server?.close();
+      reject(new Error('OAuth timed out after 2 minutes'));
+    }, 120000);
+
+    app.get('/slack/callback', async (req, res) => {
+      try {
+        if (req.query.state !== state) {
+          res.status(400).send('Invalid state');
+          return;
+        }
+        if (req.query.error) {
+          res.send(`<h2>❌ ${req.query.error}</h2>`);
+          reject(new Error(req.query.error));
+          return;
+        }
+
+        // Exchange code for token
+        const tokenResp = await axios.post('https://slack.com/api/oauth.v2.access', null, {
+          params: {
+            client_id: clientId,
+            client_secret: clientSecret,
+            code: req.query.code,
+            redirect_uri: `http://localhost:${server.address().port}/slack/callback`,
+          },
+        });
+
+        if (!tokenResp.data.ok) {
+          res.send(`<h2>❌ ${tokenResp.data.error}</h2>`);
+          reject(new Error(tokenResp.data.error));
+          return;
+        }
+
+        const { access_token: botToken, authed_user } = tokenResp.data;
+        const userId = authed_user?.id;
+
+        res.send('<h2>✅ Slack connected! You can close this tab.</h2>');
+        clearTimeout(timeout);
+        server.close();
+        resolve({ botToken, userId });
+      } catch (err) {
+        res.status(500).send(`<h2>❌ ${err.message}</h2>`);
+        clearTimeout(timeout);
+        server.close();
+        reject(err);
+      }
+    });
+
+    server = app.listen(0, () => {
+      const port = server.address().port;
+      const redirectUri = encodeURIComponent(`http://localhost:${port}/slack/callback`);
+      const url = `https://slack.com/oauth/v2/authorize?client_id=${clientId}&scope=${SCOPES}&user_scope=&state=${state}&redirect_uri=${redirectUri}`;
+      open(url);
+    });
+  });
+}
 
 async function sendSlackDM(botToken, userId, message) {
-  // Open DM channel with user
-  const openResp = await axios.post('https://slack.com/api/conversations.open', 
+  const openResp = await axios.post('https://slack.com/api/conversations.open',
     { users: userId },
     { headers: { Authorization: `Bearer ${botToken}`, 'Content-Type': 'application/json' } }
   );
-  
   if (!openResp.data.ok) throw new Error(`Slack DM open failed: ${openResp.data.error}`);
-  
-  const channelId = openResp.data.channel.id;
-  
-  // Send message
+
   const msgResp = await axios.post('https://slack.com/api/chat.postMessage',
-    { channel: channelId, text: message },
+    { channel: openResp.data.channel.id, text: message },
     { headers: { Authorization: `Bearer ${botToken}`, 'Content-Type': 'application/json' } }
   );
-  
   if (!msgResp.data.ok) throw new Error(`Slack message failed: ${msgResp.data.error}`);
 }
 
@@ -28,4 +94,4 @@ async function postToChannel(botToken, channel, message) {
   if (!resp.data.ok) throw new Error(`Slack post failed: ${resp.data.error}`);
 }
 
-module.exports = { sendSlackDM, postToChannel };
+module.exports = { slackOAuthLogin, sendSlackDM, postToChannel };

package/mcp-server.js

@@ -4,9 +4,9 @@ const { StdioServerTransport } = require('@modelcontextprotocol/sdk/server/stdio
 const { CallToolRequestSchema, ListToolsRequestSchema } = require('@modelcontextprotocol/sdk/types.js');
 const { getCredentials, saveJenkinsCredentials, saveSlackConfig, saveJobs, getJobs, clearAll } = require('./auth/credentials');
 const { openJenkinsTokenPage, validateAndFetchUser, fetchAllJobs, fetchJobParams, triggerBuild } = require('./auth/jenkins-auth');
-const { sendSlackDM, postToChannel } = require('./auth/slack-auth');
+const { slackOAuthLogin, sendSlackDM, postToChannel } = require('./auth/slack-auth');
 
-const server = new Server({ name: 'jenkins-slack-mcp', version: '1.0.4' }, { capabilities: { tools: {} } });
+const server = new Server({ name: 'jenkins-slack-mcp', version: '2.1.0' }, { capabilities: { tools: {} } });
 
 server.setRequestHandler(ListToolsRequestSchema, async () => ({
   tools: [
@@ -25,16 +25,9 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
       },
     },
     {
-      name: 'setup_slack',
-      description: 'Configure Slack notifications. Set bot token and your Slack User ID to receive DMs on build trigger.',
-      inputSchema: {
-        type: 'object',
-        properties: {
-          botToken: { type: 'string', description: 'Slack Bot OAuth Token (xoxb-...)' },
-          userId: { type: 'string', description: 'Your Slack User ID (found in Profile → ... → Copy Member ID)' },
-        },
-        required: ['botToken', 'userId'],
-      },
+      name: 'login_slack',
+      description: 'Login to Slack via OAuth. Opens browser for authorization. Requires SLACK_CLIENT_ID and SLACK_CLIENT_SECRET env vars.',
+      inputSchema: { type: 'object', properties: {} },
     },
     {
       name: 'status',
@@ -139,20 +132,20 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
 
         const creds = getCredentials();
         if (!creds.slack) {
-          msg += `\n\n💡 Set up Slack notifications with **setup_slack** to get DMs on build trigger.`;
+          msg += `\n\n💡 Use **login_slack** to connect Slack and get DM notifications on build trigger.`;
         }
         return text(msg);
       }
 
-      case 'setup_slack': {
-        saveSlackConfig({ botToken: args.botToken, userId: args.userId });
+      case 'login_slack': {
+        const { botToken, userId } = await slackOAuthLogin(process.env.SLACK_CLIENT_ID, process.env.SLACK_CLIENT_SECRET);
+        saveSlackConfig({ botToken, userId });
 
-        // Test by sending a welcome DM
         try {
-          await sendSlackDM(args.botToken, args.userId, '✅ Jenkins-Slack MCP connected! You will receive build notifications here.');
-          return text(`✅ Slack configured!\n- User ID: ${args.userId}\n- ✉️ Test DM sent to you successfully.`);
+          await sendSlackDM(botToken, userId, '✅ Jenkins-Slack MCP connected! You will receive build notifications here.');
+          return text(`✅ Slack connected via OAuth!\n- User ID: ${userId}\n- ✉️ Test DM sent successfully.`);
         } catch (err) {
-          return text(`⚠️ Slack config saved but test DM failed: ${err.message}\nCheck your bot token and user ID.`);
+          return text(`✅ Slack OAuth successful (User: ${userId}) but test DM failed: ${err.message}`);
         }
       }
 
@@ -164,7 +157,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           : '❌ Jenkins: not logged in. Use **login_jenkins** to connect.';
         const slack = creds.slack
           ? `✅ Slack: User ID ${creds.slack.userId} (DM notifications enabled)`
-          : '❌ Slack: not configured. Use **setup_slack** to enable notifications.';
+          : '❌ Slack: not configured. Use **login_slack** to enable notifications.';
         return text(`${jenkins}\n${slack}\n📋 Jobs available: ${jobCount}`);
       }
 
@@ -267,7 +260,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         }
 
         if (!creds.slack) {
-          msg += `\n\n💡 Set up **setup_slack** to get DM notifications on every build.`;
+          msg += `\n\n💡 Use **login_slack** to get DM notifications on every build.`;
         }
 
         return text(msg);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jenkins-slack-mcp",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "MCP server to trigger Jenkins builds from any IDE. Auto-discovers jobs, browser login, Slack DM notifications.",
   "main": "mcp-server.js",
   "bin": {