<!-- This is an auto-generated description by cubic. -->
## Summary by cubic
Adds Supabase database branch selection per app, with a new schema field
and UI to choose a branch after connecting a project. Resets branch when
changing or disconnecting the project to keep state consistent.
- **New Features**
- Added apps.supabase_branch_id column.
- Branch dropdown in SupabaseConnector shown after a project is
connected; selection persists and triggers app refresh.
- New state and hooks: supabaseBranchesAtom, loadBranches(projectId),
setAppBranch(branchId).
- IPC endpoints: supabase:list-branches and supabase:set-app-branch;
setting/unsetting project also clears the branch.
- **Migration**
- Apply drizzle migration 0013_supabase_branch.sql to add the
supabase_branch_id column (defaults to null).
<!-- End of auto-generated description by cubic. -->
<!-- CURSOR_SUMMARY -->
---
> [!NOTE]
> Adds Supabase database branch selection per app, including parent
project tracking, new IPC endpoints, UI dropdown, and an accompanying DB
migration with e2e tests.
>
> - **Database**:
> - Add `apps.supabase_parent_project_id` via migration
`drizzle/0015_complete_old_lace.sql`; snapshot and journal updated.
> - **IPC/Main**:
> - New `supabase:list-branches` handler and management client
`listSupabaseBranches` (real API + test stubs).
> - Update `supabase:set-app-project` to accept `{ projectId,
parentProjectId?, appId }`; unset clears both IDs.
> - `get-app` resolves `supabaseProjectName` using
`supabase_parent_project_id` when present.
> - **Types & Client**:
> - Add `SupabaseBranch`, `SetSupabaseAppProjectParams`, and
`App.supabaseParentProjectId`; expose `listSupabaseBranches` and updated
`setSupabaseAppProject` in `ipc_client` and preload whitelist.
> - **UI/Hooks**:
> - Supabase UI: branch dropdown in `SupabaseConnector` with
`loadBranches`, selection persists via updated `setAppProject`.
> - State: add `supabaseBranchesAtom`; `useSupabase` gets `branches`,
`loadBranches`, new param shape for `setAppProject`.
> - TokenBar/ChatInput: add `data-testid` for token bar and toggle.
> - **Supabase Context (tests)**:
> - Test build returns large context for `test-branch-project-id` to
validate branch selection.
> - **E2E Tests**:
> - Add `supabase_branch.spec.ts` and snapshot verifying branch
selection affects token usage.
>
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
33054278db8396b4371ed6e8224105cb5684b7ac. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->
301 lines
7.8 KiB
TypeScript
301 lines
7.8 KiB
TypeScript
import { withLock } from "../ipc/utils/lock_utils";
|
|
import { readSettings, writeSettings } from "../main/settings";
|
|
import {
|
|
SupabaseManagementAPI,
|
|
SupabaseManagementAPIError,
|
|
} from "@dyad-sh/supabase-management-js";
|
|
import log from "electron-log";
|
|
import { IS_TEST_BUILD } from "../ipc/utils/test_utils";
|
|
|
|
const logger = log.scope("supabase_management_client");
|
|
|
|
/**
|
|
* Checks if the Supabase access token is expired or about to expire
|
|
* Returns true if token needs to be refreshed
|
|
*/
|
|
function isTokenExpired(expiresIn?: number): boolean {
|
|
if (!expiresIn) return true;
|
|
|
|
// Get when the token was saved (expiresIn is stored at the time of token receipt)
|
|
const settings = readSettings();
|
|
const tokenTimestamp = settings.supabase?.tokenTimestamp || 0;
|
|
const currentTime = Math.floor(Date.now() / 1000);
|
|
|
|
// Check if the token is expired or about to expire (within 5 minutes)
|
|
return currentTime >= tokenTimestamp + expiresIn - 300;
|
|
}
|
|
|
|
/**
|
|
* Refreshes the Supabase access token using the refresh token
|
|
* Updates settings with new tokens and expiration time
|
|
*/
|
|
export async function refreshSupabaseToken(): Promise<void> {
|
|
const settings = readSettings();
|
|
const refreshToken = settings.supabase?.refreshToken?.value;
|
|
|
|
if (!isTokenExpired(settings.supabase?.expiresIn)) {
|
|
return;
|
|
}
|
|
|
|
if (!refreshToken) {
|
|
throw new Error(
|
|
"Supabase refresh token not found. Please authenticate first.",
|
|
);
|
|
}
|
|
|
|
try {
|
|
// Make request to Supabase refresh endpoint
|
|
const response = await fetch(
|
|
"https://supabase-oauth.dyad.sh/api/connect-supabase/refresh",
|
|
{
|
|
method: "POST",
|
|
headers: {
|
|
"Content-Type": "application/json",
|
|
},
|
|
body: JSON.stringify({ refreshToken }),
|
|
},
|
|
);
|
|
|
|
if (!response.ok) {
|
|
throw new Error(
|
|
`Supabase token refresh failed. Try going to Settings to disconnect Supabase and then reconnect to Supabase. Error status: ${response.statusText}`,
|
|
);
|
|
}
|
|
|
|
const {
|
|
accessToken,
|
|
refreshToken: newRefreshToken,
|
|
expiresIn,
|
|
} = await response.json();
|
|
|
|
// Update settings with new tokens
|
|
writeSettings({
|
|
supabase: {
|
|
accessToken: {
|
|
value: accessToken,
|
|
},
|
|
refreshToken: {
|
|
value: newRefreshToken,
|
|
},
|
|
expiresIn,
|
|
tokenTimestamp: Math.floor(Date.now() / 1000), // Store current timestamp
|
|
},
|
|
});
|
|
} catch (error) {
|
|
logger.error("Error refreshing Supabase token:", error);
|
|
throw error;
|
|
}
|
|
}
|
|
|
|
// Function to get the Supabase Management API client
|
|
export async function getSupabaseClient(): Promise<SupabaseManagementAPI> {
|
|
const settings = readSettings();
|
|
|
|
// Check if Supabase token exists in settings
|
|
const supabaseAccessToken = settings.supabase?.accessToken?.value;
|
|
const expiresIn = settings.supabase?.expiresIn;
|
|
|
|
if (!supabaseAccessToken) {
|
|
throw new Error(
|
|
"Supabase access token not found. Please authenticate first.",
|
|
);
|
|
}
|
|
|
|
// Check if token needs refreshing
|
|
if (isTokenExpired(expiresIn)) {
|
|
await withLock("refresh-supabase-token", refreshSupabaseToken);
|
|
// Get updated settings after refresh
|
|
const updatedSettings = readSettings();
|
|
const newAccessToken = updatedSettings.supabase?.accessToken?.value;
|
|
|
|
if (!newAccessToken) {
|
|
throw new Error("Failed to refresh Supabase access token");
|
|
}
|
|
|
|
return new SupabaseManagementAPI({
|
|
accessToken: newAccessToken,
|
|
});
|
|
}
|
|
|
|
return new SupabaseManagementAPI({
|
|
accessToken: supabaseAccessToken,
|
|
});
|
|
}
|
|
|
|
export async function getSupabaseProjectName(
|
|
projectId: string,
|
|
): Promise<string> {
|
|
if (IS_TEST_BUILD) {
|
|
return "Fake Supabase Project";
|
|
}
|
|
|
|
const supabase = await getSupabaseClient();
|
|
const projects = await supabase.getProjects();
|
|
const project = projects?.find((p) => p.id === projectId);
|
|
return project?.name || `<project not found for: ${projectId}>`;
|
|
}
|
|
|
|
export async function executeSupabaseSql({
|
|
supabaseProjectId,
|
|
query,
|
|
}: {
|
|
supabaseProjectId: string;
|
|
query: string;
|
|
}): Promise<string> {
|
|
if (IS_TEST_BUILD) {
|
|
return "{}";
|
|
}
|
|
|
|
const supabase = await getSupabaseClient();
|
|
const result = await supabase.runQuery(supabaseProjectId, query);
|
|
return JSON.stringify(result);
|
|
}
|
|
|
|
export async function deleteSupabaseFunction({
|
|
supabaseProjectId,
|
|
functionName,
|
|
}: {
|
|
supabaseProjectId: string;
|
|
functionName: string;
|
|
}): Promise<void> {
|
|
logger.info(
|
|
`Deleting Supabase function: ${functionName} from project: ${supabaseProjectId}`,
|
|
);
|
|
const supabase = await getSupabaseClient();
|
|
await supabase.deleteFunction(supabaseProjectId, functionName);
|
|
logger.info(
|
|
`Deleted Supabase function: ${functionName} from project: ${supabaseProjectId}`,
|
|
);
|
|
}
|
|
|
|
export async function listSupabaseBranches({
|
|
supabaseProjectId,
|
|
}: {
|
|
supabaseProjectId: string;
|
|
}): Promise<
|
|
Array<{
|
|
id: string;
|
|
name: string;
|
|
is_default: boolean;
|
|
project_ref: string;
|
|
parent_project_ref: string;
|
|
}>
|
|
> {
|
|
if (IS_TEST_BUILD) {
|
|
return [
|
|
{
|
|
id: "default-branch-id",
|
|
name: "Default Branch",
|
|
is_default: true,
|
|
project_ref: "fake-project-id",
|
|
parent_project_ref: "fake-project-id",
|
|
},
|
|
|
|
{
|
|
id: "test-branch-id",
|
|
name: "Test Branch",
|
|
is_default: false,
|
|
project_ref: "test-branch-project-id",
|
|
parent_project_ref: "fake-project-id",
|
|
},
|
|
];
|
|
}
|
|
|
|
logger.info(`Listing Supabase branches for project: ${supabaseProjectId}`);
|
|
const supabase = await getSupabaseClient();
|
|
|
|
const response = await fetch(
|
|
`https://api.supabase.com/v1/projects/${supabaseProjectId}/branches`,
|
|
{
|
|
method: "GET",
|
|
headers: {
|
|
Authorization: `Bearer ${(supabase as any).options.accessToken}`,
|
|
},
|
|
},
|
|
);
|
|
|
|
if (response.status !== 200) {
|
|
throw await createResponseError(response, "list branches");
|
|
}
|
|
|
|
logger.info(`Listed Supabase branches for project: ${supabaseProjectId}`);
|
|
const jsonResponse = await response.json();
|
|
return jsonResponse;
|
|
}
|
|
|
|
export async function deploySupabaseFunctions({
|
|
supabaseProjectId,
|
|
functionName,
|
|
content,
|
|
}: {
|
|
supabaseProjectId: string;
|
|
functionName: string;
|
|
content: string;
|
|
}): Promise<void> {
|
|
logger.info(
|
|
`Deploying Supabase function: ${functionName} to project: ${supabaseProjectId}`,
|
|
);
|
|
const supabase = await getSupabaseClient();
|
|
const formData = new FormData();
|
|
formData.append(
|
|
"metadata",
|
|
JSON.stringify({
|
|
entrypoint_path: "index.ts",
|
|
name: functionName,
|
|
// See: https://github.com/dyad-sh/dyad/issues/1010
|
|
verify_jwt: false,
|
|
}),
|
|
);
|
|
formData.append("file", new Blob([content]), "index.ts");
|
|
|
|
const response = await fetch(
|
|
`https://api.supabase.com/v1/projects/${supabaseProjectId}/functions/deploy?slug=${functionName}`,
|
|
{
|
|
method: "POST",
|
|
headers: {
|
|
Authorization: `Bearer ${(supabase as any).options.accessToken}`,
|
|
},
|
|
body: formData,
|
|
},
|
|
);
|
|
|
|
if (response.status !== 201) {
|
|
throw await createResponseError(response, "create function");
|
|
}
|
|
|
|
logger.info(
|
|
`Deployed Supabase function: ${functionName} to project: ${supabaseProjectId}`,
|
|
);
|
|
return response.json();
|
|
}
|
|
|
|
async function createResponseError(response: Response, action: string) {
|
|
const errorBody = await safeParseErrorResponseBody(response);
|
|
|
|
return new SupabaseManagementAPIError(
|
|
`Failed to ${action}: ${response.statusText} (${response.status})${
|
|
errorBody ? `: ${errorBody.message}` : ""
|
|
}`,
|
|
response,
|
|
);
|
|
}
|
|
|
|
async function safeParseErrorResponseBody(
|
|
response: Response,
|
|
): Promise<{ message: string } | undefined> {
|
|
try {
|
|
const body = await response.json();
|
|
|
|
if (
|
|
typeof body === "object" &&
|
|
body !== null &&
|
|
"message" in body &&
|
|
typeof body.message === "string"
|
|
) {
|
|
return { message: body.message };
|
|
}
|
|
} catch {
|
|
return;
|
|
}
|
|
}
|