From 783174adc6be7d07388ca8b7ce5454998818418a Mon Sep 17 00:00:00 2001
From: Tuan Dang <tony@infisical.com>
Date: Thu, 23 Feb 2023 20:21:17 +0700
Subject: [PATCH] Add for-await for better Vercel integration reliability

---
 backend/src/integrations/sync.ts | 56 +++++++++++++++-----------------
 1 file changed, 26 insertions(+), 30 deletions(-)

diff --git a/backend/src/integrations/sync.ts b/backend/src/integrations/sync.ts
index cdf454e58..760cd6497 100644
--- a/backend/src/integrations/sync.ts
+++ b/backend/src/integrations/sync.ts
@@ -577,7 +577,7 @@ const syncSecretsVercel = async ({
       .map(async (secret: VercelSecret) => {
         if (secret.type === 'encrypted') {
           // case: secret is encrypted -> need to decrypt
-          return (await axios.get(
+          const decryptedSecret = (await axios.get(
               `${INTEGRATION_VERCEL_API_URL}/v9/projects/${integration.app}/env/${secret.id}`,
               {
                 params,
@@ -587,6 +587,8 @@ const syncSecretsVercel = async ({
                 }
               }
           )).data;
+
+          return decryptedSecret;
         }
 
         return secret;
@@ -595,9 +597,9 @@ const syncSecretsVercel = async ({
           [secret.key]: secret
       }), {});
 
-      const updateSecrets: VercelSecret[] = [];
-      const deleteSecrets: VercelSecret[] = [];
-      const newSecrets: VercelSecret[] = [];
+    const updateSecrets: VercelSecret[] = [];
+    const deleteSecrets: VercelSecret[] = [];
+    const newSecrets: VercelSecret[] = [];
 
     // Identify secrets to create
     Object.keys(secrets).map((key) => {
@@ -653,33 +655,13 @@ const syncSecretsVercel = async ({
         }
       );
     }
-
-    // Sync/push updated secrets
-    if (updateSecrets.length > 0) {
-      updateSecrets.forEach(async (secret: VercelSecret) => {
+  
+    for await (const secret of updateSecrets) {
+      if (secret.type !== 'sensitive') {
         const { id, ...updatedSecret } = secret;
-        
-        if (secret.type !== 'sensitive') {
-          await axios.patch(
-            `${INTEGRATION_VERCEL_API_URL}/v9/projects/${integration.app}/env/${secret.id}`,
-            updatedSecret,
-            {
-              params,
-              headers: {
-                Authorization: `Bearer ${accessToken}`,
-                'Accept-Encoding': 'application/json'
-              },
-            }
-          );
-        }
-      });
-    }
-
-    // Delete secrets
-    if (deleteSecrets.length > 0) {
-      deleteSecrets.forEach(async (secret: VercelSecret) => {
-        await axios.delete(
+        await axios.patch(
           `${INTEGRATION_VERCEL_API_URL}/v9/projects/${integration.app}/env/${secret.id}`,
+          updatedSecret,
           {
             params,
             headers: {
@@ -688,8 +670,22 @@ const syncSecretsVercel = async ({
             },
           }
         );
-      });
+      } 
     }
+
+    for await (const secret of deleteSecrets) {
+      await axios.delete(
+        `${INTEGRATION_VERCEL_API_URL}/v9/projects/${integration.app}/env/${secret.id}`,
+        {
+          params,
+          headers: {
+            Authorization: `Bearer ${accessToken}`,
+            'Accept-Encoding': 'application/json'
+          },
+        }
+      ); 
+    }
+
   } catch (err) {
     Sentry.setUser(null);
     Sentry.captureException(err);