Neon / portal template support (#713)
TODOs: - [x] Do restart when checkout / restore if there is a DB - [x] List all branches (branch id, name, date) - [x] Allow checking out versions with no DB - [x] safeguard to never delete main branches - [x] create app hook for neon template - [x] weird UX with connector on configure panel - [x] tiny neon logo in connector - [x] deploy to vercel - [x] build forgot password page - [x] what about email setup - [x] lots of imgix errors - [x] edit file - db snapshot - [x] DYAD_DISABLE_DB_PUSH - [ ] update portal doc - [x] switch preview branch to be read-only endpoint - [x] disable supabase sys prompt if neon is enabled - [ ] https://payloadcms.com/docs/upload/storage-adapters - [x] need to use main branch... Phase 2? - [x] generate DB migrations
This commit is contained in:
Will Chen
240
src/neon_admin/neon_management_client.ts
Normal file
240
src/neon_admin/neon_management_client.ts
Normal file
@@ -0,0 +1,240 @@
|
||||
import { withLock } from "../ipc/utils/lock_utils";
|
||||
import { readSettings, writeSettings } from "../main/settings";
|
||||
import { Api, createApiClient } from "@neondatabase/api-client";
|
||||
import log from "electron-log";
|
||||
import { IS_TEST_BUILD } from "../ipc/utils/test_utils";
|
||||
|
||||
const logger = log.scope("neon_management_client");
|
||||
|
||||
/**
|
||||
* Checks if the Neon 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.neon?.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 Neon access token using the refresh token
|
||||
* Updates settings with new tokens and expiration time
|
||||
*/
|
||||
export async function refreshNeonToken(): Promise<void> {
|
||||
const settings = readSettings();
|
||||
const refreshToken = settings.neon?.refreshToken?.value;
|
||||
|
||||
if (!isTokenExpired(settings.neon?.expiresIn)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!refreshToken) {
|
||||
throw new Error("Neon refresh token not found. Please authenticate first.");
|
||||
}
|
||||
|
||||
try {
|
||||
// Make request to Neon refresh endpoint
|
||||
const response = await fetch(
|
||||
"https://oauth.dyad.sh/api/integrations/neon/refresh",
|
||||
|
||||
{
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({ refreshToken }),
|
||||
},
|
||||
);
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`Token refresh failed: ${response.statusText}`);
|
||||
}
|
||||
|
||||
const {
|
||||
accessToken,
|
||||
refreshToken: newRefreshToken,
|
||||
expiresIn,
|
||||
} = await response.json();
|
||||
|
||||
// Update settings with new tokens
|
||||
writeSettings({
|
||||
neon: {
|
||||
accessToken: {
|
||||
value: accessToken,
|
||||
},
|
||||
refreshToken: {
|
||||
value: newRefreshToken,
|
||||
},
|
||||
expiresIn,
|
||||
tokenTimestamp: Math.floor(Date.now() / 1000), // Store current timestamp
|
||||
},
|
||||
});
|
||||
} catch (error) {
|
||||
logger.error("Error refreshing Neon token:", error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
// Function to get the Neon API client
|
||||
export async function getNeonClient(): Promise<Api<unknown>> {
|
||||
if (IS_TEST_BUILD) {
|
||||
// Return a mock client for testing
|
||||
return {
|
||||
createProject: async (params: any) => ({
|
||||
data: {
|
||||
project: {
|
||||
id: "test-project-id",
|
||||
name: params.project.name,
|
||||
region_id: "aws-us-east-1",
|
||||
created_at: new Date().toISOString(),
|
||||
updated_at: new Date().toISOString(),
|
||||
default_branch_id: "test-branch-id",
|
||||
},
|
||||
connection_uris: [
|
||||
{
|
||||
connection_uri: "postgresql://test:test@test.neon.tech/test",
|
||||
},
|
||||
],
|
||||
},
|
||||
}),
|
||||
createProjectBranch: async (projectId: string, params: any) => ({
|
||||
data: {
|
||||
branch: {
|
||||
id: "test-dev-branch-id",
|
||||
name: params.branch?.name || "development",
|
||||
project_id: projectId,
|
||||
parent_id: "test-branch-id",
|
||||
created_at: new Date().toISOString(),
|
||||
updated_at: new Date().toISOString(),
|
||||
},
|
||||
connection_uris: [
|
||||
{
|
||||
connection_uri: "postgresql://test:test@test-dev.neon.tech/test",
|
||||
},
|
||||
],
|
||||
},
|
||||
}),
|
||||
getProject: async (projectId: string) => ({
|
||||
data: {
|
||||
project: {
|
||||
id: projectId,
|
||||
name: "Test Project",
|
||||
org_id: "test-org-id",
|
||||
created_at: new Date().toISOString(),
|
||||
updated_at: new Date().toISOString(),
|
||||
default_branch_id: "test-branch-id",
|
||||
},
|
||||
},
|
||||
}),
|
||||
listProjectBranches: async (projectId: string) => ({
|
||||
data: {
|
||||
branches: [
|
||||
{
|
||||
id: "test-branch-id",
|
||||
name: "main",
|
||||
project_id: projectId,
|
||||
created_at: new Date().toISOString(),
|
||||
updated_at: new Date().toISOString(),
|
||||
default: true,
|
||||
},
|
||||
{
|
||||
id: "test-dev-branch-id",
|
||||
name: "development",
|
||||
project_id: projectId,
|
||||
created_at: new Date().toISOString(),
|
||||
updated_at: new Date().toISOString(),
|
||||
default: false,
|
||||
},
|
||||
],
|
||||
},
|
||||
}),
|
||||
listOrganizations: async () => ({
|
||||
data: {
|
||||
organizations: [
|
||||
{
|
||||
id: "test-org-id",
|
||||
name: "Test Organization",
|
||||
},
|
||||
],
|
||||
},
|
||||
}),
|
||||
deleteProjectBranch: async (projectId: string, branchId: string) => ({
|
||||
data: {
|
||||
branch: {
|
||||
id: branchId,
|
||||
project_id: projectId,
|
||||
},
|
||||
},
|
||||
}),
|
||||
} as unknown as Api<unknown>;
|
||||
}
|
||||
|
||||
const settings = readSettings();
|
||||
|
||||
// Check if Neon token exists in settings
|
||||
const neonAccessToken = settings.neon?.accessToken?.value;
|
||||
const expiresIn = settings.neon?.expiresIn;
|
||||
|
||||
if (!neonAccessToken) {
|
||||
throw new Error("Neon access token not found. Please authenticate first.");
|
||||
}
|
||||
|
||||
// Check if token needs refreshing
|
||||
if (isTokenExpired(expiresIn)) {
|
||||
await withLock("refresh-neon-token", refreshNeonToken);
|
||||
// Get updated settings after refresh
|
||||
const updatedSettings = readSettings();
|
||||
const newAccessToken = updatedSettings.neon?.accessToken?.value;
|
||||
|
||||
if (!newAccessToken) {
|
||||
throw new Error("Failed to refresh Neon access token");
|
||||
}
|
||||
|
||||
return createApiClient({
|
||||
apiKey: newAccessToken,
|
||||
});
|
||||
}
|
||||
|
||||
return createApiClient({
|
||||
apiKey: neonAccessToken,
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the user's first organization ID from Neon
|
||||
*/
|
||||
export async function getNeonOrganizationId(): Promise<string> {
|
||||
const neonClient = await getNeonClient();
|
||||
|
||||
if (IS_TEST_BUILD) {
|
||||
return "test-org-id";
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await neonClient.getCurrentUserOrganizations();
|
||||
|
||||
if (
|
||||
!response.data?.organizations ||
|
||||
response.data.organizations.length === 0
|
||||
) {
|
||||
throw new Error("No organizations found for this Neon account");
|
||||
}
|
||||
|
||||
// Return the first organization ID
|
||||
return response.data.organizations[0].id;
|
||||
} catch (error) {
|
||||
logger.error("Error fetching Neon organizations:", error);
|
||||
throw new Error("Failed to fetch Neon organizations");
|
||||
}
|
||||
}
|
||||
|
||||
export function getNeonErrorMessage(error: any): string {
|
||||
const detailedMessage = error.response?.data?.message ?? "";
|
||||
return error.message + " " + detailedMessage;
|
||||
}
|
||||
24
src/neon_admin/neon_return_handler.ts
Normal file
24
src/neon_admin/neon_return_handler.ts
Normal file
@@ -0,0 +1,24 @@
|
||||
import { writeSettings } from "../main/settings";
|
||||
|
||||
export function handleNeonOAuthReturn({
|
||||
token,
|
||||
refreshToken,
|
||||
expiresIn,
|
||||
}: {
|
||||
token: string;
|
||||
refreshToken: string;
|
||||
expiresIn: number;
|
||||
}) {
|
||||
writeSettings({
|
||||
neon: {
|
||||
accessToken: {
|
||||
value: token,
|
||||
},
|
||||
refreshToken: {
|
||||
value: refreshToken,
|
||||
},
|
||||
expiresIn,
|
||||
tokenTimestamp: Math.floor(Date.now() / 1000),
|
||||
},
|
||||
});
|
||||
}
|
||||
Reference in New Issue
Block a user