feat (organizer): adding organizer and feedback mechanism flow

Author: Kabeer2004

dev/null

@@ -1,10 +1,20 @@
 # Root environment variables for docker-compose.yml (self-hosting)
 # Copy this file to .env in the same directory (src/.env) and fill in the values.
 
+# The public-facing URL of your client application.
+# This is crucial for OAuth redirects to work correctly.
+APP_BASE_URL=http://localhost:3000
+
 # --- Client Build-Time Variables ---
 # The URL where the backend server will be accessible from the user's browser
 NEXT_PUBLIC_APP_SERVER_URL=http://localhost:5000
 
+# The internal URL for the backend server, used for server-to-server communication inside Docker.
+INTERNAL_APP_SERVER_URL=http://server:80
+
+# The internal URL for the client container, used for server-side self-requests
+INTERNAL_CLIENT_URL=http://client:3000
+
 # The mode to run the application in
 NEXT_PUBLIC_ENVIRONMENT=selfhost
 

src/.env.selfhost.template

@@ -10,6 +10,12 @@ NEXT_PUBLIC_APP_SERVER_URL=http://localhost:5000
 # The internal URL for the backend server, used for server-to-server communication inside Docker.
 INTERNAL_APP_SERVER_URL=http://server:80
 
+# The internal URL for this client, used for server-side self-requests within Docker.
+INTERNAL_CLIENT_URL=http://client:3000
+
+# The public-facing base URL of the client application.
+APP_BASE_URL=http://localhost:3000
+
 # The static token for authenticating with the backend.
 # This MUST match the `SELF_HOST_AUTH_SECRET` in the server's .env.selfhost file.
 SELF_HOST_AUTH_TOKEN=<use_the_same_strong_secret_as_in_the_root_env>

src/client/.env.selfhost.template

@@ -0,0 +1,3 @@
+{
+	"extends": "next/core-web-vitals"
+}

src/client/.eslintrc.json

@@ -10,6 +10,7 @@ WORKDIR /app
 # Others are needed for server-side logic during the build (if any).
 ARG NEXT_PUBLIC_APP_SERVER_URL
 ARG AUTH0_SECRET
+ARG INTERNAL_APP_SERVER_URL
 ARG NEXT_PUBLIC_ENVIRONMENT
 ARG SELF_HOST_AUTH_TOKEN
 ARG APP_BASE_URL
@@ -23,6 +24,7 @@ ARG AUTH0_SCOPE
 # Set them as environment variables for the build process
 ENV NEXT_PUBLIC_APP_SERVER_URL=$NEXT_PUBLIC_APP_SERVER_URL
 ENV AUTH0_SECRET=$AUTH0_SECRET
+ENV INTERNAL_APP_SERVER_URL=$INTERNAL_APP_SERVER_URL
 ENV NEXT_PUBLIC_ENVIRONMENT=$NEXT_PUBLIC_ENVIRONMENT
 ENV SELF_HOST_AUTH_TOKEN=$SELF_HOST_AUTH_TOKEN
 ENV APP_BASE_URL=$APP_BASE_URL

src/client/Dockerfile

