Fix merge conflicts

backend/src/controllers/v3/secretsController.ts

@@ -5,7 +5,6 @@ import { eventPushSecrets } from "../../events";
 import { BotService } from "../../services";
 import { 
   containsGlobPatterns, 
-  isValidScope, 
   isValidScopeV3,
   repackageSecretToRaw 
 } from "../../helpers/secrets";
@@ -100,8 +99,7 @@ export const getSecretsRaw = async (req: Request, res: Response) => {
         secretPath,
         requiredPermissions: [PERMISSION_READ_SECRETS]
       });
-      permissionCheckFn = (env: string, secPath: string) =>
-        isValidScope(req.authData.authPayload as IServiceTokenData, env, secPath);
+      permissionCheckFn = () => true;
       break;
     }
     case ActorType.SERVICE_V3: {
@@ -554,8 +552,7 @@ export const getSecrets = async (req: Request, res: Response) => {
         secretPath,
         requiredPermissions: [PERMISSION_READ_SECRETS]
       });
-      permissionCheckFn = (env: string, secPath: string) =>
-        isValidScope(req.authData.authPayload as IServiceTokenData, env, secPath);
+      permissionCheckFn = (env: string, secPath: string) => true;
       break;
     }
     case ActorType.SERVICE_V3: {

backend/src/index.ts

@@ -226,10 +226,25 @@ const main = async () => {
   // await createTestUserForDevelopment();
   setUpHealthEndpoint(server);
 
-  server.on("close", async () => {
+
+  const serverCleanup = async () => {
     await DatabaseService.closeDatabase();
     syncSecretsToThirdPartyServices.close();
     githubPushEventSecretScan.close();
+
+    process.exit(0);
+  }
+
+  process.on("SIGINT", function () {
+    server.close(async () => {
+      await serverCleanup()
+    });
+  });
+
+  process.on("SIGTERM", function () {
+    server.close(async () => {
+      await serverCleanup()
+    });
   });
 
   return server;