fix: env var

Author: coodos

platforms/calendar/components/auth/login-screen.tsx

@@ -2,14 +2,15 @@
 
 import { useCallback, useEffect, useState } from 'react'
 import { QRCodeSVG } from 'qrcode.react'
-import { calendarApi, parseSessionFromUri } from '@/lib/calendar-api'
+import {
+  calendarApi,
+  getCalendarApiUrl,
+  parseSessionFromUri,
+} from '@/lib/calendar-api'
 import { useAuth } from '@/contexts/auth-context'
 import { Button } from '@/components/ui/button'
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
 
-const API_URL =
-  process.env.NEXT_PUBLIC_CALENDAR_API_URL ?? "http://localhost:4001";
-
 export default function LoginScreen() {
   const { login } = useAuth()
   const [uri, setUri] = useState<string>('')
@@ -22,6 +23,10 @@ export default function LoginScreen() {
     setLoading(true)
     setError(null)
     try {
+      const apiUrl = getCalendarApiUrl()
+      if (process.env.NODE_ENV === 'development') {
+        console.log('[auth] fetching offer from', `${apiUrl}/api/auth/offer`)
+      }
       const data = await calendarApi.getOffer()
       setUri(data.uri)
       const sid = data.sessionId ?? parseSessionFromUri(data.uri)
@@ -41,8 +46,9 @@ export default function LoginScreen() {
 
   useEffect(() => {
     if (!sessionId) return
+    const apiUrl = getCalendarApiUrl()
     const eventSource = new EventSource(
-      `${API_URL}/api/auth/sessions/${sessionId}`
+      `${apiUrl}/api/auth/sessions/${sessionId}`
     )
     eventSource.onmessage = (event) => {
       try {

platforms/calendar/lib/calendar-api.ts

@@ -1,6 +1,11 @@
-// From root .env (loaded in next.config)
+// Single source: set in next.config from root .env and inlined into client bundle
 const API_URL =
   process.env.NEXT_PUBLIC_CALENDAR_API_URL ?? "http://localhost:4001";
+
+export function getCalendarApiUrl(): string {
+  return API_URL;
+}
+
 const TOKEN_KEY = "calendar-w3ds-token";
 
 export function getToken(): string | null {

platforms/calendar/next.config.ts

@@ -1,13 +1,28 @@
 import type { NextConfig } from "next";
 import path from "path";
-import { loadEnvConfig } from "@next/env";
+import { readFileSync, existsSync } from "fs";
 
-// Load .env* from monorepo root so NEXT_PUBLIC_* and others come from root (Next.js load order)
-const rootDir = path.resolve(__dirname, "../..");
-loadEnvConfig(rootDir);
+// Read NEXT_PUBLIC_CALENDAR_API_URL from monorepo root .env so client bundle gets it (Next loads project .env first, so process.env can be wrong)
+function getRootEnv(name: string): string | undefined {
+  const rootEnv = path.resolve(__dirname, "../../.env");
+  if (!existsSync(rootEnv)) return undefined;
+  const content = readFileSync(rootEnv, "utf-8");
+  const match = new RegExp(`^${name}\\s*=\\s*(.+)$`, "m").exec(content);
+  if (!match) return undefined;
+  const raw = match[1].replace(/^["']|["']$/g, "").trim();
+  const comment = raw.indexOf(" #");
+  return comment >= 0 ? raw.slice(0, comment).trim() : raw;
+}
+
+const calendarApiUrl =
+  getRootEnv("NEXT_PUBLIC_CALENDAR_API_URL") ??
+  process.env.NEXT_PUBLIC_CALENDAR_API_URL ??
+  "http://localhost:4001";
 
 const nextConfig: NextConfig = {
-  /* config options here */
+  env: {
+    NEXT_PUBLIC_CALENDAR_API_URL: calendarApiUrl,
+  },
 };
 
 export default nextConfig;