fix(workspace-panel): resolve workspace via /api/workspaces, not URL slug
The panel was fetching /api/workspaces/{urlSlug} where {urlSlug}
is whatever is in the `[workspace]` dynamic segment (e.g.
"mark-account"). That slug has nothing to do with vibn_workspaces.slug,
which is derived from the user's email — so the fetch 404'd, the
component showed "Loading workspace…" forever, and minting/revoking
would target a non-existent workspace.
Now:
- GET /api/workspaces lazy-creates a workspace row if the signed-in
user has none (migration path for accounts created before the
signIn hook was added).
- WorkspaceKeysPanel discovers the user's actual workspace from that
list and uses *its* slug for all subsequent calls (details, keys,
provisioning, revocation).
- Empty / error states render a proper card with a retry button
instead of a bare "Workspace not found." line.
Made-with: Cursor
This commit is contained in:
@@ -68,10 +68,18 @@ interface MintedKey {
|
||||
const APP_BASE =
|
||||
typeof window !== "undefined" ? window.location.origin : "https://vibnai.com";
|
||||
|
||||
export function WorkspaceKeysPanel({ workspaceSlug }: { workspaceSlug: string }) {
|
||||
/**
|
||||
* The URL param (e.g. `/mark-account/settings`) is treated as a hint —
|
||||
* the actual workspace is resolved via `GET /api/workspaces`, which is
|
||||
* keyed off the signed-in user. That endpoint also lazy-creates the
|
||||
* workspace row for users who signed in before the workspace hook
|
||||
* landed, so this panel never gets stuck on a missing row.
|
||||
*/
|
||||
export function WorkspaceKeysPanel({ workspaceSlug: _urlHint }: { workspaceSlug?: string }) {
|
||||
const [workspace, setWorkspace] = useState<WorkspaceSummary | null>(null);
|
||||
const [keys, setKeys] = useState<ApiKey[]>([]);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [errorMsg, setErrorMsg] = useState<string | null>(null);
|
||||
const [provisioning, setProvisioning] = useState(false);
|
||||
|
||||
const [showCreate, setShowCreate] = useState(false);
|
||||
@@ -84,31 +92,50 @@ export function WorkspaceKeysPanel({ workspaceSlug }: { workspaceSlug: string })
|
||||
|
||||
const refresh = useCallback(async () => {
|
||||
setLoading(true);
|
||||
setErrorMsg(null);
|
||||
try {
|
||||
const [wsRes, keysRes] = await Promise.all([
|
||||
fetch(`/api/workspaces/${workspaceSlug}`),
|
||||
fetch(`/api/workspaces/${workspaceSlug}/keys`),
|
||||
]);
|
||||
if (wsRes.ok) setWorkspace(await wsRes.json());
|
||||
const listRes = await fetch(`/api/workspaces`, { credentials: "include" });
|
||||
if (!listRes.ok) {
|
||||
const body = listRes.status === 401
|
||||
? "Sign in to view your workspace."
|
||||
: `Couldn't load workspace (HTTP ${listRes.status}).`;
|
||||
setErrorMsg(body);
|
||||
setWorkspace(null);
|
||||
setKeys([]);
|
||||
return;
|
||||
}
|
||||
const list = (await listRes.json()) as { workspaces: WorkspaceSummary[] };
|
||||
const ws = list.workspaces?.[0] ?? null;
|
||||
setWorkspace(ws);
|
||||
if (!ws) {
|
||||
setKeys([]);
|
||||
return;
|
||||
}
|
||||
const keysRes = await fetch(`/api/workspaces/${ws.slug}/keys`, { credentials: "include" });
|
||||
if (keysRes.ok) {
|
||||
const j = (await keysRes.json()) as { keys: ApiKey[] };
|
||||
setKeys(j.keys ?? []);
|
||||
}
|
||||
} catch (err) {
|
||||
console.error("[workspace-keys] refresh failed", err);
|
||||
setErrorMsg(err instanceof Error ? err.message : String(err));
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
}, [workspaceSlug]);
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
refresh();
|
||||
}, [refresh]);
|
||||
|
||||
const provision = useCallback(async () => {
|
||||
if (!workspace) return;
|
||||
setProvisioning(true);
|
||||
try {
|
||||
const res = await fetch(`/api/workspaces/${workspaceSlug}/provision`, { method: "POST" });
|
||||
const res = await fetch(`/api/workspaces/${workspace.slug}/provision`, {
|
||||
method: "POST",
|
||||
credentials: "include",
|
||||
});
|
||||
if (!res.ok) throw new Error(await res.text());
|
||||
toast.success("Provisioning re-run");
|
||||
await refresh();
|
||||
@@ -117,17 +144,19 @@ export function WorkspaceKeysPanel({ workspaceSlug }: { workspaceSlug: string })
|
||||
} finally {
|
||||
setProvisioning(false);
|
||||
}
|
||||
}, [workspaceSlug, refresh]);
|
||||
}, [workspace, refresh]);
|
||||
|
||||
const createKey = useCallback(async () => {
|
||||
if (!workspace) return;
|
||||
if (!newName.trim()) {
|
||||
toast.error("Give the key a name");
|
||||
return;
|
||||
}
|
||||
setCreating(true);
|
||||
try {
|
||||
const res = await fetch(`/api/workspaces/${workspaceSlug}/keys`, {
|
||||
const res = await fetch(`/api/workspaces/${workspace.slug}/keys`, {
|
||||
method: "POST",
|
||||
credentials: "include",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ name: newName.trim() }),
|
||||
});
|
||||
@@ -142,15 +171,15 @@ export function WorkspaceKeysPanel({ workspaceSlug }: { workspaceSlug: string })
|
||||
} finally {
|
||||
setCreating(false);
|
||||
}
|
||||
}, [workspaceSlug, newName, refresh]);
|
||||
}, [workspace, newName, refresh]);
|
||||
|
||||
const revokeKey = useCallback(async () => {
|
||||
if (!keyToRevoke) return;
|
||||
if (!workspace || !keyToRevoke) return;
|
||||
setRevoking(true);
|
||||
try {
|
||||
const res = await fetch(
|
||||
`/api/workspaces/${workspaceSlug}/keys/${keyToRevoke.id}`,
|
||||
{ method: "DELETE" }
|
||||
`/api/workspaces/${workspace.slug}/keys/${keyToRevoke.id}`,
|
||||
{ method: "DELETE", credentials: "include" }
|
||||
);
|
||||
if (!res.ok) throw new Error(await res.text());
|
||||
toast.success("Key revoked");
|
||||
@@ -161,21 +190,39 @@ export function WorkspaceKeysPanel({ workspaceSlug }: { workspaceSlug: string })
|
||||
} finally {
|
||||
setRevoking(false);
|
||||
}
|
||||
}, [workspaceSlug, keyToRevoke, refresh]);
|
||||
}, [workspace, keyToRevoke, refresh]);
|
||||
|
||||
if (loading && !workspace) {
|
||||
return (
|
||||
<div style={{ padding: 24, color: "var(--muted)", fontSize: 13 }}>
|
||||
<Loader2 className="inline animate-spin" size={14} /> Loading workspace…
|
||||
</div>
|
||||
<section style={cardStyle}>
|
||||
<div style={{ display: "flex", alignItems: "center", gap: 8, color: "var(--muted)", fontSize: 13 }}>
|
||||
<Loader2 className="animate-spin" size={14} /> Loading workspace…
|
||||
</div>
|
||||
</section>
|
||||
);
|
||||
}
|
||||
|
||||
if (!workspace) {
|
||||
return (
|
||||
<div style={{ padding: 24, color: "var(--muted)", fontSize: 13 }}>
|
||||
Workspace not found.
|
||||
</div>
|
||||
<section style={cardStyle}>
|
||||
<header style={cardHeaderStyle}>
|
||||
<div>
|
||||
<h2 style={cardTitleStyle}>Workspace</h2>
|
||||
<p style={cardSubtitleStyle}>
|
||||
{errorMsg ?? "No workspace yet — this usually means you signed in before AI access was rolled out."}
|
||||
</p>
|
||||
</div>
|
||||
<Button variant="outline" size="sm" onClick={refresh} disabled={loading}>
|
||||
{loading ? <Loader2 className="animate-spin" size={14} /> : <RefreshCw size={14} />}
|
||||
Try again
|
||||
</Button>
|
||||
</header>
|
||||
<p style={{ fontSize: 12.5, color: "var(--muted)", margin: 0 }}>
|
||||
Try signing out and back in, then refresh this page. If the problem
|
||||
persists, the API may be down or your account may need to be
|
||||
provisioned manually.
|
||||
</p>
|
||||
</section>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user