fix(api,api-client): Add environmentSlug in multiple places across th…

…e secret module (#509)
keyshade-xyz · Oct 25, 2024 · ee58f07 · ee58f07
1 parent 534a231
commit ee58f07
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 5 deletions.
diff --git a/apps/api/src/secret/secret.e2e.spec.ts b/apps/api/src/secret/secret.e2e.spec.ts
@@ -209,6 +209,8 @@ describe('Secret Controller Tests', () => {
       expect(body.projectId).toBe(project1.id)
       expect(body.versions.length).toBe(1)
       expect(body.versions[0].value).not.toBe('Secret 2 value')
+      expect(body.versions[0].environment.id).toBe(environment1.id)
+      expect(body.versions[0].environment.slug).toBe(environment1.slug)
     })
 
     it('should have created a secret version', async () => {
@@ -341,10 +343,15 @@ describe('Secret Controller Tests', () => {
       const secretVersion = await prisma.secretVersion.findMany({
         where: {
           secretId: secret1.id
+        },
+        include: {
+          environment: true
         }
       })
 
       expect(secretVersion.length).toBe(1)
+      expect(secretVersion[0].environment.id).toBe(environment1.id)
+      expect(secretVersion[0].environment.slug).toBe(environment1.slug)
     })
 
     it('should create a new version if the value is updated', async () => {
@@ -371,6 +378,9 @@ describe('Secret Controller Tests', () => {
         where: {
           secretId: secret1.id,
           environmentId: environment1.id
+        },
+        include: {
+          environment: true
         }
       })
 

diff --git a/apps/api/src/secret/service/secret.service.ts b/apps/api/src/secret/service/secret.service.ts
@@ -126,7 +126,12 @@ export class SecretService {
         },
         versions: {
           select: {
-            environmentId: true,
+            environment: {
+              select: {
+                id: true,
+                slug: true
+              }
+            },
             value: true
           }
         }
@@ -252,7 +257,12 @@ export class SecretService {
             },
             select: {
               id: true,
-              environmentId: true,
+              environment: {
+                select: {
+                  id: true,
+                  slug: true
+                }
+              },
               value: true,
               version: true
             }
@@ -514,7 +524,15 @@ export class SecretService {
           orderBy: {
             version: 'desc'
           },
-          take: 1
+          take: 1,
+          include: {
+            environment: {
+              select: {
+                id: true,
+                slug: true
+              }
+            }
+          }
         }
       }
     })
@@ -648,6 +666,17 @@ export class SecretService {
             id: true,
             name: true
           }
+        },
+        versions: {
+          select: {
+            environment: {
+              select: {
+                name: true,
+                id: true,
+                slug: true
+              }
+            }
+          }
         }
       },
       skip: page * limit,
@@ -699,6 +728,14 @@ export class SecretService {
           },
           orderBy: {
             version: 'desc'
+          },
+          include: {
+            environment: {
+              select: {
+                id: true,
+                slug: true
+              }
+            }
           }
         })
 

diff --git a/packages/api-client/src/types/secret.types.d.ts b/packages/api-client/src/types/secret.types.d.ts
@@ -18,6 +18,10 @@ export interface Secret {
       id?: string
       environmentId: string
       value: string
+      environment: {
+        id: string
+        slug: string
+      }
     }
   ]
 }
@@ -48,6 +52,10 @@ export interface UpdateSecretResponse {
     {
       id?: string
       environmentId: string
+      environment: {
+        id: string
+        slug: string
+      }
       value: string
     }
   ]
@@ -83,6 +91,7 @@ export interface GetAllSecretsOfProjectResponse
       environment: {
         id: string
         name: string
+        slug: string
       }
       value: string
       version: number

diff --git a/packages/api-client/tests/secret.spec.ts b/packages/api-client/tests/secret.spec.ts
@@ -10,8 +10,8 @@ describe('Secret Controller Tests', () => {
   const email = 'johndoe@example.com'
   let projectSlug: string | null
   let workspaceSlug: string | null
-  let environmentSlug: string | null
   let secretSlug: string | null
+  let environmentSlug: string | null
 
   beforeAll(async () => {
     //Create the user's workspace
@@ -115,6 +115,7 @@ describe('Secret Controller Tests', () => {
     expect(secret.data.name).toBe('Secret 2')
     expect(secret.data.slug).toBeDefined()
     expect(secret.data.versions.length).toBe(1)
+    expect(secret.data.versions[0].environment.slug).toBe(environmentSlug)
     expect(secret.error).toBe(null)
 
     // Delete the secret
@@ -244,7 +245,7 @@ describe('Secret Controller Tests', () => {
 
   it('should be able to fetch revisions of a secret', async () => {
     const revisions = await secretController.getRevisionsOfSecret(
-      { secretSlug, environmentSlug },
+      { secretSlug, environmentSlug},
       { 'x-e2e-user-email': email }
     )
     expect(revisions.data.items.length).toBe(1)