General improvements to Vercel Integration

backend/src/services/secret-sync/vercel/vercel-sync-fns.ts

@@ -1,12 +1,15 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { request } from "@app/lib/config/request";
-import { logger } from "@app/lib/logger";
 import { IntegrationUrls } from "@app/services/integration-auth/integration-list";
 import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";
 import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";
 
 import { VercelEnvironmentType } from "./vercel-sync-enums";
-import { TVercelSyncWithCredentials, VercelApiSecret } from "./vercel-sync-types";
+import { DefaultVercelEnvType, TVercelSyncWithCredentials, VercelApiSecret } from "./vercel-sync-types";
+
+function isVercelDefaultEnvType(value: string): value is DefaultVercelEnvType {
+  return Object.values(VercelEnvironmentType).map(String).includes(value);
+}
 
 const getVercelSecrets = async (secretSync: TVercelSyncWithCredentials) => {
   const {
@@ -22,7 +25,7 @@ const getVercelSecrets = async (secretSync: TVercelSyncWithCredentials) => {
   };
 
   const { data } = await request.get<{ envs: VercelApiSecret[] }>(
-    `${IntegrationUrls.VERCEL_API_URL}/v9/projects/${destinationConfig.app}/env`,
+    `${IntegrationUrls.VERCEL_API_URL}/v9/projects/${destinationConfig.app}/env?teamId=${destinationConfig.teamId}`,
     {
       params,
       headers: {
@@ -33,7 +36,12 @@ const getVercelSecrets = async (secretSync: TVercelSyncWithCredentials) => {
   );
 
   const filteredSecrets = data.envs.filter((secret) => {
-    // For environment-specific filtering
+    if (!isVercelDefaultEnvType(destinationConfig.env)) {
+      if (secret.customEnvironmentIds?.includes(destinationConfig.env)) {
+        return true;
+      }
+      return false;
+    }
     if (secret.target.includes(destinationConfig.env)) {
       // If it's preview environment with a branch specified
       if (
@@ -54,7 +62,7 @@ const getVercelSecrets = async (secretSync: TVercelSyncWithCredentials) => {
     filteredSecrets.map(async (secret) => {
       if (secret.type === "encrypted") {
         const { data: decryptedSecret } = await request.get(
-          `${IntegrationUrls.VERCEL_API_URL}/v9/projects/${destinationConfig.app}/env/${secret.id}`,
+          `${IntegrationUrls.VERCEL_API_URL}/v9/projects/${destinationConfig.app}/env/${secret.id}?teamId=${destinationConfig.teamId}`,
           {
             params,
             headers: {
@@ -82,7 +90,7 @@ const deleteSecret = async (secretSync: TVercelSyncWithCredentials, vercelSecret
 
   try {
     await request.delete(
-      `${IntegrationUrls.VERCEL_API_URL}/v9/projects/${destinationConfig.app}/env/${vercelSecret.id}`,
+      `${IntegrationUrls.VERCEL_API_URL}/v9/projects/${destinationConfig.app}/env/${vercelSecret.id}?teamId=${destinationConfig.teamId}`,
       {
         headers: {
           Authorization: `Bearer ${apiToken}`,
@@ -108,12 +116,13 @@ const createSecret = async (secretSync: TVercelSyncWithCredentials, secretMap: T
     } = secretSync;
 
     await request.post(
-      `${IntegrationUrls.VERCEL_API_URL}/v10/projects/${destinationConfig.app}/env`,
+      `${IntegrationUrls.VERCEL_API_URL}/v10/projects/${destinationConfig.app}/env?teamId=${destinationConfig.teamId}`,
       {
         key,
         value: secretMap[key].value,
         type: "encrypted",
-        target: [destinationConfig.env],
+        target: isVercelDefaultEnvType(destinationConfig.env) ? [destinationConfig.env] : [],
+        customEnvironmentIds: !isVercelDefaultEnvType(destinationConfig.env) ? [destinationConfig.env] : [],
         ...(destinationConfig.env === VercelEnvironmentType.Preview && destinationConfig.branch
           ? { gitBranch: destinationConfig.branch }
           : {})
@@ -146,31 +155,37 @@ const updateSecret = async (
       }
     } = secretSync;
 
-    // Only update if not sensitive type
-    if (vercelSecret.type !== "sensitive") {
-      await request.patch(
-        `${IntegrationUrls.VERCEL_API_URL}/v9/projects/${destinationConfig.app}/env/${vercelSecret.id}`,
-        {
-          key: vercelSecret.key,
-          value: secretMap[vercelSecret.key].value,
-          type: vercelSecret.type,
-          target: vercelSecret.target.includes(destinationConfig.env)
-            ? [...vercelSecret.target]
-            : [...vercelSecret.target, destinationConfig.env],
-          ...(destinationConfig.env === VercelEnvironmentType.Preview && destinationConfig.branch
-            ? { gitBranch: destinationConfig.branch }
-            : {})
-        },
-        {
-          headers: {
-            Authorization: `Bearer ${apiToken}`,
-            "Accept-Encoding": "application/json"
-          }
-        }
-      );
-    } else {
-      logger.info(`Vercel secret ${vercelSecret.key} is of type 'sensitive' and cannot be updated through the API`);
+    let target = [...vercelSecret.target];
+    if (isVercelDefaultEnvType(destinationConfig.env) && !vercelSecret.target.includes(destinationConfig.env)) {
+      target = [...target, destinationConfig.env];
     }
+    let customEnvironmentIds = [...(vercelSecret.customEnvironmentIds || [])];
+    if (
+      !isVercelDefaultEnvType(destinationConfig.env) &&
+      !vercelSecret.customEnvironmentIds?.includes(destinationConfig.env)
+    ) {
+      customEnvironmentIds = [...customEnvironmentIds, destinationConfig.env];
+    }
+
+    await request.patch(
+      `${IntegrationUrls.VERCEL_API_URL}/v9/projects/${destinationConfig.app}/env/${vercelSecret.id}?teamId=${destinationConfig.teamId}`,
+      {
+        key: vercelSecret.key,
+        value: secretMap[vercelSecret.key].value,
+        type: vercelSecret.type,
+        target,
+        customEnvironmentIds,
+        ...(destinationConfig.env === VercelEnvironmentType.Preview && destinationConfig.branch
+          ? { gitBranch: destinationConfig.branch }
+          : {})
+      },
+      {
+        headers: {
+          Authorization: `Bearer ${apiToken}`,
+          "Accept-Encoding": "application/json"
+        }
+      }
+    );
   } catch (error) {
     throw new SecretSyncError({
       error,

backend/src/services/secret-sync/vercel/vercel-sync-schemas.ts

@@ -15,10 +15,9 @@ import { VercelEnvironmentType } from "./vercel-sync-enums";
 const VercelSyncDestinationConfigSchema = z.object({
   app: z.string().min(1, "App ID is required").describe(SecretSyncs.DESTINATION_CONFIG.VERCEL.app),
   appName: z.string().min(1, "App Name is required").describe(SecretSyncs.DESTINATION_CONFIG.VERCEL.appName),
-  env: z
-    .enum([VercelEnvironmentType.Development, VercelEnvironmentType.Preview, VercelEnvironmentType.Production])
-    .describe(SecretSyncs.DESTINATION_CONFIG.VERCEL.env),
-  branch: z.string().optional().describe(SecretSyncs.DESTINATION_CONFIG.VERCEL.branch)
+  env: z.nativeEnum(VercelEnvironmentType).or(z.string()).describe(SecretSyncs.DESTINATION_CONFIG.VERCEL.env),
+  branch: z.string().optional().describe(SecretSyncs.DESTINATION_CONFIG.VERCEL.branch),
+  teamId: z.string().describe(SecretSyncs.DESTINATION_CONFIG.VERCEL.teamId)
 });
 
 const VercelSyncOptionsConfig: TSyncOptionsConfig = { canImportSecrets: true };

backend/src/services/secret-sync/vercel/vercel-sync-types.ts

@@ -2,6 +2,7 @@ import z from "zod";
 
 import { TVercelConnection } from "@app/services/app-connection/vercel";
 
+import { VercelEnvironmentType } from "./vercel-sync-enums";
 import { CreateVercelSyncSchema, VercelSyncListItemSchema, VercelSyncSchema } from "./vercel-sync-schemas";
 
 export type TVercelSyncListItem = z.infer<typeof VercelSyncListItemSchema>;
@@ -28,9 +29,12 @@ export interface VercelApiSecret {
   value: string;
   type: string;
   target: string[];
+  customEnvironmentIds?: string[];
   gitBranch?: string;
   createdAt?: number;
   updatedAt?: number;
   configurationId?: string;
   system?: boolean;
 }
+
+export type DefaultVercelEnvType = (typeof VercelEnvironmentType)[keyof typeof VercelEnvironmentType];