From a750d68363a9c31342d945cfb9d22ef2b900e0c6 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Wed, 20 Mar 2024 14:40:24 +0100
Subject: [PATCH] Fix: Reverted backend changes

---
 backend/src/server/routes/index.ts                       | 1 -
 backend/src/server/routes/v1/secret-folder-router.ts     | 7 +++----
 .../src/services/secret-folder/secret-folder-service.ts  | 9 ++-------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.ts
index fe4016ed9..c452bfbd3 100644
--- a/backend/src/server/routes/index.ts
+++ b/backend/src/server/routes/index.ts
@@ -415,7 +415,6 @@ export const registerRoutes = async (
   const folderService = secretFolderServiceFactory({
     permissionService,
     folderDAL,
-    secretImportDAL,
     folderVersionDAL,
     projectEnvDAL,
     snapshotService
diff --git a/backend/src/server/routes/v1/secret-folder-router.ts b/backend/src/server/routes/v1/secret-folder-router.ts
index 81b941bb5..bd202b70b 100644
--- a/backend/src/server/routes/v1/secret-folder-router.ts
+++ b/backend/src/server/routes/v1/secret-folder-router.ts
@@ -200,15 +200,14 @@ export const registerSecretFolderRouter = async (server: FastifyZodProvider) =>
       }),
       response: {
         200: z.object({
-          folders: SecretFoldersSchema.array(),
-          importedFolders: z.any().array()
+          folders: SecretFoldersSchema.array()
         })
       }
     },
     onRequest: verifyAuth([AuthMode.JWT, AuthMode.API_KEY, AuthMode.SERVICE_TOKEN, AuthMode.IDENTITY_ACCESS_TOKEN]),
     handler: async (req) => {
       const path = req.query.path || req.query.directory;
-      const { folders, importedFolders } = await server.services.folder.getFolders({
+      const folders = await server.services.folder.getFolders({
         actorId: req.permission.id,
         actor: req.permission.type,
         actorAuthMethod: req.permission.authMethod,
@@ -217,7 +216,7 @@ export const registerSecretFolderRouter = async (server: FastifyZodProvider) =>
         projectId: req.query.workspaceId,
         path
       });
-      return { folders, importedFolders };
+      return { folders };
     }
   });
 };
diff --git a/backend/src/services/secret-folder/secret-folder-service.ts b/backend/src/services/secret-folder/secret-folder-service.ts
index 1e6402132..c925d2587 100644
--- a/backend/src/services/secret-folder/secret-folder-service.ts
+++ b/backend/src/services/secret-folder/secret-folder-service.ts
@@ -9,7 +9,6 @@ import { TSecretSnapshotServiceFactory } from "@app/ee/services/secret-snapshot/
 import { BadRequestError } from "@app/lib/errors";
 
 import { TProjectEnvDALFactory } from "../project-env/project-env-dal";
-import { TSecretImportDALFactory } from "../secret-import/secret-import-dal";
 import { TSecretFolderDALFactory } from "./secret-folder-dal";
 import { TCreateFolderDTO, TDeleteFolderDTO, TGetFolderDTO, TUpdateFolderDTO } from "./secret-folder-types";
 import { TSecretFolderVersionDALFactory } from "./secret-folder-version-dal";
@@ -18,7 +17,6 @@ type TSecretFolderServiceFactoryDep = {
   permissionService: Pick<TPermissionServiceFactory, "getProjectPermission">;
   snapshotService: Pick<TSecretSnapshotServiceFactory, "performSnapshot">;
   folderDAL: TSecretFolderDALFactory;
-  secretImportDAL: TSecretImportDALFactory;
   projectEnvDAL: Pick<TProjectEnvDALFactory, "findOne">;
   folderVersionDAL: TSecretFolderVersionDALFactory;
 };
@@ -28,7 +26,6 @@ export type TSecretFolderServiceFactory = ReturnType<typeof secretFolderServiceF
 export const secretFolderServiceFactory = ({
   folderDAL,
   snapshotService,
-  secretImportDAL,
   permissionService,
   projectEnvDAL,
   folderVersionDAL
@@ -232,13 +229,11 @@ export const secretFolderServiceFactory = ({
     if (!env) throw new BadRequestError({ message: "Environment not found", name: "get folders" });
 
     const parentFolder = await folderDAL.findBySecretPath(projectId, environment, secretPath);
-    if (!parentFolder) return { folders: [], importedFolders: [] };
+    if (!parentFolder) return [];
 
     const folders = await folderDAL.find({ envId: env.id, parentId: parentFolder.id });
 
-    const importedFolders = await secretImportDAL.find({ folderId: parentFolder.id });
-
-    return { folders, importedFolders };
+    return folders;
   };
 
   return {