Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/deploy-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ jobs:
POSTHOG_PROJECT_ID: ${{ secrets.POSTHOG_PROJECT_ID }}
KV_REST_API_URL: ${{ secrets.KV_REST_API_URL }}
KV_REST_API_TOKEN: ${{ secrets.KV_REST_API_TOKEN }}
KV_URL: ${{ secrets.KV_URL }}
RESEND_API_KEY: ${{ secrets.RESEND_API_KEY }}
LINEAR_CLIENT_ID: ${{ secrets.LINEAR_CLIENT_ID }}
LINEAR_CLIENT_SECRET: ${{ secrets.LINEAR_CLIENT_SECRET }}
Expand Down Expand Up @@ -223,6 +224,7 @@ jobs:
--env POSTHOG_PROJECT_ID=$POSTHOG_PROJECT_ID \
--env KV_REST_API_URL=$KV_REST_API_URL \
--env KV_REST_API_TOKEN=$KV_REST_API_TOKEN \
--env KV_URL=$KV_URL \
--env RESEND_API_KEY=$RESEND_API_KEY \
--env LINEAR_CLIENT_ID=$LINEAR_CLIENT_ID \
--env LINEAR_CLIENT_SECRET=$LINEAR_CLIENT_SECRET \
Expand Down Expand Up @@ -316,6 +318,7 @@ jobs:
NEXT_PUBLIC_SENTRY_ENVIRONMENT: ${{ vars.NEXT_PUBLIC_SENTRY_ENVIRONMENT }}
KV_REST_API_URL: ${{ secrets.KV_REST_API_URL }}
KV_REST_API_TOKEN: ${{ secrets.KV_REST_API_TOKEN }}
KV_URL: ${{ secrets.KV_URL }}
RESEND_API_KEY: ${{ secrets.RESEND_API_KEY }}
STRIPE_SECRET_KEY: ${{ secrets.STRIPE_SECRET_KEY }}
STRIPE_WEBHOOK_SECRET: ${{ secrets.STRIPE_WEBHOOK_SECRET }}
Expand All @@ -340,6 +343,7 @@ jobs:
--env NEXT_PUBLIC_SENTRY_ENVIRONMENT=$NEXT_PUBLIC_SENTRY_ENVIRONMENT \
--env KV_REST_API_URL=$KV_REST_API_URL \
--env KV_REST_API_TOKEN=$KV_REST_API_TOKEN \
--env KV_URL=$KV_URL \
--env RESEND_API_KEY=$RESEND_API_KEY \
--env STRIPE_SECRET_KEY=$STRIPE_SECRET_KEY \
--env STRIPE_WEBHOOK_SECRET=$STRIPE_WEBHOOK_SECRET \
Expand Down Expand Up @@ -407,6 +411,7 @@ jobs:
NEXT_PUBLIC_SENTRY_ENVIRONMENT: ${{ vars.NEXT_PUBLIC_SENTRY_ENVIRONMENT }}
KV_REST_API_URL: ${{ secrets.KV_REST_API_URL }}
KV_REST_API_TOKEN: ${{ secrets.KV_REST_API_TOKEN }}
KV_URL: ${{ secrets.KV_URL }}
RESEND_API_KEY: ${{ secrets.RESEND_API_KEY }}
STRIPE_SECRET_KEY: ${{ secrets.STRIPE_SECRET_KEY }}
STRIPE_WEBHOOK_SECRET: ${{ secrets.STRIPE_WEBHOOK_SECRET }}
Expand All @@ -428,6 +433,7 @@ jobs:
--env NEXT_PUBLIC_SENTRY_ENVIRONMENT=$NEXT_PUBLIC_SENTRY_ENVIRONMENT \
--env KV_REST_API_URL=$KV_REST_API_URL \
--env KV_REST_API_TOKEN=$KV_REST_API_TOKEN \
--env KV_URL=$KV_URL \
--env RESEND_API_KEY=$RESEND_API_KEY \
--env STRIPE_SECRET_KEY=$STRIPE_SECRET_KEY \
--env STRIPE_WEBHOOK_SECRET=$STRIPE_WEBHOOK_SECRET \
Expand Down Expand Up @@ -510,6 +516,7 @@ jobs:
NEXT_PUBLIC_SENTRY_ENVIRONMENT: ${{ vars.NEXT_PUBLIC_SENTRY_ENVIRONMENT }}
KV_REST_API_URL: ${{ secrets.KV_REST_API_URL }}
KV_REST_API_TOKEN: ${{ secrets.KV_REST_API_TOKEN }}
KV_URL: ${{ secrets.KV_URL }}
RESEND_API_KEY: ${{ secrets.RESEND_API_KEY }}
STRIPE_SECRET_KEY: ${{ secrets.STRIPE_SECRET_KEY }}
STRIPE_WEBHOOK_SECRET: ${{ secrets.STRIPE_WEBHOOK_SECRET }}
Expand All @@ -535,6 +542,7 @@ jobs:
--env NEXT_PUBLIC_SENTRY_ENVIRONMENT=$NEXT_PUBLIC_SENTRY_ENVIRONMENT \
--env KV_REST_API_URL=$KV_REST_API_URL \
--env KV_REST_API_TOKEN=$KV_REST_API_TOKEN \
--env KV_URL=$KV_URL \
--env RESEND_API_KEY=$RESEND_API_KEY \
--env STRIPE_SECRET_KEY=$STRIPE_SECRET_KEY \
--env STRIPE_WEBHOOK_SECRET=$STRIPE_WEBHOOK_SECRET \
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/deploy-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ jobs:
POSTHOG_PROJECT_ID: ${{ secrets.POSTHOG_PROJECT_ID }}
KV_REST_API_URL: ${{ secrets.KV_REST_API_URL }}
KV_REST_API_TOKEN: ${{ secrets.KV_REST_API_TOKEN }}
KV_URL: ${{ secrets.KV_URL }}
RESEND_API_KEY: ${{ secrets.RESEND_API_KEY }}
LINEAR_CLIENT_ID: ${{ secrets.LINEAR_CLIENT_ID }}
LINEAR_CLIENT_SECRET: ${{ secrets.LINEAR_CLIENT_SECRET }}
Expand Down Expand Up @@ -127,6 +128,7 @@ jobs:
--env POSTHOG_PROJECT_ID=$POSTHOG_PROJECT_ID \
--env KV_REST_API_URL=$KV_REST_API_URL \
--env KV_REST_API_TOKEN=$KV_REST_API_TOKEN \
--env KV_URL=$KV_URL \
--env RESEND_API_KEY=$RESEND_API_KEY \
--env LINEAR_CLIENT_ID=$LINEAR_CLIENT_ID \
--env LINEAR_CLIENT_SECRET=$LINEAR_CLIENT_SECRET \
Expand Down Expand Up @@ -192,6 +194,7 @@ jobs:
NEXT_PUBLIC_SENTRY_ENVIRONMENT: ${{ vars.NEXT_PUBLIC_SENTRY_ENVIRONMENT }}
KV_REST_API_URL: ${{ secrets.KV_REST_API_URL }}
KV_REST_API_TOKEN: ${{ secrets.KV_REST_API_TOKEN }}
KV_URL: ${{ secrets.KV_URL }}
RESEND_API_KEY: ${{ secrets.RESEND_API_KEY }}
STRIPE_SECRET_KEY: ${{ secrets.STRIPE_SECRET_KEY }}
STRIPE_WEBHOOK_SECRET: ${{ secrets.STRIPE_WEBHOOK_SECRET }}
Expand All @@ -216,6 +219,7 @@ jobs:
--env NEXT_PUBLIC_SENTRY_ENVIRONMENT=$NEXT_PUBLIC_SENTRY_ENVIRONMENT \
--env KV_REST_API_URL=$KV_REST_API_URL \
--env KV_REST_API_TOKEN=$KV_REST_API_TOKEN \
--env KV_URL=$KV_URL \
--env RESEND_API_KEY=$RESEND_API_KEY \
--env STRIPE_SECRET_KEY=$STRIPE_SECRET_KEY \
--env STRIPE_WEBHOOK_SECRET=$STRIPE_WEBHOOK_SECRET \
Expand Down Expand Up @@ -267,6 +271,7 @@ jobs:
NEXT_PUBLIC_SENTRY_ENVIRONMENT: ${{ vars.NEXT_PUBLIC_SENTRY_ENVIRONMENT }}
KV_REST_API_URL: ${{ secrets.KV_REST_API_URL }}
KV_REST_API_TOKEN: ${{ secrets.KV_REST_API_TOKEN }}
KV_URL: ${{ secrets.KV_URL }}
RESEND_API_KEY: ${{ secrets.RESEND_API_KEY }}
STRIPE_SECRET_KEY: ${{ secrets.STRIPE_SECRET_KEY }}
STRIPE_WEBHOOK_SECRET: ${{ secrets.STRIPE_WEBHOOK_SECRET }}
Expand All @@ -288,6 +293,7 @@ jobs:
--env NEXT_PUBLIC_SENTRY_ENVIRONMENT=$NEXT_PUBLIC_SENTRY_ENVIRONMENT \
--env KV_REST_API_URL=$KV_REST_API_URL \
--env KV_REST_API_TOKEN=$KV_REST_API_TOKEN \
--env KV_URL=$KV_URL \
--env RESEND_API_KEY=$RESEND_API_KEY \
--env STRIPE_SECRET_KEY=$STRIPE_SECRET_KEY \
--env STRIPE_WEBHOOK_SECRET=$STRIPE_WEBHOOK_SECRET \
Expand Down Expand Up @@ -343,6 +349,7 @@ jobs:
NEXT_PUBLIC_SENTRY_ENVIRONMENT: ${{ vars.NEXT_PUBLIC_SENTRY_ENVIRONMENT }}
KV_REST_API_URL: ${{ secrets.KV_REST_API_URL }}
KV_REST_API_TOKEN: ${{ secrets.KV_REST_API_TOKEN }}
KV_URL: ${{ secrets.KV_URL }}
RESEND_API_KEY: ${{ secrets.RESEND_API_KEY }}
STRIPE_SECRET_KEY: ${{ secrets.STRIPE_SECRET_KEY }}
STRIPE_WEBHOOK_SECRET: ${{ secrets.STRIPE_WEBHOOK_SECRET }}
Expand All @@ -368,6 +375,7 @@ jobs:
--env NEXT_PUBLIC_SENTRY_ENVIRONMENT=$NEXT_PUBLIC_SENTRY_ENVIRONMENT \
--env KV_REST_API_URL=$KV_REST_API_URL \
--env KV_REST_API_TOKEN=$KV_REST_API_TOKEN \
--env KV_URL=$KV_URL \
--env RESEND_API_KEY=$RESEND_API_KEY \
--env STRIPE_SECRET_KEY=$STRIPE_SECRET_KEY \
--env STRIPE_WEBHOOK_SECRET=$STRIPE_WEBHOOK_SECRET \
Expand Down
2 changes: 1 addition & 1 deletion apps/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
"@trpc/server": "^11.7.1",
"@upstash/qstash": "^2.8.4",
"@vercel/blob": "^2.0.0",
"@vercel/mcp-adapter": "^1.0.0",
"better-auth": "1.4.17",
"date-fns": "^4.1.0",
"drizzle-orm": "0.45.1",
"import-in-the-middle": "2.0.1",
"jose": "^6.1.3",
"lodash.chunk": "^4.2.0",
"mcp-handler": "^1.0.7",
"next": "^16.0.10",
"react": "19.1.0",
"react-dom": "19.1.0",
Expand Down
142 changes: 45 additions & 97 deletions apps/api/src/app/api/agent/[transport]/route.ts
Original file line number Diff line number Diff line change
@@ -1,130 +1,78 @@
import { auth } from "@superset/auth/server";
import { createMcpHandler, withMcpAuth } from "@vercel/mcp-adapter";
import { buildMcpContext, type McpContext } from "@/lib/mcp/auth";
import { registerMcpTools } from "@/lib/mcp/tools";

