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

Fix: Reverted backend changes

Browse Source
This commit is contained in:
Daniel Hougaard
2024-03-20 14:40:24 +01:00
parent d7161a353d
commit a750d68363
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/server/routes/index.ts
View File

@@ -415,7 +415,6 @@ export const registerRoutes = async (
const folderService = secretFolderServiceFactory({
permissionService,
folderDAL,
secretImportDAL,
folderVersionDAL,
projectEnvDAL,
snapshotService

7
backend/src/server/routes/v1/secret-folder-router.ts
View File

@@ -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 };
}
});
};

9
backend/src/services/secret-folder/secret-folder-service.ts
View File

@@ -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 {