@ama-work/mcp-atlassian 1.0.1 → 1.1.0

package/README.md

@@ -23,8 +23,9 @@ Add to your `claude_desktop_config.json`:
       "command": "bunx",
       "args": ["@ama-work/mcp-atlassian"],
       "env": {
-        "ATLASSIAN_ACCESS_TOKEN": "your-oauth-access-token",
-        "ATLASSIAN_CLOUD_ID": "your-atlassian-cloud-id"
+        "ATLASSIAN_EMAIL": "you@company.com",
+        "ATLASSIAN_API_TOKEN": "your-api-token",
+        "ATLASSIAN_CLOUD_ID": "your-cloud-id"
       }
     }
   }
@@ -33,21 +34,22 @@ Add to your `claude_desktop_config.json`:
 
 ### Standalone mode
 
-Provide an Atlassian OAuth access token and your cloud ID directly:
+Provide your Atlassian credentials directly via environment variables.
 
-```json
-{
-  "mcpServers": {
-    "atlassian": {
-      "command": "bunx",
-      "args": ["@ama-work/mcp-atlassian"],
-      "env": {
-        "ATLASSIAN_ACCESS_TOKEN": "your-oauth-access-token",
-        "ATLASSIAN_CLOUD_ID": "your-atlassian-cloud-id"
-      }
-    }
-  }
-}
+**1. Create an API token:**
+
+Go to [Atlassian API Tokens](https://id.atlassian.com/manage-profile/security/api-tokens) and create a new token.
+
+**2. Find your Cloud ID:**
+
+Your Cloud ID is the first part of your Atlassian URL. For example, if your Jira is at `https://mycompany.atlassian.net`, your Cloud ID is `mycompany`.
+
+**3. Configure the env vars:**
+
+```
+ATLASSIAN_EMAIL=you@company.com
+ATLASSIAN_API_TOKEN=ATATT3xFfGF0...
+ATLASSIAN_CLOUD_ID=mycompany
 ```
 
 ### Registry-integrated mode
@@ -80,15 +82,6 @@ Import the canonical definition via URL:
 https://raw.githubusercontent.com/Ask-Me-Anything-dot-work/ama-mcp-atlassian/main/definitions/atlassian.json
 ```
 
-### OAuth Setup
-
-Before using this server, register an OAuth 2.0 app at [developer.atlassian.com](https://developer.atlassian.com):
-
-1. Create a new OAuth 2.0 app
-2. Add the required scopes (see `definitions/atlassian.json`)
-3. Copy the **Client ID** and replace `YOUR_ATLASSIAN_CLIENT_ID` in the definition
-4. Generate an access token with the required scopes
-
 ## Tools
 
 **Jira:** `jira_search_issues`, `jira_get_issue`, `jira_create_issue`, `jira_update_issue`, `jira_transition_issue`, `jira_add_comment`, `jira_get_projects`

package/dist/client/atlassian.js

@@ -1,28 +1,61 @@
 import { createCloudClient } from "jira.js";
 import { createV1Client, createV2Client } from "confluence.js";
-import { getToken, getCloudId } from "../config.js";
+import { getAuthConfig } from "../config.js";
+function getHost(authConfig) {
+    if (authConfig.mode === "basic") {
+        return `https://${authConfig.cloudId}.atlassian.net`;
+    }
+    return "https://api.atlassian.com";
+}
 export async function createJiraClient() {
-    const [token, cloudId] = await Promise.all([getToken(), getCloudId()]);
+    const authConfig = await getAuthConfig();
+    const host = getHost(authConfig);
+    if (authConfig.mode === "basic") {
+        return createCloudClient({
+            host,
+            auth: { type: "basic", email: authConfig.email, apiToken: authConfig.apiToken },
+        });
+    }
+    const token = authConfig.mode === "registry" ? authConfig.token : authConfig.token;
     return createCloudClient({
-        host: "https://api.atlassian.com",
-        auth: { type: "oauth2", accessToken: token, cloudId },
+        host,
+        auth: { type: "oauth2", accessToken: token, cloudId: authConfig.cloudId },
         getAuthOn401: async () => {
-            const fresh = await getToken();
-            return { type: "oauth2", accessToken: fresh, cloudId };
+            const fresh = await getAuthConfig();
+            if (fresh.mode === "basic") {
+                return { type: "basic", email: fresh.email, apiToken: fresh.apiToken };
+            }
+            return { type: "oauth2", accessToken: fresh.token, cloudId: fresh.cloudId };
         },
     });
 }
 export async function createConfluenceClient() {
-    const [token, cloudId] = await Promise.all([getToken(), getCloudId()]);
+    const authConfig = await getAuthConfig();
+    const host = getHost(authConfig);
+    if (authConfig.mode === "basic") {
+        return createV2Client({
+            host,
+            auth: { type: "basic", email: authConfig.email, apiToken: authConfig.apiToken },
+        });
+    }
+    const token = authConfig.mode === "registry" ? authConfig.token : authConfig.token;
     return createV2Client({
-        host: "https://api.atlassian.com",
-        auth: { type: "oauth2", accessToken: token, cloudId },
+        host,
+        auth: { type: "oauth2", accessToken: token, cloudId: authConfig.cloudId },
     });
 }
 export async function createConfluenceV1Client() {
-    const [token, cloudId] = await Promise.all([getToken(), getCloudId()]);
+    const authConfig = await getAuthConfig();
+    const host = getHost(authConfig);
+    if (authConfig.mode === "basic") {
+        return createV1Client({
+            host,
+            auth: { type: "basic", email: authConfig.email, apiToken: authConfig.apiToken },
+        });
+    }
+    const token = authConfig.mode === "registry" ? authConfig.token : authConfig.token;
     return createV1Client({
-        host: "https://api.atlassian.com",
-        auth: { type: "oauth2", accessToken: token, cloudId },
+        host,
+        auth: { type: "oauth2", accessToken: token, cloudId: authConfig.cloudId },
     });
 }

