From f5a6270d2a7a6d5b4efd9505a39673250015ee46 Mon Sep 17 00:00:00 2001
From: Maidul Islam <maidul98@gmail.com>
Date: Wed, 26 Jul 2023 16:50:35 -0400
Subject: [PATCH] add workspace auth for multi env/glob request

---
 .../src/controllers/v3/secretsController.ts   | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/backend/src/controllers/v3/secretsController.ts b/backend/src/controllers/v3/secretsController.ts
index 8a190f43a..4b6c1adab 100644
--- a/backend/src/controllers/v3/secretsController.ts
+++ b/backend/src/controllers/v3/secretsController.ts
@@ -27,27 +27,23 @@ export const getSecretsRaw = async (req: Request, res: Response) => {
 
   // if the service token has single scope, it will get all secrets for that scope by default
   const serviceTokenDetails: IServiceTokenData = req?.serviceTokenData;
-  if (serviceTokenDetails) {
-    if (
-      serviceTokenDetails.scopes.length == 1 &&
-      !containsGlobPatterns(serviceTokenDetails.scopes[0].secretPath)
-    ) {
-      const scope = serviceTokenDetails.scopes[0];
-      secretPath = scope.secretPath;
-      environment = scope.environment;
-      workspaceId = serviceTokenDetails.workspace.toString();
-    } else {
-      requireWorkspaceAuth({
-        acceptedRoles: [ADMIN, MEMBER],
-        locationWorkspaceId: "query",
-        locationEnvironment: "query",
-        requiredPermissions: [PERMISSION_READ_SECRETS],
-        requireBlindIndicesEnabled: true,
-        requireE2EEOff: true
-      });
-    }
+  if (serviceTokenDetails && serviceTokenDetails.scopes.length == 1 && !containsGlobPatterns(serviceTokenDetails.scopes[0].secretPath)) {
+    const scope = serviceTokenDetails.scopes[0];
+    secretPath = scope.secretPath;
+    environment = scope.environment;
+    workspaceId = serviceTokenDetails.workspace.toString();
+  } else {
+    requireWorkspaceAuth({
+      acceptedRoles: [ADMIN, MEMBER],
+      locationWorkspaceId: "query",
+      locationEnvironment: "query",
+      requiredPermissions: [PERMISSION_READ_SECRETS],
+      requireBlindIndicesEnabled: true,
+      requireE2EEOff: true
+    });
   }
 
+
   const secrets = await SecretService.getSecrets({
     workspaceId: new Types.ObjectId(workspaceId),
     environment,