From e0d5644b3ad549d75a5c0531827a844484bcc61c Mon Sep 17 00:00:00 2001
From: Tuan Dang <dangtony98@gmail.com>
Date: Sat, 22 Apr 2023 11:47:23 +0300
Subject: [PATCH] Add back service token data select fields for GET endpoint

---
 backend/src/controllers/v2/serviceTokenDataController.ts | 1 +
 backend/src/controllers/v3/secretsController.ts          | 2 +-
 backend/src/helpers/secrets.ts                           | 2 +-
 backend/src/routes/v3/secrets.ts                         | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/controllers/v2/serviceTokenDataController.ts b/backend/src/controllers/v2/serviceTokenDataController.ts
index c425ecfc4..332e7e34a 100644
--- a/backend/src/controllers/v2/serviceTokenDataController.ts
+++ b/backend/src/controllers/v2/serviceTokenDataController.ts
@@ -56,6 +56,7 @@ export const getServiceTokenData = async (req: Request, res: Response) => {
 
     const serviceTokenData = await ServiceTokenData
         .findById(req.authData.authPayload._id)
+        .select('+encryptedKey +iv +tag')
         .populate('user');
 
     return res.status(200).json(serviceTokenData);
diff --git a/backend/src/controllers/v3/secretsController.ts b/backend/src/controllers/v3/secretsController.ts
index 80329e04a..dac41b53d 100644
--- a/backend/src/controllers/v3/secretsController.ts
+++ b/backend/src/controllers/v3/secretsController.ts
@@ -40,7 +40,7 @@ export const getSecretByName = async (req: Request, res: Response) => {
     const workspaceId = req.query.workspaceId as string;
     const environment = req.query.environment as string;
     const type = req.query.type as 'shared' | 'personal' | undefined;
-    
+
     const secret = await SecretService.getSecret({
         secretName,
         workspaceId: new Types.ObjectId(workspaceId),
diff --git a/backend/src/helpers/secrets.ts b/backend/src/helpers/secrets.ts
index d3a158640..6e33b187d 100644
--- a/backend/src/helpers/secrets.ts
+++ b/backend/src/helpers/secrets.ts
@@ -620,7 +620,6 @@ const getSecretHelper = async ({
         secretName,
         workspaceId: new Types.ObjectId(workspaceId)
     });
-
     let secret: ISecret | null = null;
     
     // try getting personal secret first (if exists)
@@ -733,6 +732,7 @@ const updateSecretHelper = async ({
         );
     } else {
         // case: update personal secret
+        
         secret = await Secret.findOneAndUpdate(
             {
                 secretBlindIndex,
diff --git a/backend/src/routes/v3/secrets.ts b/backend/src/routes/v3/secrets.ts
index cd3e08e46..6a18fdf73 100644
--- a/backend/src/routes/v3/secrets.ts
+++ b/backend/src/routes/v3/secrets.ts
@@ -24,7 +24,6 @@ router.get(
     '/',
     query('workspaceId').exists().isString().trim(),
     query('environment').exists().isString().trim(),
-    query('tagSlugs'),
     validateRequest,
     requireAuth({
         acceptedAuthModes: [