diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.ts index c452bfbd3..2d3926b76 100644 --- a/backend/src/server/routes/index.ts +++ b/backend/src/server/routes/index.ts @@ -415,6 +415,7 @@ export const registerRoutes = async ( const folderService = secretFolderServiceFactory({ permissionService, folderDAL, + secretImportDAL, folderVersionDAL, projectEnvDAL, snapshotService @@ -471,7 +472,8 @@ export const registerRoutes = async ( snapshotService, secretQueueService, secretImportDAL, - projectBotService + projectBotService, + projectEnvDAL }); const sarService = secretApprovalRequestServiceFactory({ permissionService, diff --git a/backend/src/server/routes/v1/secret-folder-router.ts b/backend/src/server/routes/v1/secret-folder-router.ts index bd202b70b..81b941bb5 100644 --- a/backend/src/server/routes/v1/secret-folder-router.ts +++ b/backend/src/server/routes/v1/secret-folder-router.ts @@ -200,14 +200,15 @@ export const registerSecretFolderRouter = async (server: FastifyZodProvider) => }), response: { 200: z.object({ - folders: SecretFoldersSchema.array() + folders: SecretFoldersSchema.array(), + importedFolders: z.any().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 = await server.services.folder.getFolders({ + const { folders, importedFolders } = await server.services.folder.getFolders({ actorId: req.permission.id, actor: req.permission.type, actorAuthMethod: req.permission.authMethod, @@ -216,7 +217,7 @@ export const registerSecretFolderRouter = async (server: FastifyZodProvider) => projectId: req.query.workspaceId, path }); - return { folders }; + return { folders, importedFolders }; } }); }; diff --git a/backend/src/services/secret-folder/secret-folder-service.ts b/backend/src/services/secret-folder/secret-folder-service.ts index baa1484b1..1e6402132 100644 --- a/backend/src/services/secret-folder/secret-folder-service.ts +++ b/backend/src/services/secret-folder/secret-folder-service.ts @@ -9,6 +9,7 @@ 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"; @@ -17,6 +18,7 @@ type TSecretFolderServiceFactoryDep = { permissionService: Pick; snapshotService: Pick; folderDAL: TSecretFolderDALFactory; + secretImportDAL: TSecretImportDALFactory; projectEnvDAL: Pick; folderVersionDAL: TSecretFolderVersionDALFactory; }; @@ -26,6 +28,7 @@ export type TSecretFolderServiceFactory = ReturnType