Fix merge conflicts

2026-10-17 08:35:52 +00:00 · 2023-01-30 19:48:12 +07:00
parent cf5603c8e3 7a4b77ce59
commit bb752863fa
167 changed files with 5540 additions and 1256 deletions
@@ -105,19 +105,21 @@ export const createSecrets = async (req: Request, res: Response) => {
            secretValueCiphertext: string;
            secretValueIV: string;
            secretValueTag: string;
-        }) => ({
-            version: 1,
-            workspace: new Types.ObjectId(workspaceId),
-            type,
-            user: type === SECRET_PERSONAL ? req.user : undefined,
-            environment,
-            secretKeyCiphertext,
-            secretKeyIV,
-            secretKeyTag,
-            secretValueCiphertext,
-            secretValueIV,
-            secretValueTag
-        }))
+        }) => {
+            return ({
+                version: 1,
+                workspace: new Types.ObjectId(workspaceId),
+                type,
+                user: type === SECRET_PERSONAL ? req.user : undefined,
+                environment,
+                secretKeyCiphertext,
+                secretKeyIV,
+                secretKeyTag,
+                secretValueCiphertext,
+                secretValueIV,
+                secretValueTag
+            });
+        })
    );

    setTimeout(async () => {