diff --git a/backend/src/ee/routes/v1/project-router.ts b/backend/src/ee/routes/v1/project-router.ts index 8015dc8bf..1f8c5b7ee 100644 --- a/backend/src/ee/routes/v1/project-router.ts +++ b/backend/src/ee/routes/v1/project-router.ts @@ -194,7 +194,7 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => { }, onRequest: verifyAuth([AuthMode.JWT]), handler: async (req) => { - const secretManagerKmsKey = await server.services.project.getProjectSecretManagerKmsKey({ + const kmsKeys = await server.services.project.getProjectKmsKeys({ actor: req.permission.type, actorId: req.permission.id, actorAuthMethod: req.permission.authMethod, @@ -202,9 +202,7 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => { projectId: req.params.workspaceId }); - return { - secretManagerKmsKey - }; + return kmsKeys; } }); diff --git a/backend/src/services/project/project-service.ts b/backend/src/services/project/project-service.ts index ee1278351..261d6cc1f 100644 --- a/backend/src/services/project/project-service.ts +++ b/backend/src/services/project/project-service.ts @@ -772,13 +772,7 @@ export const projectServiceFactory = ({ return kmsBackup; }; - const getProjectSecretManagerKmsKey = async ({ - projectId, - actor, - actorId, - actorAuthMethod, - actorOrgId - }: TGetProjectKmsKey) => { + const getProjectKmsKeys = async ({ projectId, actor, actorId, actorAuthMethod, actorOrgId }: TGetProjectKmsKey) => { const { membership } = await permissionService.getProjectPermission( actor, actorId, @@ -796,7 +790,7 @@ export const projectServiceFactory = ({ const kmsKeyId = await kmsService.getProjectSecretManagerKmsKeyId(projectId); const kmsKey = await kmsService.getKmsById(kmsKeyId); - return kmsKey; + return { secretManagerKmsKey: kmsKey }; }; return { @@ -816,6 +810,6 @@ export const projectServiceFactory = ({ updateProjectKmsKey, getProjectKmsBackup, loadProjectKmsBackup, - getProjectSecretManagerKmsKey + getProjectKmsKeys }; };