Skip to content

Commit 6a09e0a

Browse files
0ski0ski
committed
refactor(vercel): tidy imports, adjust dialog structure, and unify types
- replace vercelResourcePath with v3ProjectSettingsPath for linking to project settings pages so routing uses the v3 path helper. - move DialogDescription out of DialogHeader and into DialogContent to correct markup/structure and restore the form buttons layout inside the dialog content. - remove unused import (confirmBasicDetailsPath) and unused OAuth state generator import to keep callback route imports minimal. - change secret type from "sensitive"/"plain" to "encrypted" when syncing Vercel trigger keys to standardize storage semantics. - fix a stray/partial line in the Vercel callback file (cleanup after parameter parsing). These changes improve routing consistency, correct dialog markup for accessibility and layout, standardize secret typing, and clean up unused imports and stray code.
1 parent 12cbac8 commit 6a09e0a

File tree

3 files changed

+39
-53
lines changed

3 files changed

+39
-53
lines changed

‎apps/webapp/app/models/vercelIntegration.server.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@ export class VercelIntegrationRepository {
871871
key: "TRIGGER_SECRET_KEY",
872872
value: env.apiKey,
873873
target: vercelTarget,
874-
type: "sensitive",
874+
type: "encrypted",
875875
environmentType: env.type,
876876
});
877877
}
@@ -998,7 +998,7 @@ export class VercelIntegrationRepository {
998998
key: "TRIGGER_SECRET_KEY",
999999
value: params.apiKey,
10001000
target: vercelTarget,
1001-
type: "plain",
1001+
type: "encrypted",
10021002
});
10031003

