Merge pull request #12 from yorkeccak/main

yorkeccak · web-flow · commit 4df672a24137 · 2026-01-24T19:54:39.000Z
ui
diff --git a/app/api/countries/conflicts/route.ts b/app/api/countries/conflicts/route.ts
@@ -1,12 +1,14 @@
 import { NextResponse } from "next/server";
 import { getCountryConflicts, streamCountryConflicts } from "@/lib/valyu";
+import { isSelfHostedMode } from "@/lib/app-mode";
 
 export const dynamic = "force-dynamic";
 
 export async function GET(request: Request) {
   const { searchParams } = new URL(request.url);
   const country = searchParams.get("country");
   const stream = searchParams.get("stream") === "true";
+  const accessToken = searchParams.get("accessToken");
 
   if (!country) {
     return NextResponse.json(
@@ -15,14 +17,23 @@ export async function GET(request: Request) {
     );
   }
 
+  // In valyu mode, require user token
+  const selfHosted = isSelfHostedMode();
+  if (!selfHosted && !accessToken) {
+    return NextResponse.json(
+      { error: "Authentication required", requiresReauth: true },
+      { status: 401 }
+    );
+  }
+
   // Streaming mode - use Server-Sent Events
   if (stream) {
     const encoder = new TextEncoder();
 
     const readable = new ReadableStream({
       async start(controller) {
         try {
-          for await (const chunk of streamCountryConflicts(country)) {
+          for await (const chunk of streamCountryConflicts(country, { accessToken: accessToken || undefined })) {
             const data = `data: ${JSON.stringify(chunk)}\n\n`;
             controller.enqueue(encoder.encode(data));
           }
@@ -49,7 +60,7 @@ export async function GET(request: Request) {
 
   // Non-streaming mode - return full response
   try {
-    const result = await getCountryConflicts(country);
+    const result = await getCountryConflicts(country, { accessToken: accessToken || undefined });
 
     return NextResponse.json({
       country,
diff --git a/app/api/deepresearch/[taskId]/route.ts b/app/api/deepresearch/[taskId]/route.ts
@@ -71,7 +71,15 @@ export async function GET(
     const selfHosted = isSelfHostedMode();
     let statusData: any;
 
-    // Use OAuth proxy if user is signed in and not self-hosted
+    // Valyu mode requires auth
+    if (!selfHosted && !accessToken) {
+      return NextResponse.json(
+        { error: "Authentication required", requiresReauth: true },
+        { status: 401 }
+      );
+    }
+
+    // Use OAuth proxy in valyu mode
     if (!selfHosted && accessToken) {
       statusData = await getStatusViaProxy(taskId, accessToken);
       if (statusData.error) {
diff --git a/app/api/deepresearch/route.ts b/app/api/deepresearch/route.ts
@@ -102,7 +102,15 @@ export async function POST(request: Request) {
 
     const selfHosted = isSelfHostedMode();
 
-    // Use OAuth proxy if user is signed in and not self-hosted
+    // Valyu mode requires auth
+    if (!selfHosted && !accessToken) {
+      return NextResponse.json(
+        { error: "Authentication required", requiresReauth: true },
+        { status: 401 }
+      );
+    }
+
+    // Use OAuth proxy in valyu mode
     if (!selfHosted && accessToken) {
       const result = await createTaskViaProxy(topic, accessToken);
       if (result.error) {
diff --git a/app/api/entities/route.ts b/app/api/entities/route.ts
@@ -1,5 +1,6 @@
 import { NextResponse } from "next/server";
 import { getEntityResearch, deepResearch, searchEntityLocations, streamEntityResearch } from "@/lib/valyu";
+import { isSelfHostedMode } from "@/lib/app-mode";
 
 export const dynamic = "force-dynamic";
 import { geocodeLocationsFromText } from "@/lib/geocoding";
@@ -9,6 +10,7 @@ export async function GET(request: Request) {
   const { searchParams } = new URL(request.url);
   const name = searchParams.get("name");
   const stream = searchParams.get("stream") === "true";
+  const accessToken = searchParams.get("accessToken");
 
   if (!name) {
     return NextResponse.json(
@@ -17,14 +19,23 @@ export async function GET(request: Request) {
     );
   }
 
+  // In valyu mode, require authentication
+  const selfHosted = isSelfHostedMode();
+  if (!selfHosted && !accessToken) {
+    return NextResponse.json(
+      { error: "Authentication required", requiresReauth: true },
+      { status: 401 }
+    );
+  }
+
   // Streaming mode - use Server-Sent Events
   if (stream) {
     const encoder = new TextEncoder();
 
     const readable = new ReadableStream({
       async start(controller) {
         try {
-          for await (const chunk of streamEntityResearch(name)) {
+          for await (const chunk of streamEntityResearch(name, { accessToken: accessToken || undefined })) {
             const data = `data: ${JSON.stringify(chunk)}\n\n`;
             controller.enqueue(encoder.encode(data));
           }
@@ -53,7 +64,7 @@ export async function GET(request: Request) {
   const deep = searchParams.get("deep") === "true";
 
   try {
-    const entityData = await getEntityResearch(name);
+    const entityData = await getEntityResearch(name, { accessToken: accessToken || undefined });
 
     if (!entityData) {
       return NextResponse.json(
@@ -73,7 +84,7 @@ export async function GET(request: Request) {
     };
 
     if (deep) {
-      const research = await deepResearch(name);
+      const research = await deepResearch(name, { accessToken: accessToken || undefined });
       profile.researchSummary = research.summary;
     }
 
@@ -90,7 +101,7 @@ export async function GET(request: Request) {
 export async function POST(request: Request) {
   try {
     const body = await request.json();
-    const { name, includeDeepResearch } = body;
+    const { name, includeDeepResearch, accessToken } = body;
 
     if (!name) {
       return NextResponse.json(
@@ -99,9 +110,18 @@ export async function POST(request: Request) {
       );
     }
 
+    // In valyu mode, require authentication
+    const selfHosted = isSelfHostedMode();
+    if (!selfHosted && !accessToken) {
+      return NextResponse.json(
+        { error: "Authentication required", requiresReauth: true },
+        { status: 401 }
+      );
+    }
+
     const [entityData, locationContent] = await Promise.all([
-      getEntityResearch(name),
-      searchEntityLocations(name),
+      getEntityResearch(name, { accessToken: accessToken || undefined }),
+      searchEntityLocations(name, { accessToken: accessToken || undefined }),
     ]);
 
     if (!entityData) {
@@ -137,7 +157,7 @@ export async function POST(request: Request) {
     let pdfUrl = undefined;
 
     if (includeDeepResearch) {
-      const research = await deepResearch(name);
+      const research = await deepResearch(name, { accessToken: accessToken || undefined });
       profile.researchSummary = research.summary;
       deliverables = research.deliverables;
       pdfUrl = research.pdfUrl;
diff --git a/app/api/events/route.ts b/app/api/events/route.ts
@@ -161,14 +161,33 @@ async function processSearchResults(
 export async function GET(request: Request) {
   const { searchParams } = new URL(request.url);
   const query = searchParams.get("q");
+  const accessToken = searchParams.get("accessToken");
+
+  // In valyu mode, require authentication
+  const selfHosted = isSelfHostedMode();
+  if (!selfHosted && !accessToken) {
+    return NextResponse.json(
+      { error: "Authentication required", requiresReauth: true },
+      { status: 401 }
+    );
+  }
 
   try {
     const searchQueries = query ? [query] : THREAT_QUERIES;
+    const tokenToUse = selfHosted ? undefined : accessToken;
 
     const searchResultsArrays = await Promise.all(
-      searchQueries.map((q) => searchEvents(q, { maxResults: 20 }))
+      searchQueries.map((q) => searchEvents(q, { maxResults: 20, accessToken: tokenToUse || undefined }))
     );
 
+    const requiresReauth = searchResultsArrays.some((r) => r.requiresReauth);
+    if (requiresReauth) {
+      return NextResponse.json(
+        { error: "auth_error", message: "Session expired. Please sign in again.", requiresReauth: true },
+        { status: 401 }
+      );
+    }
+
     const allResults = searchResultsArrays.flatMap((r) => r.results);
     const sortedEvents = await processSearchResults(allResults);
 
@@ -192,6 +211,15 @@ export async function POST(request: Request) {
     const { queries, accessToken } = body;
 
     const selfHosted = isSelfHostedMode();
+
+    // In valyu mode, require authentication
+    if (!selfHosted && !accessToken) {
+      return NextResponse.json(
+        { error: "Authentication required", requiresReauth: true },
+        { status: 401 }
+      );
+    }
+
     const tokenToUse = selfHosted ? undefined : accessToken;
 
     const searchQueries = queries && Array.isArray(queries) && queries.length > 0
diff --git a/app/api/reports/route.ts b/app/api/reports/route.ts
@@ -1,12 +1,13 @@
 import { NextResponse } from "next/server";
 import { deepResearch } from "@/lib/valyu";
+import { isSelfHostedMode } from "@/lib/app-mode";
 
 export const dynamic = "force-dynamic";
 
 export async function POST(request: Request) {
   try {
     const body = await request.json();
-    const { topic, type } = body;
+    const { topic, type, accessToken } = body;
 
     if (!topic) {
       return NextResponse.json(
@@ -15,6 +16,15 @@ export async function POST(request: Request) {
       );
     }
 
+    // In valyu mode, require authentication
+    const selfHosted = isSelfHostedMode();
+    if (!selfHosted && !accessToken) {
+      return NextResponse.json(
+        { error: "Authentication required", requiresReauth: true },
+        { status: 401 }
+      );
+    }
+
     let enhancedQuery = topic;
 
     switch (type) {
@@ -34,7 +44,7 @@ export async function POST(request: Request) {
         enhancedQuery = `comprehensive analysis ${topic}`;
     }
 
-    const research = await deepResearch(enhancedQuery);
+    const research = await deepResearch(enhancedQuery, { accessToken: accessToken || undefined });
 
     return NextResponse.json({
       report: {
diff --git a/app/page.tsx b/app/page.tsx
@@ -8,14 +8,13 @@ import { ThreatMap } from "@/components/map/threat-map";
 import { TimelineScrubber } from "@/components/map/timeline-scrubber";
 import { MapControls } from "@/components/map/map-controls";
 import { WelcomeModal } from "@/components/welcome-modal";
-import { SignInPanel, SignInModal } from "@/components/auth";
+import { SignInPanel } from "@/components/auth";
 
 const WELCOME_DISMISSED_KEY = "globalthreatmap_welcome_dismissed";
 
 export default function Home() {
   const [showWelcome, setShowWelcome] = useState(false);
-  const [showSignInModal, setShowSignInModal] = useState(false);
-  const { isLoading, refresh, requiresSignIn } = useEvents({
+  const { isLoading, refresh } = useEvents({
     autoRefresh: true,
     refreshInterval: 300000, // 5 minutes
   });
@@ -27,12 +26,6 @@ export default function Home() {
     }
   }, []);
 
-  useEffect(() => {
-    if (requiresSignIn) {
-      setShowSignInModal(true);
-    }
-  }, [requiresSignIn]);
-
   return (
     <div className="flex h-screen flex-col">
       <Header
@@ -50,7 +43,6 @@ export default function Home() {
       </div>
       <WelcomeModal open={showWelcome} onOpenChange={setShowWelcome} />
       <SignInPanel />
-      <SignInModal open={showSignInModal} onOpenChange={setShowSignInModal} />
     </div>
   );
 }
diff --git a/components/feed/event-feed.tsx b/components/feed/event-feed.tsx
@@ -1,10 +1,13 @@
 "use client";
 
+import { useState } from "react";
 import { useEventsStore } from "@/stores/events-store";
 import { useAuthStore } from "@/stores/auth-store";
 import { ScrollArea } from "@/components/ui/scroll-area";
+import { Button } from "@/components/ui/button";
 import { EventCard } from "./event-card";
 import { FeedFilters } from "./feed-filters";
+import { SignInModal } from "@/components/auth";
 import { Loader2, Lock } from "lucide-react";
 
 const APP_MODE = process.env.NEXT_PUBLIC_APP_MODE || "self-hosted";
@@ -13,6 +16,7 @@ export function EventFeed() {
   const { filteredEvents, isLoading, error, selectedEvent, selectEvent } =
     useEventsStore();
   const { isAuthenticated } = useAuthStore();
+  const [showSignInModal, setShowSignInModal] = useState(false);
 
   const requiresAuth = APP_MODE === "valyu";
   const showSignInPrompt = requiresAuth && !isAuthenticated && !isLoading && filteredEvents.length === 0;
@@ -50,9 +54,16 @@ export function EventFeed() {
             <p className="text-sm font-medium text-foreground mb-1">
               Sign in to view events
             </p>
-            <p className="text-xs text-muted-foreground">
+            <p className="text-xs text-muted-foreground mb-4">
               Events require authentication
             </p>
+            <Button
+              variant="outline"
+              size="sm"
+              onClick={() => setShowSignInModal(true)}
+            >
+              Sign in
+            </Button>
           </div>
         )}
 
@@ -76,6 +87,8 @@ export function EventFeed() {
           ))}
         </div>
       </ScrollArea>
+
+      <SignInModal open={showSignInModal} onOpenChange={setShowSignInModal} />
     </div>
   );
 }
diff --git a/components/map/country-conflicts-modal.tsx b/components/map/country-conflicts-modal.tsx
diff --git a/lib/valyu.ts b/lib/valyu.ts
