Merge pull request #215 from Infisical/patch-integrations

Patch integrations

backend/src/controllers/v2/secretsController.ts

@@ -67,8 +67,17 @@ export const createSecrets = async (req: Request, res: Response) => {
         }))
     );
 
+    setTimeout(async () => {
+        // trigger event - push secrets
+        await EventService.handleEvent({
+            event: eventPushSecrets({
+                workspaceId
+            })
+        });
+    }, 5000);
+
     // (EE) add secret versions for new secrets
-    EESecretService.addSecretVersions({
+    await EESecretService.addSecretVersions({
         secretVersions: newSecrets.map(({
             _id,
             version,
@@ -104,13 +113,6 @@ export const createSecrets = async (req: Request, res: Response) => {
         }))
     });
 
-    // trigger event - push secrets
-    await EventService.handleEvent({
-        event: eventPushSecrets({
-            workspaceId
-        })
-    });
-
     const addAction = await EELogService.createActionSecret({
         name: ACTION_ADD_SECRETS,
         userId: req.user._id.toString(),
@@ -342,11 +344,13 @@ export const updateSecrets = async (req: Request, res: Response) => {
 
     Object.keys(workspaceSecretObj).forEach(async (key) => {
         // trigger event - push secrets
-        await EventService.handleEvent({
-            event: eventPushSecrets({
-                workspaceId: key
-            })
-        });
+        setTimeout(async () => {
+            await EventService.handleEvent({
+                event: eventPushSecrets({
+                    workspaceId: key
+                })
+            });
+        }, 10000);
 
         const updateAction = await EELogService.createActionSecret({
             name: ACTION_UPDATE_SECRETS,

backend/src/helpers/secret.ts

@@ -39,7 +39,7 @@ const validateSecrets = async ({
 	try {
 		secrets = await Secret.find({
 			_id: {
-				$in: secretIds
+				$in: secretIds.map((secretId: string) => new Types.ObjectId(secretId))
 			}
 		});