Skip to content

fix: dockerfile cognito params #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guyb1 merged 2 commits into from
Feb 22, 2026
Merged

fix: dockerfile cognito params #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f931460
fix: dockerfile cognito params
guyb1 Feb 22, 2026
ca85812
fix
guyb1 Feb 22, 2026
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
10 changes: 10 additions & 0 deletions apps/web/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,17 @@ FROM base AS builder
ENV NEXT_TELEMETRY_DISABLED=1

ARG NEXT_PUBLIC_AUTH_PROVIDER
ARG NEXT_PUBLIC_CONVEX_URL
ARG NEXT_PUBLIC_CLAWE_EDITION
ARG NEXT_PUBLIC_COGNITO_USER_POOL_ID
ARG NEXT_PUBLIC_COGNITO_CLIENT_ID
ARG NEXT_PUBLIC_COGNITO_DOMAIN
ENV NEXT_PUBLIC_AUTH_PROVIDER=${NEXT_PUBLIC_AUTH_PROVIDER}
ENV NEXT_PUBLIC_CONVEX_URL=${NEXT_PUBLIC_CONVEX_URL}
ENV NEXT_PUBLIC_CLAWE_EDITION=${NEXT_PUBLIC_CLAWE_EDITION}
ENV NEXT_PUBLIC_COGNITO_USER_POOL_ID=${NEXT_PUBLIC_COGNITO_USER_POOL_ID}
ENV NEXT_PUBLIC_COGNITO_CLIENT_ID=${NEXT_PUBLIC_COGNITO_CLIENT_ID}
ENV NEXT_PUBLIC_COGNITO_DOMAIN=${NEXT_PUBLIC_COGNITO_DOMAIN}

COPY --from=deps /app/ .
COPY --from=pruner /app/out/full/ .
Expand Down
2 changes: 2 additions & 0 deletions apps/web/src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { QueryProvider } from "@/providers/query-provider";
import { ThemeProvider } from "@/providers/theme-provider";
import { ApiClientProvider } from "@/providers/api-client-provider";
import { Toaster } from "@clawe/ui/components/sonner";
import { RuntimeConfig } from "@/components/runtime-config";

const geistSans = localFont({
src: "./fonts/GeistVF.woff",
Expand Down Expand Up @@ -42,6 +43,7 @@ export default function RootLayout({
<body
className={`${geistSans.variable} ${geistMono.variable} ${montserrat.variable} ${spaceGrotesk.variable}`}
>
<RuntimeConfig />
<QueryProvider>
<AuthProvider>
<ApiClientProvider>
Expand Down
19 changes: 19 additions & 0 deletions apps/web/src/components/runtime-config.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
export const RuntimeConfig = () => {
// Cloud builds have NEXT_PUBLIC_CONVEX_URL baked in at build time — no runtime injection needed
if (process.env.NEXT_PUBLIC_CLAWE_EDITION === "cloud") {
return null;
}

const config = {
convexUrl:
process.env.NEXT_PUBLIC_CONVEX_URL || process.env.CONVEX_URL || "",
};

return (
<script
dangerouslySetInnerHTML={{
__html: `window.__CLAWE_CONFIG__=${JSON.stringify(config)}`,
}}
/>
);
};
6 changes: 5 additions & 1 deletion apps/web/src/lib/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import { getConvexUrl } from "@/lib/runtime-config";

export const config = {
isCloud: process.env.NEXT_PUBLIC_CLAWE_EDITION === "cloud",
authProvider: (process.env.NEXT_PUBLIC_AUTH_PROVIDER ?? "nextauth") as
| "nextauth"
| "cognito",
convexUrl: process.env.NEXT_PUBLIC_CONVEX_URL ?? "",
get convexUrl() {
return getConvexUrl();
},
} as const;
23 changes: 23 additions & 0 deletions apps/web/src/lib/runtime-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
interface ClaweConfig {
convexUrl: string;
}

declare global {
interface Window {
__CLAWE_CONFIG__?: ClaweConfig;
}
}

export function getConvexUrl(): string {
// Server-side: read env directly
if (typeof window === "undefined") {
return process.env.NEXT_PUBLIC_CONVEX_URL || process.env.CONVEX_URL || "";
}

// Client-side: read from injected script tag, fall back to build-time env
return (
window.__CLAWE_CONFIG__?.convexUrl ||
process.env.NEXT_PUBLIC_CONVEX_URL ||
""
);
}
23 changes: 13 additions & 10 deletions apps/web/src/providers/convex-provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
"use client";

import { ConvexProviderWithAuth, ConvexReactClient } from "convex/react";
import type { ReactNode } from "react";
import { useMemo, type ReactNode } from "react";
import { useConvexAuth } from "@/providers/auth-provider";
import { getConvexUrl } from "@/lib/runtime-config";

// Fallback URL for build time - won't be called during static generation
const convex = new ConvexReactClient(
process.env.NEXT_PUBLIC_CONVEX_URL || "http://localhost:0",
);
export const ConvexClientProvider = ({ children }: { children: ReactNode }) => {
const client = useMemo(
() => new ConvexReactClient(getConvexUrl() || "http://localhost:0"),
[],
);

export const ConvexClientProvider = ({ children }: { children: ReactNode }) => (
<ConvexProviderWithAuth client={convex} useAuth={useConvexAuth}>
{children}
</ConvexProviderWithAuth>
);
return (
<ConvexProviderWithAuth client={client} useAuth={useConvexAuth}>
{children}
</ConvexProviderWithAuth>
);
};