Connect Supabase first: pick or make a project, and only the secret key is pasted
Signs in to the whole Supabase account, lists its projects (one is used straight away), or makes a free one called broke, then fills in the address and public key and creates the tables. The paste-all-three route stays as the fallback. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
73208b79df
commit
0e1a05801c
9 files changed
+237
-20
No files matched your search
@@ -1,6 +1,8 @@
|
||||
import { NextResponse } from "next/server";
|
||||
import { migrate } from "@/lib/migrate";
|
||||
import { finishConnect } from "@/lib/supabase-mcp";
|
||||
import { currentEnv } from "@/lib/setup";
|
||||
import { accountConnected, finishConnect, listProjects } from "@/lib/supabase-mcp";
|
||||
import { fillFrom } from "@/lib/supabase-fill";
|
||||
|
||||
// Supabase sends the browser back here after "Approve". Finish the sign-in, then bring the tables up to date.
|
||||
// The result goes back as a code (DB_MESSAGES on the Setup page), never as text, so the link can't carry a message.
|
||||
@@ -15,6 +17,17 @@ export async function GET(request: Request) {
|
||||
console.error("[broke] supabase callback:", e instanceof Error ? e.message : e);
|
||||
return back(e instanceof Error && /didn't start/.test(e.message) ? "elsewhere" : "rejected");
|
||||
}
|
||||
// Signed in to the whole account with no project set yet: one project is used straight away, several are picked on the page.
|
||||
if (accountConnected() && !currentEnv().NEXT_PUBLIC_SUPABASE_URL?.includes(".supabase.co")) {
|
||||
try {
|
||||
const projects = await listProjects();
|
||||
if (projects.length !== 1) return back(projects.length ? "pick" : "no-project");
|
||||
return back((await fillFrom(projects[0].id)).tables ? "filled" : "filled-no-tables");
|
||||
} catch (e) {
|
||||
console.error("[broke] supabase fill:", e instanceof Error ? e.message : e);
|
||||
return back("pick");
|
||||
}
|
||||
}
|
||||
const r = await migrate();
|
||||
return back(r.error ? "update-failed" : r.applied.length ? "updated" : "current");
|
||||
}
|
||||
@@ -4,12 +4,12 @@ import { refFromUrl, startConnect } from "@/lib/supabase-mcp";
|
||||
|
||||
const LOOPBACK = /^(localhost|127\.0\.0\.1|\[::1\])(:\d+)?$/;
|
||||
|
||||
// "Connect Supabase": returns the Supabase approval page for this project. Localhost only.
|
||||
// "Connect Supabase": returns the Supabase approval page, for this project or (before one is set) the whole account. Localhost only.
|
||||
export async function POST(request: Request) {
|
||||
const host = request.headers.get("host") ?? "";
|
||||
if (!LOOPBACK.test(host) || !(await setupAccess()).allowed) return NextResponse.json({ error: "Only on this computer." }, { status: 403 });
|
||||
// No project yet: sign in to the whole account, and broke picks (or makes) the project after.
|
||||
const ref = refFromUrl(currentEnv().NEXT_PUBLIC_SUPABASE_URL);
|
||||
if (!ref) return NextResponse.json({ error: "Add your Supabase Project URL first." }, { status: 400 });
|
||||
try {
|
||||
const url = await startConnect(ref, `http://${host}/api/setup/supabase/callback`);
|
||||
return NextResponse.json(url ? { url } : { connected: true });
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
import { NextResponse } from "next/server";
|
||||
import { sameOrigin, setupAccess } from "@/lib/setup";
|
||||
import { fillFrom } from "@/lib/supabase-fill";
|
||||
import { accountConnected, createProject, listProjects } from "@/lib/supabase-mcp";
|
||||
|
||||
const LOOPBACK = /^(localhost|127\.0\.0\.1|\[::1\])(:\d+)?$/;
|
||||
const local = async (request: Request) => LOOPBACK.test(request.headers.get("host") ?? "") && (await setupAccess()).allowed && accountConnected();
|
||||
|
||||
// After "Connect Supabase" signed in to the whole account: list its projects, or use one (or a new one). Using one writes
|
||||
// its address and publishable key to .env.local and creates broke's tables through the same sign-in. Localhost only.
|
||||
export async function GET(request: Request) {
|
||||
if (!(await local(request))) return NextResponse.json({ error: "Only on this computer, after Connect Supabase." }, { status: 403 });
|
||||
try {
|
||||
return NextResponse.json({ projects: await listProjects() });
|
||||
} catch (e) {
|
||||
console.error("[broke] supabase projects:", e instanceof Error ? e.message : e);
|
||||
return NextResponse.json({ error: "Couldn't list your Supabase projects. Press Connect Supabase again." }, { status: 502 });
|
||||
}
|
||||
}
|
||||
|
||||
export async function POST(request: Request) {
|
||||
if (!(await local(request)) || !sameOrigin(request)) return NextResponse.json({ error: "Only on this computer, after Connect Supabase." }, { status: 403 });
|
||||
const { ref, create } = (await request.json().catch(() => ({}))) as { ref?: string; create?: boolean };
|
||||
try {
|
||||
const id = create ? await createProject() : ref && /^[a-z0-9]{20}$/.test(ref) ? ref : null;
|
||||
if (!id) return NextResponse.json({ error: "Pick a project." }, { status: 400 });
|
||||
return NextResponse.json(await fillFrom(id));
|
||||
} catch (e) {
|
||||
console.error("[broke] supabase project:", e instanceof Error ? e.message : e);
|
||||
return NextResponse.json({ error: e instanceof Error && /cost money|organization/.test(e.message) ? e.message : "Supabase didn't answer. Try again in a moment." }, { status: 502 });
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
"use client";
|
||||
|
||||
import { Check, Copy, Eye, EyeOff } from "lucide-react";
|
||||
import { useState } from "react";
|
||||
import { useEffect, useState } from "react";
|
||||
import type { Field } from "@/lib/setup";
|
||||
|
||||
export function CopyCommand({ command }: { command: string }) {
|
||||
@@ -199,3 +199,44 @@ export function ConnectSupabaseButton({ onDone, onFail }: { onDone: () => void;
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
type Project = { id: string; name: string; region?: string; status?: string };
|
||||
|
||||
// After Connect Supabase: the account's projects, or a new free one called broke. Picking fills in its address and
|
||||
// public key and creates the tables (POST /api/setup/supabase/project).
|
||||
export function ProjectPicker({ onDone }: { onDone: () => void }) {
|
||||
const [projects, setProjects] = useState<Project[] | null>(null);
|
||||
const [busy, setBusy] = useState<string | null>(null);
|
||||
const [msg, setMsg] = useState("");
|
||||
useEffect(() => {
|
||||
fetch("/api/setup/supabase/project").then((r) => r.json()).then((b: { projects?: Project[]; error?: string }) => (b.error ? setMsg(b.error) : setProjects(b.projects ?? []))).catch(() => setMsg("Couldn't reach broke. Is it still running?"));
|
||||
}, []);
|
||||
async function use(body: { ref?: string; create?: boolean }, label: string) {
|
||||
setBusy(label);
|
||||
setMsg("");
|
||||
const res = await fetch("/api/setup/supabase/project", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(body) }).catch(() => null);
|
||||
const b = (await res?.json().catch(() => ({}))) as { error?: string } | undefined;
|
||||
setBusy(null);
|
||||
if (res?.ok) onDone();
|
||||
else setMsg(b?.error ?? "That didn't work. Try again.");
|
||||
}
|
||||
if (!projects && !msg) return <p className="text-sm text-muted">Finding your projects…</p>;
|
||||
return (
|
||||
<div className="space-y-3">
|
||||
{!!projects?.length && (
|
||||
<ul className="space-y-2">
|
||||
{projects.map((p) => (
|
||||
<li key={p.id} className="flex items-center justify-between gap-3 rounded-xl border border-line px-4 py-3">
|
||||
<span className="min-w-0"><span className="block font-medium truncate">{p.name}</span><span className="block text-xs text-muted">{p.id}{p.region ? ` · ${p.region}` : ""}</span></span>
|
||||
<button className="btn shrink-0" disabled={!!busy} onClick={() => use({ ref: p.id }, p.id)}>{busy === p.id ? "Setting up…" : "Use this one"}</button>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
)}
|
||||
<button className={projects?.length ? "btn" : "btn-primary"} disabled={!!busy} onClick={() => use({ create: true }, "new")}>
|
||||
{busy === "new" ? "Making your project… about a minute" : "Make a new free project called broke"}
|
||||
</button>
|
||||
{msg && <p className="text-sm text-bad">{msg}</p>}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -5,7 +5,7 @@ import Link from "next/link";
|
||||
import { useCallback, useEffect, useState } from "react";
|
||||
import { Logo } from "@/components/Logo";
|
||||
import type { AiRow, Part, Section, SetupStatus } from "@/lib/setup";
|
||||
import { CopyCommand, KeyForm, ConnectSupabaseButton, MigrateButton } from "./SetupActions";
|
||||
import { CopyCommand, KeyForm, ConnectSupabaseButton, MigrateButton, ProjectPicker } from "./SetupActions";
|
||||
|
||||
export function ExtLink({ href, children }: { href: string; children: React.ReactNode }) {
|
||||
return (
|
||||
@@ -201,9 +201,10 @@ export function Body({ s, data, signedIn, reload }: { s: Section; data: SetupSta
|
||||
{s.note && s.status !== "done" && s.status !== "error" && <p className="text-sm">{s.note}</p>}
|
||||
{s.note && s.status === "done" && s.kind === "more" && <p className="text-sm">{s.note}</p>}
|
||||
{s.action === "connect" && <ConnectSupabaseButton onDone={reload} onFail={() => setFallback(true)} />}
|
||||
{s.action === "connect" && (s.steps || s.fields) ? (
|
||||
{s.action === "pick" && <ProjectPicker onDone={() => window.location.reload()} />}
|
||||
{(s.action === "connect" || s.action === "pick") && (s.steps || s.fields) ? (
|
||||
<details className="text-sm" open={fallback} onToggle={(e) => setFallback(e.currentTarget.open)}>
|
||||
<summary className="cursor-pointer text-muted hover:text-ink">Button didn't work? Paste a connection string instead</summary>
|
||||
<summary className="cursor-pointer text-muted hover:text-ink">{s.fallback ?? "Button didn't work? Paste a connection string instead"}</summary>
|
||||
<div className="pt-3 space-y-4">
|
||||
<Steps steps={s.steps} />
|
||||
{form}
|
||||
|
||||
@@ -6,4 +6,8 @@ export const DB_MESSAGES: Record<string, string> = {
|
||||
"update-failed": "Connected, but a database update failed. Press Update database below to see why.",
|
||||
updated: "Connected. Tables updated.",
|
||||
current: "Connected. Tables are up to date.",
|
||||
filled: "Connected. broke filled in your project's address and public key and created its tables. One key left to paste.",
|
||||
"filled-no-tables": "Connected and filled in. Creating the tables didn't finish: press Update database under step 2.",
|
||||
pick: "Connected. Pick the project broke should use.",
|
||||
"no-project": "Connected. This account has no projects yet: make one below.",
|
||||
};
|
||||
Reference in new issue
Block a user