feat: made e2ee api test indepdent or stateless

backend/e2e-test/routes/v2/service-token.spec.ts

@@ -83,9 +83,59 @@ const deleteServiceToken = async () => {
   expect(deleteTokenRes.statusCode).toBe(200);
 };
 
+const createSecret = async (dto: {
+  projectKey: string;
+  path: string;
+  key: string;
+  value: string;
+  comment: string;
+  type?: SecretType;
+  token: string;
+}) => {
+  const createSecretReqBody = {
+    workspaceId: seedData1.project.id,
+    environment: seedData1.environment.slug,
+    type: dto.type || SecretType.Shared,
+    secretPath: dto.path,
+    ...encryptSecret(dto.projectKey, dto.key, dto.value, dto.comment)
+  };
+  const createSecRes = await testServer.inject({
+    method: "POST",
+    url: `/api/v3/secrets/${dto.key}`,
+    headers: {
+      authorization: `Bearer ${dto.token}`
+    },
+    body: createSecretReqBody
+  });
+  expect(createSecRes.statusCode).toBe(200);
+  const createdSecretPayload = JSON.parse(createSecRes.payload);
+  expect(createdSecretPayload).toHaveProperty("secret");
+  return createdSecretPayload.secret;
+};
+
+const deleteSecret = async (dto: { path: string; key: string; token: string }) => {
+  const deleteSecRes = await testServer.inject({
+    method: "DELETE",
+    url: `/api/v3/secrets/${dto.key}`,
+    headers: {
+      authorization: `Bearer ${dto.token}`
+    },
+    body: {
+      workspaceId: seedData1.project.id,
+      environment: seedData1.environment.slug,
+      secretPath: dto.path
+    }
+  });
+  expect(deleteSecRes.statusCode).toBe(200);
+  const updatedSecretPayload = JSON.parse(deleteSecRes.payload);
+  expect(updatedSecretPayload).toHaveProperty("secret");
+  return updatedSecretPayload.secret;
+};
+
 describe("Service token secret ops", async () => {
   let serviceToken = "";
   let projectKey = "";
+  let folderId = "";
   beforeAll(async () => {
     serviceToken = await createServiceToken(
       [{ secretPath: "/**", environment: seedData1.environment.slug }],
@@ -125,10 +175,26 @@ describe("Service token secret ops", async () => {
       }
     });
     expect(folderCreate.statusCode).toBe(200);
+    folderId = folderCreate.json().folder.id;
   });
 
   afterAll(async () => {
     await deleteServiceToken();
+
+    // create a deep folder
+    const deleteFolder = await testServer.inject({
+      method: "DELETE",
+      url: `/api/v1/folders/${folderId}`,
+      headers: {
+        authorization: `Bearer ${jwtAuthToken}`
+      },
+      body: {
+        workspaceId: seedData1.project.id,
+        environment: seedData1.environment.slug,
+        path: "/nested1/nested2"
+      }
+    });
+    expect(deleteFolder.statusCode).toBe(200);
   });
 
   const testSecrets = [
@@ -168,25 +234,8 @@ describe("Service token secret ops", async () => {
   };
 
   test.each(testSecrets)("Create secret in path $path", async ({ secret, path }) => {
-    const createSecretReqBody = {
-      workspaceId: seedData1.project.id,
-      environment: seedData1.environment.slug,
-      type: SecretType.Shared,
-      secretPath: path,
-      ...encryptSecret(projectKey, secret.key, secret.value, secret.comment)
-    };
-    const createSecRes = await testServer.inject({
-      method: "POST",
-      url: `/api/v3/secrets/${secret.key}`,
-      headers: {
-        authorization: `Bearer ${serviceToken}`
-      },
-      body: createSecretReqBody
-    });
-    expect(createSecRes.statusCode).toBe(200);
-    const createdSecretPayload = JSON.parse(createSecRes.payload);
-    expect(createdSecretPayload).toHaveProperty("secret");
-    const decryptedSecret = decryptSecret(projectKey, createdSecretPayload.secret);
+    const createdSecret = await createSecret({ projectKey, path, ...secret, token: serviceToken });
+    const decryptedSecret = decryptSecret(projectKey, createdSecret);
     expect(decryptedSecret.key).toEqual(secret.key);
     expect(decryptedSecret.value).toEqual(secret.value);
     expect(decryptedSecret.comment).toEqual(secret.comment);
@@ -202,9 +251,12 @@ describe("Service token secret ops", async () => {
         })
       ])
     );
+    await deleteSecret({ path, key: secret.key, token: serviceToken });
   });
 
   test.each(testSecrets)("Get secret by name in path $path", async ({ secret, path }) => {
+    await createSecret({ projectKey, path, ...secret, token: serviceToken });
+
     const getSecByNameRes = await testServer.inject({
       method: "GET",
       url: `/api/v3/secrets/${secret.key}`,
@@ -224,9 +276,12 @@ describe("Service token secret ops", async () => {
     expect(decryptedSecret.key).toEqual(secret.key);
     expect(decryptedSecret.value).toEqual(secret.value);
     expect(decryptedSecret.comment).toEqual(secret.comment);
+
+    await deleteSecret({ path, key: secret.key, token: serviceToken });
   });
 
   test.each(testSecrets)("Update secret in path $path", async ({ path, secret }) => {
+    await createSecret({ projectKey, path, ...secret, token: serviceToken });
     const updateSecretReqBody = {
       workspaceId: seedData1.project.id,
       environment: seedData1.environment.slug,
@@ -261,25 +316,14 @@ describe("Service token secret ops", async () => {
         })
       ])
     );
+
+    await deleteSecret({ path, key: secret.key, token: serviceToken });
   });
 
   test.each(testSecrets)("Delete secret in path $path", async ({ secret, path }) => {
-    const deleteSecRes = await testServer.inject({
-      method: "DELETE",
-      url: `/api/v3/secrets/${secret.key}`,
-      headers: {
-        authorization: `Bearer ${serviceToken}`
-      },
-      body: {
-        workspaceId: seedData1.project.id,
-        environment: seedData1.environment.slug,
-        secretPath: path
-      }
-    });
-    expect(deleteSecRes.statusCode).toBe(200);
-    const updatedSecretPayload = JSON.parse(deleteSecRes.payload);
-    expect(updatedSecretPayload).toHaveProperty("secret");
-    const decryptedSecret = decryptSecret(projectKey, updatedSecretPayload.secret);
+    await createSecret({ projectKey, path, ...secret, token: serviceToken });
+    const deletedSecret = await deleteSecret({ path, key: secret.key, token: serviceToken });
+    const decryptedSecret = decryptSecret(projectKey, deletedSecret);
     expect(decryptedSecret.key).toEqual(secret.key);
 
     // shared secret deletion should delete personal ones also
@@ -305,7 +349,7 @@ describe("Service token secret ops", async () => {
         workspaceId: seedData1.project.id,
         environment: seedData1.environment.slug,
         secretPath: path,
-        secrets: Array.from(Array(10)).map((_e, i) => ({
+        secrets: Array.from(Array(5)).map((_e, i) => ({
           secretName: `BULK-${secret.key}-${i + 1}`,
           ...encryptSecret(projectKey, `BULK-${secret.key}-${i + 1}`, secret.value, secret.comment)
         }))
@@ -319,7 +363,7 @@ describe("Service token secret ops", async () => {
     const secrets = await getSecrets(seedData1.environment.slug, path);
     expect(secrets).toEqual(
       expect.arrayContaining(
-        Array.from(Array(10)).map((_e, i) =>
+        Array.from(Array(5)).map((_e, i) =>
           expect.objectContaining({
             key: `BULK-${secret.key}-${i + 1}`,
             type: SecretType.Shared
@@ -327,9 +371,17 @@ describe("Service token secret ops", async () => {
         )
       )
     );
+
+    await Promise.all(
+      Array.from(Array(5)).map((_e, i) =>
+        deleteSecret({ path, token: serviceToken, key: `BULK-${secret.key}-${i + 1}` })
+      )
+    );
   });
 
   test.each(testSecrets)("Bulk create fail on existing secret in path $path", async ({ secret, path }) => {
+    await createSecret({ projectKey, ...secret, key: `BULK-${secret.key}-1`, path, token: serviceToken });
+
     const createSharedSecRes = await testServer.inject({
       method: "POST",
       url: `/api/v3/secrets/batch`,
@@ -340,16 +392,24 @@ describe("Service token secret ops", async () => {
         workspaceId: seedData1.project.id,
         environment: seedData1.environment.slug,
         secretPath: path,
-        secrets: Array.from(Array(10)).map((_e, i) => ({
+        secrets: Array.from(Array(5)).map((_e, i) => ({
           secretName: `BULK-${secret.key}-${i + 1}`,
           ...encryptSecret(projectKey, `BULK-${secret.key}-${i + 1}`, secret.value, secret.comment)
         }))
       }
     });
     expect(createSharedSecRes.statusCode).toBe(400);
+
+    await deleteSecret({ path, key: `BULK-${secret.key}-1`, token: serviceToken });
   });
 
   test.each(testSecrets)("Bulk update secrets in path $path", async ({ secret, path }) => {
+    await Promise.all(
+      Array.from(Array(5)).map((_e, i) =>
+        createSecret({ projectKey, token: serviceToken, ...secret, key: `BULK-${secret.key}-${i + 1}`, path })
+      )
+    );
+
     const updateSharedSecRes = await testServer.inject({
       method: "PATCH",
       url: `/api/v3/secrets/batch`,
@@ -360,7 +420,7 @@ describe("Service token secret ops", async () => {
         workspaceId: seedData1.project.id,
         environment: seedData1.environment.slug,
         secretPath: path,
-        secrets: Array.from(Array(10)).map((_e, i) => ({
+        secrets: Array.from(Array(5)).map((_e, i) => ({
           secretName: `BULK-${secret.key}-${i + 1}`,
           ...encryptSecret(projectKey, `BULK-${secret.key}-${i + 1}`, "update-value", secret.comment)
         }))
@@ -374,7 +434,7 @@ describe("Service token secret ops", async () => {
     const secrets = await getSecrets(seedData1.environment.slug, path);
     expect(secrets).toEqual(
       expect.arrayContaining(
-        Array.from(Array(10)).map((_e, i) =>
+        Array.from(Array(5)).map((_e, i) =>
           expect.objectContaining({
             key: `BULK-${secret.key}-${i + 1}`,
             value: "update-value",
@@ -383,10 +443,21 @@ describe("Service token secret ops", async () => {
         )
       )
     );
+    await Promise.all(
+      Array.from(Array(5)).map((_e, i) =>
+        deleteSecret({ path, key: `BULK-${secret.key}-${i + 1}`, token: serviceToken })
+      )
+    );
   });
 
   test.each(testSecrets)("Bulk delete secrets in path $path", async ({ secret, path }) => {
-    const updateSharedSecRes = await testServer.inject({
+    await Promise.all(
+      Array.from(Array(5)).map((_e, i) =>
+        createSecret({ projectKey, token: serviceToken, ...secret, key: `BULK-${secret.key}-${i + 1}`, path })
+      )
+    );
+
+    const deletedSharedSecRes = await testServer.inject({
       method: "DELETE",
       url: `/api/v3/secrets/batch`,
       headers: {
@@ -396,20 +467,21 @@ describe("Service token secret ops", async () => {
         workspaceId: seedData1.project.id,
         environment: seedData1.environment.slug,
         secretPath: path,
-        secrets: Array.from(Array(10)).map((_e, i) => ({
+        secrets: Array.from(Array(5)).map((_e, i) => ({
           secretName: `BULK-${secret.key}-${i + 1}`
         }))
       }
     });
-    expect(updateSharedSecRes.statusCode).toBe(200);
-    const updateSharedSecPayload = JSON.parse(updateSharedSecRes.payload);
-    expect(updateSharedSecPayload).toHaveProperty("secrets");
+
+    expect(deletedSharedSecRes.statusCode).toBe(200);
+    const deletedSecretPayload = JSON.parse(deletedSharedSecRes.payload);
+    expect(deletedSecretPayload).toHaveProperty("secrets");
 
     // bulk ones should exist
     const secrets = await getSecrets(seedData1.environment.slug, path);
     expect(secrets).toEqual(
       expect.not.arrayContaining(
-        Array.from(Array(10)).map((_e, i) =>
+        Array.from(Array(5)).map((_e, i) =>
           expect.objectContaining({
             key: `BULK-${secret.value}-${i + 1}`,
             type: SecretType.Shared