Merge pull request #2 from JunSuzuki1973/fix/user-specific-api-keys

Fix: Use user-specific API keys for workflow execution

Author: developersdigest

app/api/workflows/[workflowId]/execute-langgraph/route.ts

@@ -2,6 +2,7 @@ import { NextRequest, NextResponse } from 'next/server';
 import { LangGraphExecutor } from '@/lib/workflow/langgraph';
 import { getWorkflow } from '@/lib/workflow/storage';
 import { getServerAPIKeys } from '@/lib/api/config';
+import { validateApiKey } from '@/lib/api/auth';
 
 export const dynamic = 'force-dynamic';
 
@@ -14,6 +15,15 @@ export async function POST(
   { params }: { params: Promise<{ workflowId: string }> }
 ) {
   try {
+    // Validate API key
+    const authResult = await validateApiKey(request);
+    if (!authResult.authenticated) {
+      return NextResponse.json(
+        { error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      );
+    }
+
     const { workflowId } = await params;
     const body = await request.json();
     const { input, threadId } = body;
@@ -27,8 +37,17 @@ export async function POST(
       );
     }
 
-    // Get API keys
-    const apiKeys = getServerAPIKeys();
+    // Get API keys - check user keys first, then fall back to environment
+    const { getLLMApiKey } = await import('@/lib/api/llm-keys');
+    const userId = authResult.userId;
+    
+    const apiKeys = {
+      anthropic: userId ? await getLLMApiKey('anthropic', userId) : null || process.env.ANTHROPIC_API_KEY,
+      groq: userId ? await getLLMApiKey('groq', userId) : null || process.env.GROQ_API_KEY,
+      openai: userId ? await getLLMApiKey('openai', userId) : null || process.env.OPENAI_API_KEY,
+      firecrawl: process.env.FIRECRAWL_API_KEY, // Firecrawl keys are still environment-only for now
+      arcade: process.env.ARCADE_API_KEY,
+    };
 
     // Create LangGraph executor
     const executor = new LangGraphExecutor(workflow, undefined, apiKeys || undefined);

app/api/workflows/[workflowId]/execute-stream/route.ts

@@ -107,12 +107,15 @@ export async function POST(
         const executionId = `exec_${Date.now()}`;
         const nodeResults: Record<string, any> = {};
 
-        // Get API keys
+        // Get API keys - check user keys first, then fall back to environment
+        const { getLLMApiKey } = await import('@/lib/api/llm-keys');
+        const userId = authResult.userId;
+        
         const apiKeys = {
-          anthropic: process.env.ANTHROPIC_API_KEY,
-          groq: process.env.GROQ_API_KEY,
-          openai: process.env.OPENAI_API_KEY,
-          firecrawl: process.env.FIRECRAWL_API_KEY,
+          anthropic: userId ? await getLLMApiKey('anthropic', userId) : null || process.env.ANTHROPIC_API_KEY,
+          groq: userId ? await getLLMApiKey('groq', userId) : null || process.env.GROQ_API_KEY,
+          openai: userId ? await getLLMApiKey('openai', userId) : null || process.env.OPENAI_API_KEY,
+          firecrawl: process.env.FIRECRAWL_API_KEY, // Firecrawl keys are still environment-only for now
           arcade: process.env.ARCADE_API_KEY,
         };
 

app/api/workflows/[workflowId]/resume/route.ts

@@ -80,12 +80,15 @@ export async function POST(
           id: workflowDoc.customId || workflowDoc._id,
         } as any;
 
-        // Get API keys
+        // Get API keys - check user keys first, then fall back to environment
+        const { getLLMApiKey } = await import('@/lib/api/llm-keys');
+        const userId = authResult.userId;
+        
         const apiKeys = {
-          anthropic: process.env.ANTHROPIC_API_KEY,
-          groq: process.env.GROQ_API_KEY,
-          openai: process.env.OPENAI_API_KEY,
-          firecrawl: process.env.FIRECRAWL_API_KEY,
+          anthropic: userId ? await getLLMApiKey('anthropic', userId) : null || process.env.ANTHROPIC_API_KEY,
+          groq: userId ? await getLLMApiKey('groq', userId) : null || process.env.GROQ_API_KEY,
+          openai: userId ? await getLLMApiKey('openai', userId) : null || process.env.OPENAI_API_KEY,
+          firecrawl: process.env.FIRECRAWL_API_KEY, // Firecrawl keys are still environment-only for now
           arcade: process.env.ARCADE_API_KEY,
         };
 

components/app/(home)/sections/workflow-builder/WorkflowBuilder.tsx

@@ -46,6 +46,7 @@ import DataNodePanel from "./DataNodePanel";
 import ToolsNodePanel from "./ToolsNodePanel";
 import NoteNodePanel from "./NoteNodePanel";
 import HTTPNodePanel from "./HTTPNodePanel";
+import ExtractNodePanel from "./ExtractNodePanel";
 import StartNodePanel from "./StartNodePanel";
 import WorkflowNameEditor from "./WorkflowNameEditor";
 import SettingsPanel from "./SettingsPanelSimple";
@@ -138,6 +139,8 @@ const nodeCategories = [
     category: "Data",
     nodes: [
       { type: "transform", label: "Transform", color: "bg-[#ECE3FF] dark:bg-[#9665FF]", icon: Braces },
+      { type: "extract", label: "Extract", color: "bg-[#ECE3FF] dark:bg-[#9665FF]", icon: Search },
+      { type: "http", label: "HTTP", color: "bg-[#ECE3FF] dark:bg-[#9665FF]", icon: Server },
       { type: "set-state", label: "Set state", color: "bg-[#ECE3FF] dark:bg-[#9665FF]", icon: Braces },
     ],
   },
@@ -1566,7 +1569,7 @@ function WorkflowBuilderInner({ onBack, initialWorkflowId, initialTemplateId }:
           initial={{ x: -300, opacity: 0 }}
           animate={{ x: 0, opacity: 1 }}
           transition={{ duration: 0.5, delay: 0.2 }}
-          className="w-200 lg:w-200 md:w-180 sm:w-160 m-20 rounded-16 border border-border-faint bg-accent-white p-16 shadow-lg flex-shrink-0 z-10 self-start"
+          className="w-200 lg:w-200 md:w-180 sm:w-160 m-20 rounded-16 border border-border-faint bg-accent-white p-16 shadow-lg flex-shrink-0 z-10 self-start max-h-[calc(100vh-80px)] overflow-y-auto"
         >
         <div className="mb-24">
           <button
@@ -1727,6 +1730,22 @@ function WorkflowBuilderInner({ onBack, initialWorkflowId, initialTemplateId }:
             onDelete={handleDeleteNode}
             onUpdate={handleUpdateNodeData}
           />
+        ) : (selectedNode?.data as any)?.nodeType === 'extract' ? (
+          <ExtractNodePanel
+            node={selectedNode}
+            nodes={nodes}
+            onClose={() => setSelectedNode(null)}
+            onDelete={handleDeleteNode}
+            onUpdate={handleUpdateNodeData}
+          />
+        ) : (selectedNode?.data as any)?.nodeType === 'http' ? (
+          <HTTPNodePanel
+            node={selectedNode}
+            nodes={nodes}
+            onClose={() => setSelectedNode(null)}
+            onDelete={handleDeleteNode}
+            onUpdate={handleUpdateNodeData}
+          />
         ) : (selectedNode?.data as any)?.nodeType?.includes('set-state') ? (
           <DataNodePanel
             node={selectedNode}