feat(vercel): refactor Vercel resource path handling and improve redirect URL safety

Author: 0ski

apps/webapp/app/components/integrations/VercelOnboardingModal.tsx

@@ -44,8 +44,7 @@ import {
 } from "~/v3/vercel/vercelProjectIntegrationSchema";
 import { type VercelCustomEnvironment } from "~/models/vercelIntegration.server";
 import { type VercelOnboardingData } from "~/presenters/v3/VercelSettingsPresenter.server";
-import { vercelAppInstallPath, v3ProjectSettingsPath, githubAppInstallPath } from "~/utils/pathBuilder";
-import { vercelResourcePath } from "~/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel";
+import { vercelAppInstallPath, v3ProjectSettingsPath, githubAppInstallPath, vercelResourcePath } from "~/utils/pathBuilder";
 import type { loader } from "~/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel";
 import { useEffect, useState, useCallback, useRef } from "react";
 
@@ -520,7 +519,10 @@ export function VercelOnboardingModal({
         return;
       }
       if ("redirectTo" in completeOnboardingFetcher.data && typeof completeOnboardingFetcher.data.redirectTo === "string") {
-        window.location.href = completeOnboardingFetcher.data.redirectTo;
+        const validRedirect = safeRedirectUrl(completeOnboardingFetcher.data.redirectTo);
+        if (validRedirect) {
+          window.location.href = validRedirect;
+        }
         return;
       }
       setState("completed");

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings/route.tsx

@@ -38,7 +38,7 @@ import {
 import { ProjectSettingsService } from "~/services/projectSettings.server";
 import { logger } from "~/services/logger.server";
 import { requireUserId } from "~/services/session.server";
-import { organizationPath, v3ProjectPath, EnvironmentParamSchema, v3BillingPath } from "~/utils/pathBuilder";
+import { organizationPath, v3ProjectPath, EnvironmentParamSchema, v3BillingPath, vercelResourcePath } from "~/utils/pathBuilder";
 import React, { useEffect, useState, useCallback, useRef } from "react";
 import { useSearchParams } from "@remix-run/react";
 import { useEnvironment } from "~/hooks/useEnvironment";
@@ -48,7 +48,6 @@ import { GitHubSettingsPanel } from "../resources.orgs.$organizationSlug.project
 import {
   VercelSettingsPanel,
   VercelOnboardingModal,
-  vercelResourcePath,
 } from "../resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel";
 import type { loader as vercelLoader } from "../resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel";
 import { OrgIntegrationRepository } from "~/models/orgIntegration.server";

apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx

@@ -31,7 +31,6 @@ import {
   organizationPath,
   selectPlanPath,
   v3ProjectPath,
-  v3ProjectSettingsPath,
 } from "~/utils/pathBuilder";
 import { generateVercelOAuthState } from "~/v3/vercel/vercelOAuthState.server";
 

apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel.tsx

@@ -43,7 +43,7 @@ import { findProjectBySlug } from "~/models/project.server";
 import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
 import { logger } from "~/services/logger.server";
 import { requireUserId } from "~/services/session.server";
-import { EnvironmentParamSchema, v3ProjectSettingsPath, vercelAppInstallPath } from "~/utils/pathBuilder";
+import { EnvironmentParamSchema, v3ProjectSettingsPath, vercelAppInstallPath, vercelResourcePath } from "~/utils/pathBuilder";
 import {
   VercelSettingsPresenter,
   type VercelOnboardingData,
@@ -409,15 +409,6 @@ export async function action({ request, params }: ActionFunctionArgs) {
   }
 }
 
-export function vercelResourcePath(
-  organizationSlug: string,
-  projectSlug: string,
-  environmentSlug: string
-) {
-  return `/resources/orgs/${organizationSlug}/projects/${projectSlug}/env/${environmentSlug}/vercel`;
-}
-
-
 function VercelConnectionPrompt({
   organizationSlug,
   projectSlug,

apps/webapp/app/services/vercelIntegration.server.ts

@@ -45,7 +45,6 @@ export class VercelIntegrationService {
 
   async getVercelProjectIntegration(
     projectId: string,
-    migrateIfNeeded: boolean = false
   ): Promise<VercelProjectIntegrationWithData | null> {
     const integration = await this.#prismaClient.organizationProjectIntegration.findFirst({
       where: {

apps/webapp/app/utils/pathBuilder.ts

@@ -168,13 +168,11 @@ export function vercelCallbackPath() {
 }
 
 export function vercelResourcePath(
-  organization: OrgForPath,
-  project: ProjectForPath,
-  environment: EnvironmentForPath
+  organizationSlug: string,
+  projectSlug: string,
+  environmentSlug: string
 ) {
-  return `/resources/orgs/${organizationParam(organization)}/projects/${projectParam(
-    project
-  )}/env/${environmentParam(environment)}/vercel`;
+  return `/resources/orgs/${organizationSlug}/projects/${projectSlug}/env/${environmentSlug}/vercel`;
 }
 
 export function v3EnvironmentPath(