@@ -37,7 +37,9 @@ export const GET = withAuth(async function GET(request, { authHeader }) {
 		)
 		const data = await response.json()
 		if (!response.ok)
-			throw new Error(data.detail || "Failed to fetch blocks")
+			throw new Error(
+				data.detail || data.error || "Failed to fetch blocks"
+			)
 		return NextResponse.json(data)
 	} catch (error) {
 		return NextResponse.json({ error: error.message }, { status: 500 })
@@ -55,7 +57,9 @@ export const POST = withAuth(async function POST(request, { authHeader }) {
 		})
 		const data = await response.json()
 		if (!response.ok)
-			throw new Error(data.detail || "Failed to create block")
+			throw new Error(
+				data.detail || data.error || "Failed to create block"
+			)
 		return NextResponse.json(data)
 	} catch (error) {
 		return NextResponse.json({ error: error.message }, { status: 500 })
@@ -85,7 +89,9 @@ export const PUT = withAuth(async function PUT(request, { authHeader }) {
 		)
 		const data = await response.json()
 		if (!response.ok)
-			throw new Error(data.detail || "Failed to update block")
+			throw new Error(
+				data.detail || data.error || "Failed to update block"
+			)
 		return NextResponse.json(data)
 	} catch (error) {
 		return NextResponse.json({ error: error.message }, { status: 500 })

src/client/app/api/journal/route.js

@@ -8,15 +8,23 @@ export async function GET(request) {
 	const state = searchParams.get("state") // This will be 'gdrive', 'gcalendar', etc.
 	const error = searchParams.get("error")
 
-	const baseUrl = process.env.APP_BASE_URL
-	if (!baseUrl) {
+	const publicBaseUrl = process.env.APP_BASE_URL
+	if (!publicBaseUrl) {
 		console.error("APP_BASE_URL environment variable is not set.")
 		return new Response("Server configuration error.", { status: 500 })
 	}
 
+	// Determine the correct URL for server-side fetching.
+	// In a docker-compose self-host setup, containers communicate via internal service names.
+	// In all other environments (local dev, cloud), use the public URL.
+	const isSelfHostDocker = process.env.NEXT_PUBLIC_ENVIRONMENT === "selfhost"
+	const apiUrlForFetch = isSelfHostDocker
+		? process.env.INTERNAL_CLIENT_URL
+		: publicBaseUrl
+
 	// FIX: Use the public-facing APP_BASE_URL for redirection, not the internal request.url.
 	// This ensures the browser is redirected to the correct, publicly accessible address.
-	const integrationsUrl = new URL("/integrations", baseUrl)
+	const integrationsUrl = new URL("/integrations", publicBaseUrl)
 
 	if (error) {
 		// User denied access or an error occurred
@@ -41,7 +49,7 @@ export async function GET(request) {
 		// The browser session (cookie) is automatically forwarded by Next.js server-side fetch,
 		// which authenticates the user to our own API proxy.
 		const apiResponse = await fetch(
-			`${baseUrl}/api/settings/integrations/connect/oauth`,
+			`${apiUrlForFetch}/api/settings/integrations/connect/oauth`,
 			{
 				method: "POST",
 				headers: {
@@ -51,7 +59,7 @@ export async function GET(request) {
 				body: JSON.stringify({
 					service_name: state,
 					code: code,
-					redirect_uri: `${baseUrl}/api/settings/integrations/connect/oauth/callback`
+					redirect_uri: `${publicBaseUrl}/api/settings/integrations/connect/oauth/callback`
 				})
 			}
 		)

src/client/app/api/settings/integrations/connect/oauth/callback/route.js

@@ -0,0 +1,30 @@
+import { NextResponse } from "next/server"
+import { withAuth } from "@lib/api-utils"
+
+const appServerUrl =
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "selfhost"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
+
+export const POST = withAuth(async function POST(request, { authHeader }) {
+	try {
+		const body = await request.json() // { taskId, answers: [{ question_id, answer_text }] }
+		const response = await fetch(
+			`${appServerUrl}/agents/answer-clarifications`,
+			{
+				method: "POST",
+				headers: { "Content-Type": "application/json", ...authHeader },
+				body: JSON.stringify(body)
+			}
+		)
+
+		const data = await response.json()
+		if (!response.ok) {
+			throw new Error(data.detail || "Failed to submit answers")
+		}
+		return NextResponse.json(data)
+	} catch (error) {
+		console.error("API Error in /tasks/answer-clarifications:", error)
+		return NextResponse.json({ error: error.message }, { status: 500 })
+	}
+})

src/client/app/api/tasks/answer-clarifications/route.js

@@ -0,0 +1,30 @@
+import { NextResponse } from "next/server"
+import { withAuth } from "@lib/api-utils"
+
+const appServerUrl =
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "selfhost"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
+
+export const POST = withAuth(async function POST(request, { authHeader }) {
+	try {
+		const body = await request.json() // { taskId, answers: [{ question_id, answer_text }] }
+		const response = await fetch(
+			`${appServerUrl}/agents/answer-clarifications`,
+			{
+				method: "POST",
+				headers: { "Content-Type": "application/json", ...authHeader },
+				body: JSON.stringify(body)
+			}
+		)
+
+		const data = await response.json()
+		if (!response.ok) {
+			throw new Error(data.detail || "Failed to submit answers")
+		}
+		return NextResponse.json(data)
+	} catch (error) {
+		console.error("API Error in /tasks/clarify:", error)
+		return NextResponse.json({ error: error.message }, { status: 500 })
+	}
+})

src/client/app/api/tasks/clarify/route.js

@@ -0,0 +1,27 @@
+import { NextResponse } from "next/server"
+import { withAuth } from "@lib/api-utils"
+
+const appServerUrl =
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "selfhost"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
+
+export const POST = withAuth(async function POST(request, { authHeader }) {
+	try {
+		const body = await request.json() // { service_name, event_data }
+		const response = await fetch(`${appServerUrl}/testing/inject-context`, {
+			method: "POST",
+			headers: { "Content-Type": "application/json", ...authHeader },
+			body: JSON.stringify(body)
+		})
+
+		const data = await response.json()
+		if (!response.ok) {
+			throw new Error(data.detail || "Failed to inject context event")
+		}
+		return NextResponse.json(data)
+	} catch (error) {
+		console.error("API Error in /testing/inject-context:", error)
+		return NextResponse.json({ error: error.message }, { status: 500 })
+	}
+})