package/dist/config.d.ts

@@ -1,2 +1,4 @@
+import type { AuthConfig } from "./types.js";
+export declare function getAuthConfig(): Promise<AuthConfig>;
 export declare function getToken(): Promise<string>;
 export declare function getCloudId(): Promise<string>;

package/dist/config.js

@@ -25,35 +25,54 @@ async function fetchFromRegistry() {
         expiresAt: data.oauth.expires_at,
     };
 }
-function resolveStandalone() {
+function resolveBasicAuth() {
+    const email = env("ATLASSIAN_EMAIL");
+    const apiToken = env("ATLASSIAN_API_TOKEN");
+    const cloudId = env("ATLASSIAN_CLOUD_ID");
+    if (!email || !apiToken || !cloudId)
+        return null;
+    return { mode: "basic", email, apiToken, cloudId };
+}
+function resolveOAuth() {
     const token = env("ATLASSIAN_ACCESS_TOKEN");
     const cloudId = env("ATLASSIAN_CLOUD_ID");
     if (!token || !cloudId)
         return null;
-    return {
-        token,
-        cloudId,
-        expiresAt: Number.MAX_SAFE_INTEGER,
-    };
+    return { mode: "oauth2", token, cloudId };
 }
 function isExpired(c) {
     return Date.now() >= c.expiresAt - REFRESH_BUFFER_MS;
 }
-async function load() {
-    const standalone = resolveStandalone();
-    if (standalone)
-        return standalone;
+async function loadTokenCache() {
+    const basicAuth = resolveBasicAuth();
+    if (basicAuth && basicAuth.mode === "basic") {
+        return { token: basicAuth.apiToken, cloudId: basicAuth.cloudId, expiresAt: Number.MAX_SAFE_INTEGER };
+    }
+    const oauth = resolveOAuth();
+    if (oauth && oauth.mode === "oauth2") {
+        return { token: oauth.token, cloudId: oauth.cloudId, expiresAt: Number.MAX_SAFE_INTEGER };
+    }
     return fetchFromRegistry();
 }
+export async function getAuthConfig() {
+    const basicAuth = resolveBasicAuth();
+    if (basicAuth)
+        return basicAuth;
+    const oauth = resolveOAuth();
+    if (oauth)
+        return oauth;
+    const cached = await loadTokenCache();
+    return { mode: "registry", token: cached.token, cloudId: cached.cloudId, expiresAt: cached.expiresAt };
+}
 export async function getToken() {
     if (!cache || isExpired(cache)) {
-        cache = await load();
+        cache = await loadTokenCache();
     }
     return cache.token;
 }
 export async function getCloudId() {
     if (!cache || isExpired(cache)) {
-        cache = await load();
+        cache = await loadTokenCache();
     }
     return cache.cloudId;
 }

package/dist/types.d.ts

@@ -12,3 +12,18 @@ export interface TokenCache {
     cloudId: string;
     expiresAt: number;
 }
+export type AuthConfig = {
+    mode: "basic";
+    email: string;
+    apiToken: string;
+    cloudId: string;
+} | {
+    mode: "oauth2";
+    token: string;
+    cloudId: string;
+} | {
+    mode: "registry";
+    token: string;
+    cloudId: string;
+    expiresAt: number;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ama-work/mcp-atlassian",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Standalone TypeScript MCP server wrapping the Atlassian REST API (Jira + Confluence)",
   "main": "dist/index.js",
   "type": "module",