outlook-cli 1.2.0 → 1.2.1

package/auth/token-manager.js

@@ -50,6 +50,34 @@ function getTokenStorage() {
   return tokenStorage;
 }
 
+function updateAuthConfig(partialConfig = {}) {
+  const nextConfig = {
+    ...config.AUTH_CONFIG,
+    ...partialConfig
+  };
+
+  config.AUTH_CONFIG.clientId = nextConfig.clientId;
+  config.AUTH_CONFIG.clientSecret = nextConfig.clientSecret;
+  config.AUTH_CONFIG.redirectUri = nextConfig.redirectUri;
+  config.AUTH_CONFIG.scopes = nextConfig.scopes;
+  config.AUTH_CONFIG.tokenStorePath = nextConfig.tokenStorePath;
+  config.AUTH_CONFIG.authServerUrl = nextConfig.authServerUrl;
+  config.AUTH_CONFIG.tokenEndpoint = nextConfig.tokenEndpoint;
+
+  if (tokenStorage) {
+    const existingTokens = tokenStorage.tokens;
+    tokenStorage = new TokenStorage({
+      tokenStorePath: config.AUTH_CONFIG.tokenStorePath,
+      clientId: config.AUTH_CONFIG.clientId,
+      clientSecret: config.AUTH_CONFIG.clientSecret,
+      redirectUri: config.AUTH_CONFIG.redirectUri,
+      scopes: config.AUTH_CONFIG.scopes,
+      tokenEndpoint: config.AUTH_CONFIG.tokenEndpoint
+    });
+    tokenStorage.tokens = existingTokens;
+  }
+}
+
 /**
  * Loads authentication tokens from the token file
  * @returns {object|null} - The loaded tokens or null if not available
@@ -195,5 +223,6 @@ module.exports = {
   getAccessToken,
   getValidAccessToken,
   createTestTokens,
-  clearTokenCache
+  clearTokenCache,
+  updateAuthConfig
 };

package/cli.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 /**
  * Production-oriented local CLI for outlook-cli.
  *
@@ -11,6 +11,7 @@ const fs = require('fs');
 const http = require('http');
 const https = require('https');
 const path = require('path');
+const readline = require('readline');
 const { spawn, spawnSync } = require('child_process');
 const chalk = require('chalk');
 
@@ -442,7 +443,9 @@ function printUsage() {
     '  tools list',
     '  tools schema <tool-name>',
     '  call <tool-name> [--args-json "{...}"] [--arg key=value]',
-    '  auth status|url|login|logout',
+    '  auth status|url|login|logout|server',
+    '    auth login [--client-id <id>] [--client-secret <secret>] [--prompt-credentials true|false]',
+    '    auth server [--status] [--start]',
     '  update [--run] [--to latest|x.y.z]',
     '  doctor',
     '',
@@ -471,12 +474,81 @@ function getAuthUrl() {
   return `${config.AUTH_CONFIG.authServerUrl}/auth?client_id=${config.AUTH_CONFIG.clientId}`;
 }
 
+function applyRuntimeAuthConfig(partialConfig = {}) {
+  const nextConfig = {
+    ...config.AUTH_CONFIG,
+    ...partialConfig
+  };
+
+  if (nextConfig.clientId) {
+    process.env.OUTLOOK_CLIENT_ID = nextConfig.clientId;
+    process.env.MS_CLIENT_ID = nextConfig.clientId;
+  }
+
+  if (nextConfig.clientSecret) {
+    process.env.OUTLOOK_CLIENT_SECRET = nextConfig.clientSecret;
+    process.env.MS_CLIENT_SECRET = nextConfig.clientSecret;
+  }
+
+  tokenManager.updateAuthConfig(nextConfig);
+}
+
+function promptLine(promptText) {
+  return new Promise((resolve) => {
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+
+    rl.question(promptText, (answer) => {
+      rl.close();
+      resolve(String(answer || '').trim());
+    });
+  });
+}
+
+async function ensureAuthCredentials(options, outputMode) {
+  let clientId = readOption(options, 'clientId', config.AUTH_CONFIG.clientId);
+  let clientSecret = readOption(options, 'clientSecret', config.AUTH_CONFIG.clientSecret);
+  const promptCredentials = asBoolean(readOption(options, 'promptCredentials', true), true);
+  const canPrompt = outputMode === 'text' && process.stdin.isTTY && process.stdout.isTTY;
+
+  if ((!clientId || !clientSecret) && promptCredentials && canPrompt) {
+    if (outputMode === 'text') {
+      process.stdout.write(`${badge('warn')} Missing Microsoft app credentials. Provide values now or pass --client-id/--client-secret.\n`);
+    }
+
+    if (!clientId) {
+      clientId = await promptLine('MS_CLIENT_ID (or OUTLOOK_CLIENT_ID): ');
+    }
+
+    if (!clientSecret) {
+      clientSecret = await promptLine('MS_CLIENT_SECRET (or OUTLOOK_CLIENT_SECRET): ');
+    }
+  }
+
+  if (clientId || clientSecret) {
+    applyRuntimeAuthConfig({
+      clientId,
+      clientSecret
+    });
+  }
+
+  if (!config.AUTH_CONFIG.clientId) {
+    throw new CliError('Client ID is missing. Set OUTLOOK_CLIENT_ID or MS_CLIENT_ID, or pass --client-id.', 1);
+  }
+
+  if (!config.AUTH_CONFIG.clientSecret) {
+    throw new CliError('Client secret is missing. Set OUTLOOK_CLIENT_SECRET or MS_CLIENT_SECRET, or pass --client-secret.', 1);
+  }
+}
+
 function buildCommandCatalog() {
   const toolCatalog = listTools();
 
   return {
     commandGroups: {
-      auth: ['status', 'url', 'login', 'logout'],
+      auth: ['status', 'url', 'login', 'logout', 'server'],
       email: ['list', 'search', 'read', 'send', 'mark-read'],
       calendar: ['list', 'create', 'decline', 'cancel', 'delete'],
       folder: ['list', 'create', 'move'],
@@ -594,20 +666,27 @@ function openInBrowser(url) {
   spawn('xdg-open', [url], { detached: true, stdio: 'ignore' }).unref();
 }
 
-function startAuthServer(outputMode) {
+function startAuthServer(outputMode, runtime = {}) {
   const scriptPath = path.join(__dirname, 'outlook-auth-server.js');
 
   if (!fs.existsSync(scriptPath)) {
     throw new CliError(`Auth server script not found: ${scriptPath}`, 1);
   }
 
+  const detached = asBoolean(runtime.detached, false);
+
   const child = spawn(process.execPath, [scriptPath], {
     cwd: __dirname,
     windowsHide: true,
     stdio: 'ignore',
-    env: process.env
+    env: process.env,
+    detached
   });
 
+  if (detached) {
+    child.unref();
+  }
+
   child.on('error', (error) => {
     if (outputMode === 'text') {
       process.stderr.write(`Auth server failed to start: ${error.message}\n`);
@@ -617,6 +696,53 @@ function startAuthServer(outputMode) {
   return child;
 }
 
+async function handleAuthServerCommand(options, outputMode) {
+  const shouldStart = asBoolean(readOption(options, 'start', false), false);
+  const shouldStatus = asBoolean(readOption(options, 'status', !shouldStart), !shouldStart);
+
+  if (!shouldStart && !shouldStatus) {
+    throw new UsageError(`Usage: ${cliCommand('auth server [--status] [--start]')}`);
+  }
+
+  if (shouldStart) {
+    const isAlreadyRunning = await httpProbe(config.AUTH_CONFIG.authServerUrl);
+    if (!isAlreadyRunning) {
+      startAuthServer(outputMode, { detached: true });
+      const ready = await waitForProbe(config.AUTH_CONFIG.authServerUrl, 10000);
+      if (!ready) {
+        throw new CliError('Auth server did not become ready on time.', 1);
+      }
+    }
+
+    printSuccess(outputMode, {
+      ok: true,
+      command: 'auth server --start',
+      data: {
+        authServerUrl: config.AUTH_CONFIG.authServerUrl,
+        alreadyRunning: isAlreadyRunning
+      },
+      message: isAlreadyRunning
+        ? `Auth server already running at ${config.AUTH_CONFIG.authServerUrl}.`
+        : `Auth server started at ${config.AUTH_CONFIG.authServerUrl}.`
+    });
+
+    return;
+  }
+
+  const reachable = await httpProbe(config.AUTH_CONFIG.authServerUrl);
+  printSuccess(outputMode, {
+    ok: true,
+    command: 'auth server --status',
+    data: {
+      authServerUrl: config.AUTH_CONFIG.authServerUrl,
+      running: reachable
+    },
+    message: reachable
+      ? `Auth server is reachable at ${config.AUTH_CONFIG.authServerUrl}.`
+      : `Auth server is not reachable at ${config.AUTH_CONFIG.authServerUrl}.`
+  });
+}
+
 async function waitForValidToken(timeoutMs, onTick) {
   const start = Date.now();
   let attempts = 0;
@@ -665,6 +791,11 @@ async function handleAuthCommand(action, options, outputMode) {
     }
 
     case 'url': {
+      const providedClientId = readOption(options, 'clientId');
+      if (providedClientId) {
+        applyRuntimeAuthConfig({ clientId: String(providedClientId).trim() });
+      }
+
       const authUrl = getAuthUrl();
       printSuccess(outputMode, {
         ok: true,
@@ -687,6 +818,8 @@ async function handleAuthCommand(action, options, outputMode) {
     }
 
     case 'login': {
+      await ensureAuthCredentials(options, outputMode);
+
       const force = asBoolean(readOption(options, 'force', false));
       const shouldOpen = asBoolean(readOption(options, 'open', true), true);
       const shouldStartServer = asBoolean(readOption(options, 'startServer', true), true);
@@ -718,7 +851,7 @@ async function handleAuthCommand(action, options, outputMode) {
         const runningBefore = await httpProbe(config.AUTH_CONFIG.authServerUrl);
         if (!runningBefore && shouldStartServer) {
           startSpinner = createSpinner('Starting auth server...', outputMode).start();
-          startedServer = startAuthServer(outputMode);
+          startedServer = startAuthServer(outputMode, { detached: false });
           const ready = await waitForProbe(
             config.AUTH_CONFIG.authServerUrl,
             10000,
@@ -812,8 +945,13 @@ async function handleAuthCommand(action, options, outputMode) {
       return;
     }
 
+    case 'server': {
+      await handleAuthServerCommand(options, outputMode);
+      return;
+    }
+
     default:
-      throw new UsageError('Unknown auth command. Use: auth status|url|login|logout');
+      throw new UsageError('Unknown auth command. Use: auth status|url|login|logout|server');
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "outlook-cli",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Production-ready Outlook CLI with optional MCP server mode powered by Microsoft Graph API",
   "keywords": [
     "outlook-cli",

package/rules/index.js

@@ -1,14 +1,11 @@
 /**
  * Email rules management module for Outlook MCP server
  */
-const handleListRules = require('./list');
+const { handleListRules, getInboxRules } = require('./list');
 const handleCreateRule = require('./create');
 const { ensureAuthenticated } = require('../auth');
 const { callGraphAPI } = require('../utils/graph-api');
 
-// Import getInboxRules for the edit sequence tool
-const { getInboxRules } = require('./list');
-
 /**
  * Edit rule sequence handler
  * @param {object} args - Tool arguments