awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-15 07:35:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Feat: Visualize imported folders in overview page (include imported folders in response)

Browse Source
This commit is contained in:
Daniel Hougaard
2024-03-20 12:56:11 +01:00
parent 88e609cb66
commit 348fdf6429
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/secret-folder/secret-folder-service.ts
+8 -2
View File
@@ -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<TPermissionServiceFactory, "getProjectPermission">;
snapshotService: Pick<TSecretSnapshotServiceFactory, "performSnapshot">;
folderDAL: TSecretFolderDALFactory;
secretImportDAL: TSecretImportDALFactory;
projectEnvDAL: Pick<TProjectEnvDALFactory, "findOne">;
folderVersionDAL: TSecretFolderVersionDALFactory;
};
@@ -26,6 +28,7 @@ export type TSecretFolderServiceFactory = ReturnType<typeof secretFolderServiceF
export const secretFolderServiceFactory = ({
folderDAL,
snapshotService,
secretImportDAL,
permissionService,
projectEnvDAL,
folderVersionDAL
@@ -229,10 +232,13 @@ 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 [];
if (!parentFolder) return { folders: [], importedFolders: [] };
const folders = await folderDAL.find({ envId: env.id, parentId: parentFolder.id });
return folders;
const importedFolders = await secretImportDAL.find({ folderId: parentFolder.id });
return { folders, importedFolders };
};
return {