From d5165e50860043b21cd62fbde3d8750f28381f82 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Mon, 29 Jan 2024 14:34:13 +0400
Subject: [PATCH] Update secret-router.ts

---
 backend/src/server/routes/v3/secret-router.ts | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/backend/src/server/routes/v3/secret-router.ts b/backend/src/server/routes/v3/secret-router.ts
index cdb92fae6..99dc5ddfb 100644
--- a/backend/src/server/routes/v3/secret-router.ts
+++ b/backend/src/server/routes/v3/secret-router.ts
@@ -442,6 +442,8 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
           secrets: SecretsSchema.omit({ secretBlindIndex: true })
             .merge(
               z.object({
+                workspace: z.string(),
+                environment: z.string(),
                 tags: SecretTagsSchema.pick({
                   id: true,
                   slug: true,
@@ -529,7 +531,12 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
       }),
       response: {
         200: z.object({
-          secret: SecretsSchema.omit({ secretBlindIndex: true })
+          secret: SecretsSchema.omit({ secretBlindIndex: true }).merge(
+            z.object({
+              workspace: z.string(),
+              environment: z.string()
+            })
+          )
         })
       }
     },
@@ -610,7 +617,12 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
       response: {
         200: z.union([
           z.object({
-            secret: SecretsSchema.omit({ secretBlindIndex: true })
+            secret: SecretsSchema.omit({ secretBlindIndex: true }).merge(
+              z.object({
+                workspace: z.string(),
+                environment: z.string()
+              })
+            )
           }),
           z
             .object({ approval: SecretApprovalRequestsSchema })
@@ -780,7 +792,12 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
       response: {
         200: z.union([
           z.object({
-            secret: SecretsSchema.omit({ secretBlindIndex: true })
+            secret: SecretsSchema.omit({ secretBlindIndex: true }).merge(
+              z.object({
+                workspace: z.string(),
+                environment: z.string()
+              })
+            )
           }),
           z
             .object({ approval: SecretApprovalRequestsSchema })
@@ -944,7 +961,12 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
       response: {
         200: z.union([
           z.object({
-            secret: SecretsSchema.omit({ secretBlindIndex: true })
+            secret: SecretsSchema.omit({ secretBlindIndex: true }).merge(
+              z.object({
+                workspace: z.string(),
+                environment: z.string()
+              })
+            )
           }),
           z
             .object({ approval: SecretApprovalRequestsSchema })