10041004
logger.info("Synced regenerated API key to Vercel", {

‎apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.integrations.vercel.tsx‎

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { requireUserId } from "~/services/session.server";
2929
import { OrganizationParamsSchema } from "~/utils/pathBuilder";
3030
import { logger } from "~/services/logger.server";
3131
import { TrashIcon } from "@heroicons/react/20/solid";
32-
import { vercelResourcePath } from "~/utils/pathBuilder";
32+
import { v3ProjectSettingsPath } from "~/utils/pathBuilder";
3333
import { LinkButton } from "~/components/primitives/Buttons";
3434

3535
function formatDate(date: Date): string {
@@ -291,33 +291,31 @@ export default function VercelIntegrationPage() {
291291
<DialogContent>
292292
<DialogHeader>
293293
<DialogTitle>Remove Vercel Integration</DialogTitle>
294-
<DialogDescription>
295-
This will permanently remove the Vercel integration and disconnect all projects.
296-
This action cannot be undone.
297-
</DialogDescription>
298294
</DialogHeader>
299-
<DialogFooter>
300-
<FormButtons
301-
confirmButton={
302-
<Form method="post">
303-
<input type="hidden" name="intent" value="uninstall" />
304-
<Button
305-
variant="danger/medium"
306-
LeadingIcon={TrashIcon}
307-
type="submit"
308-
disabled={isUninstalling}
309-
>
310-
{isUninstalling ? "Removing..." : "Remove Integration"}
311-
</Button>
312-
</Form>
313-
}
314-
cancelButton={
315-
<DialogClose asChild>
316-
<Button variant="tertiary/medium">Cancel</Button>
317-
</DialogClose>
318-
}
319-
/>
320-
</DialogFooter>
295+
<DialogDescription>
296+
This will permanently remove the Vercel integration and disconnect all projects.
297+
This action cannot be undone.
298+
</DialogDescription>
299+
<FormButtons
300+
confirmButton={
301+
<Form method="post">
302+
<input type="hidden" name="intent" value="uninstall" />
303+
<Button
304+
variant="danger/medium"
305+
LeadingIcon={TrashIcon}
306+
type="submit"
307+
disabled={isUninstalling}
308+
>
309+
{isUninstalling ? "Removing..." : "Remove Integration"}
310+
</Button>
311+
</Form>
312+
}
313+
cancelButton={
314+
<DialogClose asChild>
315+
<Button variant="tertiary/medium">Cancel</Button>
316+
</DialogClose>
317+
}
318+
/>
321319
</DialogContent>
322320
</Dialog>
323321
{actionData?.error && (
@@ -364,7 +362,7 @@ export default function VercelIntegrationPage() {
364362
<TableCell>
365363
<LinkButton
366364
variant="minimal/small"
367-
to={vercelResourcePath(
365+
to={v3ProjectSettingsPath(
368366
organization,
369367
projectIntegration.project,
370368
{ slug: "prod" } // Default to production environment

‎apps/webapp/app/routes/callback.vercel.ts‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import { logger } from "~/services/logger.server";
99
import { getUserId, requireUserId } from "~/services/session.server";
1010
import { setReferralSourceCookie } from "~/services/referralSource.server";
1111
import { requestUrl } from "~/utils/requestUrl.server";
12-
import { v3ProjectSettingsPath, confirmBasicDetailsPath, newOrganizationPath, newProjectPath } from "~/utils/pathBuilder";
13-
import { validateVercelOAuthState, generateVercelOAuthState } from "~/v3/vercel/vercelOAuthState.server";
12+
import { v3ProjectSettingsPath, confirmBasicDetailsPath, newProjectPath } from "~/utils/pathBuilder";
13+
import { validateVercelOAuthState } from "~/v3/vercel/vercelOAuthState.server";
1414

1515
/**
1616
* Schema for Vercel OAuth callback query parameters.
@@ -85,7 +85,7 @@ export async function loader({ request }: LoaderFunctionArgs) {
8585
throw new Response("Invalid callback parameters", { status: 400 });
8686
}
8787

88-
const { code, state, error, error_description, configurationId, teamId } = parsedParams.data;
88+
const { code, state, error, error_description, configurationId, next: nextUrl } = parsedParams.data;
8989

9090
// Handle errors from Vercel
9191
if (error) {
@@ -133,8 +133,8 @@ export async function loader({ request }: LoaderFunctionArgs) {
133133
configurationId,
134134
integration: "vercel",
135135
});
136-
if (parsedParams.data.next) {
137-
params.set("next", parsedParams.data.next);
136+
if (nextUrl && !state) {
137+
params.set("next", nextUrl);
138138
}
139139
const onboardingUrl = `${confirmBasicDetailsPath()}?${params.toString()}`;
140140
return redirect(onboardingUrl);
@@ -150,8 +150,8 @@ export async function loader({ request }: LoaderFunctionArgs) {
150150
configurationId,
151151
integration: "vercel",
152152
});
153-
if (parsedParams.data.next) {
154-
params.set("next", parsedParams.data.next);
153+
if (nextUrl && !state) {
154+
params.set("next", nextUrl);
155155
}
156156
const projectUrl = `${newProjectPath({ slug: firstOrg.slug })}?${params.toString()}`;
157157
return redirect(projectUrl);
@@ -210,15 +210,6 @@ export async function loader({ request }: LoaderFunctionArgs) {
210210
);
211211
}
212212

213-
// Generate state JWT for the integration
214-
const stateJWT = await generateVercelOAuthState({
215-
organizationId: userOrg.id,
216-
projectId: userProject.id,
217-
environmentSlug: environment.slug,
218-
organizationSlug: userOrg.slug,
219-
projectSlug: userProject.slug,
220-
});
221-
222213
// Now proceed with the normal flow using the generated state
223214
// We'll use the stateData from the generated state
224215
const stateData = {
@@ -300,8 +291,8 @@ export async function loader({ request }: LoaderFunctionArgs) {
300291
);
301292

302293
const params = new URLSearchParams({ vercelOnboarding: "true" });
303-
if (parsedParams.data.next) {
304-
params.set("next", parsedParams.data.next);
294+
if (nextUrl && !state) {
295+
params.set("next", nextUrl);
305296
}
306297
return redirect(`${settingsPath}?${params.toString()}`);
307298
} catch (error) {
@@ -397,9 +388,6 @@ export async function loader({ request }: LoaderFunctionArgs) {
397388
throw new Error("Failed to create or find Vercel organization integration");
398389
}
399390

400-
// Fetch Vercel projects to get the project name
401-
const vercelClient = await VercelIntegrationRepository.getVercelClient(orgIntegration);
402-
403391
// The OrganizationIntegration is now created.
404392
// The user will select a Vercel project during onboarding, which will create the
405393
// OrganizationProjectIntegration record and sync API keys to Vercel.
@@ -418,8 +406,8 @@ export async function loader({ request }: LoaderFunctionArgs) {
418406
);
419407

420408
const params = new URLSearchParams({ vercelOnboarding: "true" });
421-
if (parsedParams.data.next) {
422-
params.set("next", parsedParams.data.next);
409+
if (nextUrl && !state) {
410+
params.set("next", nextUrl);
423411
}
424412
return redirect(`${settingsPath}?${params.toString()}`);
425413
} catch (error) {

0 commit comments

Comments
 (0)