/**
* Verify token using Better Auth (API key or OAuth)
* Returns AuthInfo with McpContext in extra field
*/
async function verifyToken(
req: Request,
bearerToken?: string,
): Promise<
| {
token: string;
clientId: string;
scopes: string[];
extra: { mcpContext: McpContext };
}
| undefined
> {
// 1. Try Better Auth session (handles x-api-key header via apiKey plugin)
const session = await auth.api.getSession({
headers: req.headers,
});
import { createMcpHandler, withMcpAuth } from "mcp-handler";
import { env } from "@/env";
import type { McpContext } from "@/lib/mcp/auth";
import { registerTools } from "@/lib/mcp/tools";

async function verifyToken(req: Request, bearerToken?: string) {
// 1. Try session auth
const session = await auth.api.getSession({ headers: req.headers });
if (session?.session) {
const { user, session: sess } = session;
const extendedSession = sess as typeof sess & {
activeOrganizationId?: string | null;
role?: string;
plan?: string | null;
const extendedSession = session.session as {
activeOrganizationId?: string;
};

if (!extendedSession.activeOrganizationId) {
console.error("[mcp/auth] Session has no activeOrganizationId:", user.id);
console.error("[mcp/auth] Session missing activeOrganizationId");
return undefined;
}

const mcpContext: McpContext = {
userId: user.id,
organizationId: extendedSession.activeOrganizationId,
role: extendedSession.role ?? null,
plan: extendedSession.plan ?? null,
defaultDeviceId: null,
};

return {
token: "session",
clientId: "session",
scopes: ["mcp:full"],
extra: { mcpContext },
extra: {
mcpContext: {
userId: session.user.id,
organizationId: extendedSession.activeOrganizationId,
} satisfies McpContext,
},
};
}

// 2. Try MCP OAuth bearer token
// 2. Try OAuth bearer token
if (bearerToken) {
const mcpSession = await auth.api.getMcpSession({
headers: req.headers,
});

if (mcpSession) {
// Extract organizationId from OAuth token scopes
const rawScopes = mcpSession.scopes;
const scopeArray = Array.isArray(rawScopes)
? rawScopes
: typeof rawScopes === "string"
? rawScopes.split(" ")
: [];
const orgScope = scopeArray.find((s) => s.startsWith("organization:"));
const organizationId = orgScope?.split(":")[1];

if (!organizationId) {
console.error(
"[mcp/auth] OAuth token missing organization scope:",
mcpSession.userId,
);
return undefined;
}
const mcpSession = await auth.api.getMcpSession({ headers: req.headers });
if (!mcpSession) return undefined;

const mcpContext = await buildMcpContext({
userId: mcpSession.userId,
organizationId,
});
const scopes = Array.isArray(mcpSession.scopes)
? mcpSession.scopes
: (mcpSession.scopes?.split(" ") ?? []);

if (!mcpContext) {
return undefined;
}
// Get organization from scope
const orgScope = scopes.find((s) => s.startsWith("organization:"));
const organizationId = orgScope?.split(":")[1];

return {
token: bearerToken,
clientId: mcpSession.clientId ?? "mcp-client",
scopes: scopeArray,
extra: { mcpContext },
};
if (!organizationId) {
console.error("[mcp/auth] OAuth token missing organization scope");
return undefined;
}

return {
token: bearerToken,
clientId: mcpSession.clientId ?? "mcp-client",
scopes,
extra: {
mcpContext: {
userId: mcpSession.userId,
organizationId,
} satisfies McpContext,
},
};
}

return undefined;
}

/**
* Create the base MCP handler
* Tools access context via extra.authInfo.extra.mcpContext
*/
const baseHandler = createMcpHandler(
(server) => {
registerMcpTools(server);
},
{
capabilities: {
tools: {},
},
},
(server) => registerTools(server),
{ capabilities: { tools: {} } },
{
redisUrl: process.env.UPSTASH_REDIS_URL,
redisUrl: env.KV_URL,
basePath: "/api/agent",
verboseLogs: process.env.NODE_ENV === "development",
verboseLogs: env.NODE_ENV === "development",
maxDuration: 60,
},
);

/**
* Wrap with authentication
*/
const handler = withMcpAuth(baseHandler, verifyToken, {
required: true,
});
const handler = withMcpAuth(baseHandler, verifyToken, { required: true });

export { handler as GET, handler as POST, handler as DELETE };
1 change: 1 addition & 0 deletions apps/api/src/env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export const env = createEnv({
RESEND_API_KEY: z.string(),
KV_REST_API_URL: z.string(),
KV_REST_API_TOKEN: z.string(),
KV_URL: z.string().url(),
STRIPE_SECRET_KEY: z.string(),
STRIPE_WEBHOOK_SECRET: z.string(),
STRIPE_PRO_MONTHLY_PRICE_ID: z.string(),
Expand Down
Loading