Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.
TypeScript acmeagentsai-agentscertificate-managementdevsecopsenvironment-variableskubernetesopen-sourcepampkipostgresprivate-caprivileged-access-managementsecret-managementsecret-managersecretssecrets-managementsecuritysecurity-toolsvault
refac: rename services and files
adilsonafcfb2297dd0
diff --git a/backend/src/@types/fastify.d.ts b/backend/src/@types/fastify.d.tsindex dd300536b8..93ea270c2a 100644--- a/backend/src/@types/fastify.d.ts+++ b/backend/src/@types/fastify.d.ts@@ -168,8 +168,8 @@ import { TReminderServiceFactory } from "@app/services/reminder/reminder-types";import { TResourceMetadataServiceFactory } from "@app/services/resource-metadata/resource-metadata-service";import { TRoleServiceFactory } from "@app/services/role/role-service";import { TSecretServiceFactory } from "@app/services/secret/secret-service";-import { TSecretAccessApprovalPolicyBridgeServiceFactory } from "@app/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service";-import { TSecretAccessApprovalRequestBridgeServiceFactory } from "@app/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-service";+import { TSecretAccessApprovalGlobalPolicyBridgeServiceFactory } from "@app/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service";+import { TSecretAccessApprovalGlobalRequestBridgeServiceFactory } from "@app/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service";import { TSecretBlindIndexServiceFactory } from "@app/services/secret-blind-index/secret-blind-index-service";import { TSecretFolderServiceFactory } from "@app/services/secret-folder/secret-folder-service";import { TSecretImportServiceFactory } from "@app/services/secret-import/secret-import-service";@@ -347,8 +347,8 @@ declare module "fastify" {identitySpiffeAuth: TIdentitySpiffeAuthServiceFactory;identityLdapAuth: TIdentityLdapAuthServiceFactory;accessApprovalPolicy: TAccessApprovalPolicyServiceFactory;- secretAccessApprovalPolicyBridge: TSecretAccessApprovalPolicyBridgeServiceFactory;- secretAccessApprovalRequestBridge: TSecretAccessApprovalRequestBridgeServiceFactory;+ secretAccessApprovalGlobalPolicyBridge: TSecretAccessApprovalGlobalPolicyBridgeServiceFactory;+ secretAccessApprovalGlobalRequestBridge: TSecretAccessApprovalGlobalRequestBridgeServiceFactory;accessApprovalRequest: TAccessApprovalRequestServiceFactory;secretApprovalPolicy: TSecretApprovalPolicyServiceFactory;secretApprovalRequest: TSecretApprovalRequestServiceFactory;diff --git a/backend/src/ee/routes/v1/access-approval-policy-router.ts b/backend/src/ee/routes/v1/access-approval-policy-router.tsindex d10596c7ed..ca9baa5b22 100644--- a/backend/src/ee/routes/v1/access-approval-policy-router.ts+++ b/backend/src/ee/routes/v1/access-approval-policy-router.ts@@ -148,7 +148,7 @@ export const registerAccessApprovalPolicyRouter = async (server: FastifyZodProvi},onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),handler: async (req) => {- const approval = await server.services.secretAccessApprovalPolicyBridge.createAccessApprovalPolicy({+ const approval = await server.services.secretAccessApprovalGlobalPolicyBridge.createAccessApprovalPolicy({actor: req.permission.type,actorId: req.permission.id,actorAuthMethod: req.permission.authMethod,diff --git a/backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts b/backend/src/ee/services/access-approval-policy/access-approval-policy-service.tsindex 5c0ad82f24..d0e77feef6 100644--- a/backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts+++ b/backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts@@ -13,8 +13,8 @@ import {import { ApprovalPolicyType } from "@app/services/approval-policy/approval-policy-enums";import { TProjectDALFactory } from "@app/services/project/project-dal";import { TProjectEnvDALFactory } from "@app/services/project-env/project-env-dal";-import { secretAccessApprovalPolicyExists } from "@app/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns";-import { TSecretAccessApprovalPolicyBridgeServiceFactory } from "@app/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service";+import { secretAccessApprovalGlobalPolicyExists } from "@app/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-fns";+import { TSecretAccessApprovalGlobalPolicyBridgeServiceFactory } from "@app/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service";import { TUserDALFactory } from "@app/services/user/user-dal";import { TAccessApprovalRequestDALFactory } from "../access-approval-request/access-approval-request-dal";@@ -56,8 +56,8 @@ type TAccessApprovalPolicyServiceFactoryDep = {TApprovalPolicySecretEnvironmentDALFactory,"findPolicyByEnvIdsAndSecretPath">;- secretAccessApprovalPolicyBridge: Pick<- TSecretAccessApprovalPolicyBridgeServiceFactory,+ secretAccessApprovalGlobalPolicyBridge: Pick<+ TSecretAccessApprovalGlobalPolicyBridgeServiceFactory,| "updateAccessApprovalPolicy"| "deleteAccessApprovalPolicy"| "getAccessApprovalPolicyById"@@ -81,7 +81,7 @@ export const accessApprovalPolicyServiceFactory = ({accessApprovalRequestReviewerDAL,approvalPolicyDAL,approvalPolicySecretEnvironmentDAL,- secretAccessApprovalPolicyBridge+ secretAccessApprovalGlobalPolicyBridge}: TAccessApprovalPolicyServiceFactoryDep): TAccessApprovalPolicyServiceFactory => {const $usesGlobalApprovalBridge = async (policyId: string) => {const globalPolicy = await approvalPolicyDAL.findOne({ id: policyId, type: ApprovalPolicyType.SecretAccess });@@ -89,10 +89,10 @@ export const accessApprovalPolicyServiceFactory = ({};const $listGlobalApprovalPolicies = (projectId: string) =>- secretAccessApprovalPolicyBridge.listAccessApprovalPolicies({ projectId });+ secretAccessApprovalGlobalPolicyBridge.listAccessApprovalPolicies({ projectId });const $countGlobalApprovalPolicies = (projectId: string, envId: string) =>- secretAccessApprovalPolicyBridge.countAccessApprovalPolicies({ projectId, envId });+ secretAccessApprovalGlobalPolicyBridge.countAccessApprovalPolicies({ projectId, envId });const $policyExists = async ({envId,@@ -110,7 +110,7 @@ export const accessApprovalPolicyServiceFactory = ({throw new BadRequestError({ message: "Must provide either envId or envIds" });}- const conflictingEnvId = await secretAccessApprovalPolicyExists(+ const conflictingEnvId = await secretAccessApprovalGlobalPolicyExists({ envIds: resolvedEnvIds, secretPath, excludePolicyId: policyId },{ accessApprovalPolicyDAL, approvalPolicySecretEnvironmentDAL });@@ -383,7 +383,7 @@ export const accessApprovalPolicyServiceFactory = ({requestExpirationTime}: TUpdateAccessApprovalPolicy) => {if (await $usesGlobalApprovalBridge(policyId)) {- return secretAccessApprovalPolicyBridge.updateAccessApprovalPolicy({+ return secretAccessApprovalGlobalPolicyBridge.updateAccessApprovalPolicy({policyId,approvers,bypassers,@@ -659,7 +659,7 @@ export const accessApprovalPolicyServiceFactory = ({actorOrgId}: TDeleteAccessApprovalPolicy) => {if (await $usesGlobalApprovalBridge(policyId)) {- return secretAccessApprovalPolicyBridge.deleteAccessApprovalPolicy({+ return secretAccessApprovalGlobalPolicyBridge.deleteAccessApprovalPolicy({policyId,actor,actorId,@@ -760,7 +760,7 @@ export const accessApprovalPolicyServiceFactory = ({policyId}) => {if (await $usesGlobalApprovalBridge(policyId)) {- return secretAccessApprovalPolicyBridge.getAccessApprovalPolicyById({+ return secretAccessApprovalGlobalPolicyBridge.getAccessApprovalPolicyById({policyId,actor,actorId,diff --git a/backend/src/ee/services/access-approval-request/access-approval-request-service.ts b/backend/src/ee/services/access-approval-request/access-approval-request-service.tsindex 749e65ca65..20ee3a5fc7 100644--- a/backend/src/ee/services/access-approval-request/access-approval-request-service.ts+++ b/backend/src/ee/services/access-approval-request/access-approval-request-service.ts@@ -16,7 +16,7 @@ import { triggerWorkflowIntegrationNotification } from "@app/lib/workflow-integrimport { TriggerFeature } from "@app/lib/workflow-integrations/types";import { QueueJobs, QueueName, TQueueServiceFactory } from "@app/queue";import { TAdditionalPrivilegeDALFactory } from "@app/services/additional-privilege/additional-privilege-dal";-import { TSecretAccessApprovalResource } from "@app/services/approval-policy/secret-access/secret-access-policy-factory";+import { TSecretAccessApprovalGlobalResource } from "@app/services/approval-policy/secret-access/secret-access-policy-factory";import {TSecretAccessPolicy,TSecretAccessPolicyInputs@@ -27,7 +27,7 @@ import { TMicrosoftTeamsServiceFactory } from "@app/services/microsoft-teams/micimport { TProjectMicrosoftTeamsConfigDALFactory } from "@app/services/microsoft-teams/project-microsoft-teams-config-dal";import { TProjectDALFactory } from "@app/services/project/project-dal";import { TProjectEnvDALFactory } from "@app/services/project-env/project-env-dal";-import { TSecretAccessApprovalRequestBridgeServiceFactory } from "@app/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-service";+import { TSecretAccessApprovalGlobalRequestBridgeServiceFactory } from "@app/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service";import { TProjectSlackConfigDALFactory } from "@app/services/slack/project-slack-config-dal";import { SmtpTemplates, TSmtpService } from "@app/services/smtp/smtp-service";import { TUserDALFactory } from "@app/services/user/user-dal";@@ -76,9 +76,9 @@ type TSecretApprovalRequestServiceFactoryDep = {| "getCount">;accessApprovalPolicyDAL: Pick<TAccessApprovalPolicyDALFactory, "findOne" | "find" | "findLastValidPolicy">;- secretAccessApprovalResource: Pick<TSecretAccessApprovalResource, "matchPolicy">;- secretAccessApprovalRequestBridge: Pick<- TSecretAccessApprovalRequestBridgeServiceFactory,+ secretAccessApprovalGlobalResource: Pick<TSecretAccessApprovalGlobalResource, "matchPolicy">;+ secretAccessApprovalGlobalRequestBridge: Pick<+ TSecretAccessApprovalGlobalRequestBridgeServiceFactory,| "createAccessApprovalRequest"| "listAccessApprovalRequests"| "countAccessApprovalRequests"@@ -120,8 +120,8 @@ export const accessApprovalRequestServiceFactory = ({accessApprovalRequestReviewerDAL,accessApprovalPolicyDAL,accessApprovalPolicyApproverDAL,- secretAccessApprovalResource,- secretAccessApprovalRequestBridge,+ secretAccessApprovalGlobalResource,+ secretAccessApprovalGlobalRequestBridge,additionalPrivilegeDAL,smtpService,userDAL,@@ -250,7 +250,7 @@ export const accessApprovalRequestServiceFactory = ({}: TSecretAccessPolicyInputs & { projectId: string }): Promise<TApprovalPolicyRouting> => {const [legacyPolicy, globalPolicy] = await Promise.all([accessApprovalPolicyDAL.findLastValidPolicy({ envId: inputs.envId, secretPath: inputs.secretPath }),- secretAccessApprovalResource.matchPolicy(projectId, inputs)+ secretAccessApprovalGlobalResource.matchPolicy(projectId, inputs)]);if (globalPolicy) {@@ -306,7 +306,7 @@ export const accessApprovalRequestServiceFactory = ({});if (approvalBridge.usesGlobalBridge) {- return secretAccessApprovalRequestBridge.createAccessApprovalRequest({+ return secretAccessApprovalGlobalRequestBridge.createAccessApprovalRequest({policy: approvalBridge.globalPolicy,projectId: project.id,envId: environment.id,@@ -528,7 +528,7 @@ export const accessApprovalRequestServiceFactory = ({editNote,requestId}) => {- if (await secretAccessApprovalRequestBridge.isGlobalAccessApprovalRequest(requestId)) {+ if (await secretAccessApprovalGlobalRequestBridge.isGlobalAccessApprovalRequest(requestId)) {throw new BadRequestError({ message: "Access requests on the global approval system cannot be edited" });}@@ -737,7 +737,7 @@ export const accessApprovalRequestServiceFactory = ({const policies = await accessApprovalPolicyDAL.find({ projectId });const [legacyRequests, globalRequests] = await Promise.all([accessApprovalRequestDAL.findRequestsWithPrivilegeByPolicyIds(policies.map((p) => p.id)),- secretAccessApprovalRequestBridge.listAccessApprovalRequests({ projectId })+ secretAccessApprovalGlobalRequestBridge.listAccessApprovalRequests({ projectId })]);return [...legacyRequests, ...globalRequests];};@@ -804,8 +804,8 @@ export const accessApprovalRequestServiceFactory = ({actorOrgId,bypassReason}) => {- if (await secretAccessApprovalRequestBridge.isGlobalAccessApprovalRequest(requestId)) {- return secretAccessApprovalRequestBridge.reviewAccessApprovalRequest({+ if (await secretAccessApprovalGlobalRequestBridge.isGlobalAccessApprovalRequest(requestId)) {+ return secretAccessApprovalGlobalRequestBridge.reviewAccessApprovalRequest({requestId,actor,status,@@ -1172,8 +1172,8 @@ export const accessApprovalRequestServiceFactory = ({actorOrgId,actorAuthMethod}) => {- if (await secretAccessApprovalRequestBridge.isGlobalAccessApprovalRequest(requestId)) {- return secretAccessApprovalRequestBridge.revokeAccessApprovalRequest({+ if (await secretAccessApprovalGlobalRequestBridge.isGlobalAccessApprovalRequest(requestId)) {+ return secretAccessApprovalGlobalRequestBridge.revokeAccessApprovalRequest({requestId,actor,actorId,@@ -1276,7 +1276,7 @@ export const accessApprovalRequestServiceFactory = ({}) => {const [legacyCount, globalCount] = await Promise.all([accessApprovalRequestDAL.getCount({ projectId, policyId, requestedByUserId }),- secretAccessApprovalRequestBridge.countAccessApprovalRequests({+ secretAccessApprovalGlobalRequestBridge.countAccessApprovalRequests({projectId,policyId,requesterId: requestedByUserIddiff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.tsindex 49c660fb15..529826e944 100644--- a/backend/src/server/routes/index.ts+++ b/backend/src/server/routes/index.ts@@ -278,7 +278,7 @@ import {} from "@app/services/approval-policy/approval-request-dal";import { certRequestApprovalResourceFactory } from "@app/services/approval-policy/cert-request/cert-request-policy-factory";import { codeSigningApprovalResourceFactory } from "@app/services/approval-policy/code-signing/code-signing-policy-factory";-import { secretAccessApprovalResourceFactory } from "@app/services/approval-policy/secret-access/secret-access-policy-factory";+import { secretAccessApprovalGlobalResourceFactory } from "@app/services/approval-policy/secret-access/secret-access-policy-factory";import { authDALFactory } from "@app/services/auth/auth-dal";import { authLoginServiceFactory } from "@app/services/auth/auth-login-service";import { authPaswordServiceFactory } from "@app/services/auth/auth-password-service";@@ -512,10 +512,10 @@ import { secretQueueFactory } from "@app/services/secret/secret-queue";import { secretServiceFactory } from "@app/services/secret/secret-service";import { secretVersionDALFactory } from "@app/services/secret/secret-version-dal";import { secretVersionTagDALFactory } from "@app/services/secret/secret-version-tag-dal";-import { secretAccessApprovalPolicyBridgeDALFactory } from "@app/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-dal";-import { secretAccessApprovalPolicyBridgeServiceFactory } from "@app/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service";-import { secretAccessApprovalRequestBridgeDALFactory } from "@app/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-dal";-import { secretAccessApprovalRequestBridgeServiceFactory } from "@app/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-service";+import { secretAccessApprovalGlobalPolicyBridgeDALFactory } from "@app/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-dal";+import { secretAccessApprovalGlobalPolicyBridgeServiceFactory } from "@app/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service";+import { secretAccessApprovalGlobalRequestBridgeDALFactory } from "@app/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-dal";+import { secretAccessApprovalGlobalRequestBridgeServiceFactory } from "@app/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service";import { secretBlindIndexDALFactory } from "@app/services/secret-blind-index/secret-blind-index-dal";import { secretBlindIndexServiceFactory } from "@app/services/secret-blind-index/secret-blind-index-service";import { secretFolderDALFactory } from "@app/services/secret-folder/secret-folder-dal";@@ -1813,8 +1813,8 @@ export const registerRoutes = async (const approvalPolicyStepApproversDAL = approvalPolicyStepApproversDALFactory(db);const approvalPolicyBypassersDAL = approvalPolicyBypassersDALFactory(db);const approvalPolicySecretEnvironmentDAL = approvalPolicySecretEnvironmentDALFactory(db);- const secretAccessApprovalPolicyBridgeDAL = secretAccessApprovalPolicyBridgeDALFactory(db);- const secretAccessApprovalRequestBridgeDAL = secretAccessApprovalRequestBridgeDALFactory(db);+ const secretAccessApprovalGlobalPolicyBridgeDAL = secretAccessApprovalGlobalPolicyBridgeDALFactory(db);+ const secretAccessApprovalGlobalRequestBridgeDAL = secretAccessApprovalGlobalRequestBridgeDALFactory(db);const approvalRequestApprovalsDAL = approvalRequestApprovalsDALFactory(db);const orgGatewayConfigV2DAL = orgGatewayConfigV2DalFactory(db);@@ -2473,13 +2473,13 @@ export const registerRoutes = async (licenseService});- const secretAccessApprovalResource = secretAccessApprovalResourceFactory({+ const secretAccessApprovalGlobalResource = secretAccessApprovalGlobalResourceFactory({approvalPolicyDAL,approvalRequestGrantsDAL,additionalPrivilegeDAL});- const secretAccessApprovalPolicyBridgeService = secretAccessApprovalPolicyBridgeServiceFactory({+ const secretAccessApprovalGlobalPolicyBridgeService = secretAccessApprovalGlobalPolicyBridgeServiceFactory({projectDAL,permissionService,projectEnvDAL,@@ -2491,7 +2491,7 @@ export const registerRoutes = async (approvalPolicyStepApproversDAL,approvalPolicyBypassersDAL,approvalPolicySecretEnvironmentDAL,- secretAccessApprovalPolicyBridgeDAL,+ secretAccessApprovalGlobalPolicyBridgeDAL,approvalRequestDAL,approvalRequestStepsDAL,approvalRequestStepEligibleApproversDAL,@@ -2499,7 +2499,7 @@ export const registerRoutes = async (additionalPrivilegeDAL});- const secretAccessApprovalRequestBridgeService = secretAccessApprovalRequestBridgeServiceFactory({+ const secretAccessApprovalGlobalRequestBridgeService = secretAccessApprovalGlobalRequestBridgeServiceFactory({projectDAL,permissionService,userDAL,@@ -2510,8 +2510,8 @@ export const registerRoutes = async (approvalRequestApprovalsDAL,approvalRequestGrantsDAL,additionalPrivilegeDAL,- secretAccessApprovalPolicyBridgeDAL,- secretAccessApprovalRequestBridgeDAL,+ secretAccessApprovalGlobalPolicyBridgeDAL,+ secretAccessApprovalGlobalRequestBridgeDAL,smtpService,notificationService,kmsService,@@ -2519,7 +2519,7 @@ export const registerRoutes = async (microsoftTeamsService,projectMicrosoftTeamsConfigDAL,queueService,- secretAccessApprovalResource+ secretAccessApprovalGlobalResource});const accessApprovalPolicyService = accessApprovalPolicyServiceFactory({@@ -2537,7 +2537,7 @@ export const registerRoutes = async (additionalPrivilegeDAL,approvalPolicyDAL,approvalPolicySecretEnvironmentDAL,- secretAccessApprovalPolicyBridge: secretAccessApprovalPolicyBridgeService+ secretAccessApprovalGlobalPolicyBridge: secretAccessApprovalGlobalPolicyBridgeService});const accessApprovalRequestService = accessApprovalRequestServiceFactory({@@ -2545,8 +2545,8 @@ export const registerRoutes = async (permissionService,accessApprovalRequestReviewerDAL,accessApprovalPolicyDAL,- secretAccessApprovalResource,- secretAccessApprovalRequestBridge: secretAccessApprovalRequestBridgeService,+ secretAccessApprovalGlobalResource,+ secretAccessApprovalGlobalRequestBridge: secretAccessApprovalGlobalRequestBridgeService,accessApprovalRequestDAL,projectEnvDAL,userDAL,@@ -4431,8 +4431,8 @@ export const registerRoutes = async (identitySpiffeAuth: identitySpiffeAuthService,identityLdapAuth: identityLdapAuthService,accessApprovalPolicy: accessApprovalPolicyService,- secretAccessApprovalPolicyBridge: secretAccessApprovalPolicyBridgeService,- secretAccessApprovalRequestBridge: secretAccessApprovalRequestBridgeService,+ secretAccessApprovalGlobalPolicyBridge: secretAccessApprovalGlobalPolicyBridgeService,+ secretAccessApprovalGlobalRequestBridge: secretAccessApprovalGlobalRequestBridgeService,accessApprovalRequest: accessApprovalRequestService,secretApprovalPolicy: secretApprovalPolicyService,secretApprovalRequest: secretApprovalRequestService,diff --git a/backend/src/services/approval-policy/approval-policy-service.ts b/backend/src/services/approval-policy/approval-policy-service.tsindex 4292681287..5596cc164d 100644--- a/backend/src/services/approval-policy/approval-policy-service.ts+++ b/backend/src/services/approval-policy/approval-policy-service.ts@@ -1838,7 +1838,7 @@ export const approvalPolicyServiceFactory = ({const request = grant.requestId ? await approvalRequestDAL.findById(grant.requestId) : null;const assertDomainCanRevoke = resources[grantPolicyType]?.assertCanRevokeGrant;- // Secret access grants are managed by the secret-access-approval-request-bridge service+ // Secret access grants are managed by the secret-access-approval-global-request-bridge serviceif (grantPolicyType === ApprovalPolicyType.SecretAccess) {throw new BadRequestError({message: "This grant is for a secret access request. Revoke it from the access request instead."diff --git a/backend/src/services/approval-policy/secret-access/secret-access-policy-factory.ts b/backend/src/services/approval-policy/secret-access/secret-access-policy-factory.tsindex f98731b9c7..d5f0a0e6e7 100644--- a/backend/src/services/approval-policy/secret-access/secret-access-policy-factory.ts+++ b/backend/src/services/approval-policy/secret-access/secret-access-policy-factory.ts@@ -16,19 +16,19 @@ import {import { SecretAccessPolicyRequestDataSchema } from "./secret-access-policy-schemas";import { TSecretAccessPolicy, TSecretAccessPolicyInputs, TSecretAccessRequestData } from "./secret-access-policy-types";-type TSecretAccessApprovalResourceDep = {+type TSecretAccessApprovalGlobalResourceDep = {approvalPolicyDAL: Pick<TApprovalPolicyDALFactory, "findSecretAccessPolicyByEnvIdAndSecretPath">;approvalRequestGrantsDAL: Pick<TApprovalRequestGrantsDALFactory, "find" | "create">;additionalPrivilegeDAL: Pick<TAdditionalPrivilegeDALFactory, "create">;};-export type TSecretAccessApprovalResource = ReturnType<typeof secretAccessApprovalResourceFactory>;+export type TSecretAccessApprovalGlobalResource = ReturnType<typeof secretAccessApprovalGlobalResourceFactory>;-export const secretAccessApprovalResourceFactory = ({+export const secretAccessApprovalGlobalResourceFactory = ({approvalPolicyDAL,approvalRequestGrantsDAL,additionalPrivilegeDAL-}: TSecretAccessApprovalResourceDep) =>+}: TSecretAccessApprovalGlobalResourceDep) =>({matchPolicy: async (projectId, inputs) => {const policy = await approvalPolicyDAL.findSecretAccessPolicyByEnvIdAndSecretPath({diff --git a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-dal.ts b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-dal.tssimilarity index 97%rename from backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-dal.tsrename to backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-dal.tsindex 306e8ecefb..0148bd84d5 100644--- a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-dal.ts+++ b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-dal.ts@@ -17,9 +17,11 @@ const parseConstraints = (constraints: unknown) => {return { allowedSelfApprovals: true, requestExpirationTime: null, maxTimePeriod: null };};-export type TSecretAccessApprovalPolicyBridgeDALFactory = ReturnType<typeof secretAccessApprovalPolicyBridgeDALFactory>;+export type TSecretAccessApprovalGlobalPolicyBridgeDALFactory = ReturnType<+ typeof secretAccessApprovalGlobalPolicyBridgeDALFactory+>;-export const secretAccessApprovalPolicyBridgeDALFactory = (db: TDbClient) => {+export const secretAccessApprovalGlobalPolicyBridgeDALFactory = (db: TDbClient) => {const findSecretAccessPolicies = async ({policyId,diff --git a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns.test.ts b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-fns.test.tssimilarity index 99%rename from backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns.test.tsrename to backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-fns.test.tsindex 92151536c9..217c8a08c8 100644--- a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns.test.ts+++ b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-fns.test.ts@@ -3,7 +3,7 @@ import { describe, expect, test } from "vitest";import { BadRequestError } from "@app/lib/errors";import { ApproverType } from "@app/services/approval-policy/approval-policy-enums";-import { buildSecretAccessPolicySteps } from "./secret-access-approval-policy-bridge-fns";+import { buildSecretAccessPolicySteps } from "./secret-access-approval-global-policy-bridge-fns";type TApprovalsRequired = { numberOfApprovals: number; stepNumber: number }[];diff --git a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns.ts b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-fns.tssimilarity index 96%rename from backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns.tsrename to backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-fns.tsindex ccb04d020c..9da10d99f2 100644--- a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns.ts+++ b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-fns.ts@@ -8,7 +8,7 @@ import { TApprovalPolicySecretEnvironmentDALFactory } from "@app/services/approvimport { ApprovalRequestGrantStatus, ApproverType } from "@app/services/approval-policy/approval-policy-enums";import { TApprovalRequestGrantsDALFactory } from "@app/services/approval-policy/approval-request-dal";-type TSecretAccessApprovalPolicyExistsDep = {+type TSecretAccessApprovalGlobalPolicyExistsDep = {accessApprovalPolicyDAL: Pick<TAccessApprovalPolicyDALFactory, "findPolicyByEnvIdAndSecretPath">;approvalPolicySecretEnvironmentDAL: Pick<TApprovalPolicySecretEnvironmentDALFactory,@@ -16,9 +16,9 @@ type TSecretAccessApprovalPolicyExistsDep = {>;};-export const secretAccessApprovalPolicyExists = async (+export const secretAccessApprovalGlobalPolicyExists = async ({ envIds, secretPath, excludePolicyId }: { envIds: string[]; secretPath: string; excludePolicyId?: string },- { accessApprovalPolicyDAL, approvalPolicySecretEnvironmentDAL }: TSecretAccessApprovalPolicyExistsDep,+ { accessApprovalPolicyDAL, approvalPolicySecretEnvironmentDAL }: TSecretAccessApprovalGlobalPolicyExistsDep,tx?: Knex) => {const legacyPolicy = await accessApprovalPolicyDAL.findPolicyByEnvIdAndSecretPath(diff --git a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.ts b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service.tssimilarity index 91%rename from backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.tsrename to backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service.tsindex 4d9c74cc62..db526f4a80 100644--- a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.ts+++ b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service.ts@@ -18,20 +18,20 @@ import { ActorType } from "@app/services/auth/auth-type";import {buildSecretAccessPolicySteps,revokeActiveSecretAccessGrants,- secretAccessApprovalPolicyExists-} from "./secret-access-approval-policy-bridge-fns";+ secretAccessApprovalGlobalPolicyExists+} from "./secret-access-approval-global-policy-bridge-fns";import {- TCountSecretAccessApprovalPoliciesDTO,- TCreateSecretAccessApprovalPolicyDTO,- TDeleteSecretAccessApprovalPolicyDTO,- TGetSecretAccessApprovalPolicyByIdDTO,- TListSecretAccessApprovalPoliciesDTO,- TSecretAccessApprovalPolicyBridgeServiceFactoryDep,- TUpdateSecretAccessApprovalPolicyDTO-} from "./secret-access-approval-policy-bridge-types";--export type TSecretAccessApprovalPolicyBridgeServiceFactory = ReturnType<- typeof secretAccessApprovalPolicyBridgeServiceFactory+ TCountSecretAccessApprovalGlobalPoliciesDTO,+ TCreateSecretAccessApprovalGlobalPolicyDTO,+ TDeleteSecretAccessApprovalGlobalPolicyDTO,+ TGetSecretAccessApprovalGlobalPolicyByIdDTO,+ TListSecretAccessApprovalGlobalPoliciesDTO,+ TSecretAccessApprovalGlobalPolicyBridgeServiceFactoryDep,+ TUpdateSecretAccessApprovalGlobalPolicyDTO+} from "./secret-access-approval-global-policy-bridge-types";++export type TSecretAccessApprovalGlobalPolicyBridgeServiceFactory = ReturnType<+ typeof secretAccessApprovalGlobalPolicyBridgeServiceFactory>;type TApproverInput = TCreateAccessApprovalPolicy["approvers"];@@ -42,7 +42,7 @@ type TPolicyStep = {approvers: { type: ApproverType; id: string }[];};-export const secretAccessApprovalPolicyBridgeServiceFactory = ({+export const secretAccessApprovalGlobalPolicyBridgeServiceFactory = ({projectDAL,permissionService,projectEnvDAL,@@ -54,13 +54,13 @@ export const secretAccessApprovalPolicyBridgeServiceFactory = ({approvalPolicyStepApproversDAL,approvalPolicyBypassersDAL,approvalPolicySecretEnvironmentDAL,- secretAccessApprovalPolicyBridgeDAL,+ secretAccessApprovalGlobalPolicyBridgeDAL,approvalRequestDAL,approvalRequestStepsDAL,approvalRequestStepEligibleApproversDAL,approvalRequestGrantsDAL,additionalPrivilegeDAL-}: TSecretAccessApprovalPolicyBridgeServiceFactoryDep) => {+}: TSecretAccessApprovalGlobalPolicyBridgeServiceFactoryDep) => {const { verifyProjectSubjectsMembership } = approvalPolicyMembershipVerifierFactory({ projectDAL });const $splitApprovers = (approvers: TApproverInput) => ({@@ -253,7 +253,7 @@ export const secretAccessApprovalPolicyBridgeServiceFactory = ({actorAuthMethod,actorOrgId,projectId- }: Pick<TUpdateSecretAccessApprovalPolicyDTO, "actor" | "actorId" | "actorAuthMethod" | "actorOrgId"> & {+ }: Pick<TUpdateSecretAccessApprovalGlobalPolicyDTO, "actor" | "actorId" | "actorAuthMethod" | "actorOrgId"> & {projectId: string;}) => {const { permission } = await permissionService.getProjectPermission({@@ -289,7 +289,10 @@ export const secretAccessApprovalPolicyBridgeServiceFactory = ({};const $findPolicyById = async (policyId: string, organizationId: string, message: string) => {- const [policy] = await secretAccessApprovalPolicyBridgeDAL.findSecretAccessPolicies({ policyId, organizationId });+ const [policy] = await secretAccessApprovalGlobalPolicyBridgeDAL.findSecretAccessPolicies({+ policyId,+ organizationId+ });if (!policy) throw new NotFoundError({ message });return policy;};@@ -304,7 +307,7 @@ export const secretAccessApprovalPolicyBridgeServiceFactory = ({) => {if (!envs.length) return;- const conflictingEnvId = await secretAccessApprovalPolicyExists(+ const conflictingEnvId = await secretAccessApprovalGlobalPolicyExists({ envIds: envs.map((env) => env.id), secretPath, excludePolicyId },{ accessApprovalPolicyDAL, approvalPolicySecretEnvironmentDAL },tx@@ -337,7 +340,7 @@ export const secretAccessApprovalPolicyBridgeServiceFactory = ({approvalsRequired,maxTimePeriod,requestExpirationTime- }: TCreateSecretAccessApprovalPolicyDTO) => {+ }: TCreateSecretAccessApprovalGlobalPolicyDTO) => {const project = await projectDAL.findProjectBySlug(projectSlug, actorOrgId);if (!project) throw new NotFoundError({ message: `Project with slug '${projectSlug}' not found` });@@ -440,7 +443,7 @@ export const secretAccessApprovalPolicyBridgeServiceFactory = ({environments,maxTimePeriod,requestExpirationTime- }: TUpdateSecretAccessApprovalPolicyDTO) => {+ }: TUpdateSecretAccessApprovalGlobalPolicyDTO) => {const policy = await $findPolicyById(policyId,actorOrgId,@@ -512,7 +515,7 @@ export const secretAccessApprovalPolicyBridgeServiceFactory = ({await $resetPendingRequestSteps({ policyId: policy.id, steps }, tx);}- const [updatedPolicy] = await secretAccessApprovalPolicyBridgeDAL.findSecretAccessPolicies(+ const [updatedPolicy] = await secretAccessApprovalGlobalPolicyBridgeDAL.findSecretAccessPolicies({ policyId: policy.id },tx);@@ -526,7 +529,7 @@ export const secretAccessApprovalPolicyBridgeServiceFactory = ({actorId,actorAuthMethod,actorOrgId- }: TDeleteSecretAccessApprovalPolicyDTO) => {+ }: TDeleteSecretAccessApprovalGlobalPolicyDTO) => {const policy = await $findPolicyById(policyId,actorOrgId,@@ -574,7 +577,7 @@ export const secretAccessApprovalPolicyBridgeServiceFactory = ({actorId,actorAuthMethod,actorOrgId- }: TGetSecretAccessApprovalPolicyByIdDTO) => {+ }: TGetSecretAccessApprovalGlobalPolicyByIdDTO) => {const policy = await $findPolicyById(policyId,actorOrgId,@@ -593,11 +596,11 @@ export const secretAccessApprovalPolicyBridgeServiceFactory = ({return policy;};- const listAccessApprovalPolicies = ({ projectId }: TListSecretAccessApprovalPoliciesDTO) =>- secretAccessApprovalPolicyBridgeDAL.findSecretAccessPolicies({ projectId });+ const listAccessApprovalPolicies = ({ projectId }: TListSecretAccessApprovalGlobalPoliciesDTO) =>+ secretAccessApprovalGlobalPolicyBridgeDAL.findSecretAccessPolicies({ projectId });- const countAccessApprovalPolicies = async ({ projectId, envId }: TCountSecretAccessApprovalPoliciesDTO) => {- const policies = await secretAccessApprovalPolicyBridgeDAL.findSecretAccessPolicies({ projectId, envId });+ const countAccessApprovalPolicies = async ({ projectId, envId }: TCountSecretAccessApprovalGlobalPoliciesDTO) => {+ const policies = await secretAccessApprovalGlobalPolicyBridgeDAL.findSecretAccessPolicies({ projectId, envId });return policies.length;};diff --git a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-types.ts b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-types.tssimilarity index 76%rename from backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-types.tsrename to backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-types.tsindex 5a10df8adc..77baa3a211 100644--- a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-types.ts+++ b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-types.ts@@ -25,9 +25,9 @@ import { TProjectDALFactory } from "@app/services/project/project-dal";import { TProjectEnvDALFactory } from "@app/services/project-env/project-env-dal";import { TUserDALFactory } from "@app/services/user/user-dal";-import { TSecretAccessApprovalPolicyBridgeDALFactory } from "./secret-access-approval-policy-bridge-dal";+import { TSecretAccessApprovalGlobalPolicyBridgeDALFactory } from "./secret-access-approval-global-policy-bridge-dal";-export type TSecretAccessApprovalPolicyBridgeServiceFactoryDep = {+export type TSecretAccessApprovalGlobalPolicyBridgeServiceFactoryDep = {projectDAL: Pick<TProjectDALFactory, "findProjectBySlug" | "findEffectiveProjectSubjectsMembership">;permissionService: Pick<TPermissionServiceFactory, "getProjectPermission">;projectEnvDAL: Pick<TProjectEnvDALFactory, "find">;@@ -47,13 +47,16 @@ export type TSecretAccessApprovalPolicyBridgeServiceFactoryDep = {approvalRequestStepEligibleApproversDAL: Pick<TApprovalRequestStepEligibleApproversDALFactory, "create">;approvalRequestGrantsDAL: Pick<TApprovalRequestGrantsDALFactory, "update">;additionalPrivilegeDAL: Pick<TAdditionalPrivilegeDALFactory, "delete">;- secretAccessApprovalPolicyBridgeDAL: Pick<TSecretAccessApprovalPolicyBridgeDALFactory, "findSecretAccessPolicies">;+ secretAccessApprovalGlobalPolicyBridgeDAL: Pick<+ TSecretAccessApprovalGlobalPolicyBridgeDALFactory,+ "findSecretAccessPolicies"+ >;};-export type TCreateSecretAccessApprovalPolicyDTO = TCreateAccessApprovalPolicy;-export type TUpdateSecretAccessApprovalPolicyDTO = TUpdateAccessApprovalPolicy;-export type TDeleteSecretAccessApprovalPolicyDTO = TDeleteAccessApprovalPolicy;-export type TGetSecretAccessApprovalPolicyByIdDTO = TGetAccessApprovalPolicyByIdDTO;+export type TCreateSecretAccessApprovalGlobalPolicyDTO = TCreateAccessApprovalPolicy;+export type TUpdateSecretAccessApprovalGlobalPolicyDTO = TUpdateAccessApprovalPolicy;+export type TDeleteSecretAccessApprovalGlobalPolicyDTO = TDeleteAccessApprovalPolicy;+export type TGetSecretAccessApprovalGlobalPolicyByIdDTO = TGetAccessApprovalPolicyByIdDTO;-export type TListSecretAccessApprovalPoliciesDTO = { projectId: string };-export type TCountSecretAccessApprovalPoliciesDTO = { projectId: string; envId: string };+export type TListSecretAccessApprovalGlobalPoliciesDTO = { projectId: string };+export type TCountSecretAccessApprovalGlobalPoliciesDTO = { projectId: string; envId: string };diff --git a/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-dal.ts b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-dal.tssimilarity index 96%rename from backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-dal.tsrename to backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-dal.tsindex 44feac998f..4862eb68e8 100644--- a/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-dal.ts+++ b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-dal.ts@@ -6,11 +6,11 @@ import { DatabaseError } from "@app/lib/errors";import { selectAllTableCols } from "@app/lib/knex";import { ApprovalPolicyType, ApprovalRequestStatus } from "@app/services/approval-policy/approval-policy-enums";-export type TSecretAccessApprovalRequestBridgeDALFactory = ReturnType<- typeof secretAccessApprovalRequestBridgeDALFactory+export type TSecretAccessApprovalGlobalRequestBridgeDALFactory = ReturnType<+ typeof secretAccessApprovalGlobalRequestBridgeDALFactory>;-export const secretAccessApprovalRequestBridgeDALFactory = (db: TDbClient) => {+export const secretAccessApprovalGlobalRequestBridgeDALFactory = (db: TDbClient) => {const findSecretAccessRequestById = async (requestId: string, tx?: Knex) => {try {const request = await (tx || db.replicaNode())(TableName.ApprovalRequests)diff --git a/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-fns.test.ts b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-fns.test.tssimilarity index 99%rename from backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-fns.test.tsrename to backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-fns.test.tsindex 5f0fccefac..e8e9a70553 100644--- a/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-fns.test.ts+++ b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-fns.test.ts@@ -16,7 +16,7 @@ import {isPolicySubjectMatch,toLegacyAccessApprovalRequest,TSecretAccessRequestListInput-} from "./secret-access-approval-request-bridge-fns";+} from "./secret-access-approval-global-request-bridge-fns";type TRequest = TSecretAccessRequestListInput["requests"][number];type TPolicy = TSecretAccessRequestListInput["policies"][number];diff --git a/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-fns.ts b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-fns.tssimilarity index 95%rename from backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-fns.tsrename to backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-fns.tsindex dc440c03ee..3686b34e49 100644--- a/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-fns.ts+++ b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-fns.ts@@ -18,11 +18,11 @@ import { resolveStepApproverUserIds } from "@app/services/approval-policy/approvimport { getSecretAccessRequestData } from "@app/services/approval-policy/secret-access/secret-access-policy-fns";import { TSecretAccessRequestData } from "@app/services/approval-policy/secret-access/secret-access-policy-types";import { NotificationType } from "@app/services/notification/notification-types";-import { TSecretAccessApprovalPolicyBridgeDALFactory } from "@app/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-dal";+import { TSecretAccessApprovalGlobalPolicyBridgeDALFactory } from "@app/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-dal";import { SmtpTemplates } from "@app/services/smtp/smtp-service";-import { TSecretAccessApprovalRequestBridgeDALFactory } from "./secret-access-approval-request-bridge-dal";-import { TSecretAccessApprovalRequestBridgeServiceFactoryDep } from "./secret-access-approval-request-bridge-types";+import { TSecretAccessApprovalGlobalRequestBridgeDALFactory } from "./secret-access-approval-global-request-bridge-dal";+import { TSecretAccessApprovalGlobalRequestBridgeServiceFactoryDep } from "./secret-access-approval-global-request-bridge-types";export type TSecretAccessRequestRow = TApprovalRequests & {grant: TApprovalRequestGrants | null;@@ -107,7 +107,7 @@ export const toLegacyAccessApprovalRequest = (};type TNotifySecretAccessStepApproversDep = Pick<- TSecretAccessApprovalRequestBridgeServiceFactoryDep,+ TSecretAccessApprovalGlobalRequestBridgeServiceFactoryDep,| "userDAL"| "userGroupMembershipDAL"| "projectDAL"@@ -227,7 +227,7 @@ export const notifySecretAccessStepApprovers = async (};type TNotifySecretAccessBypassDep = Pick<- TSecretAccessApprovalRequestBridgeServiceFactoryDep,+ TSecretAccessApprovalGlobalRequestBridgeServiceFactoryDep,"userDAL" | "userGroupMembershipDAL" | "notificationService" | "smtpService">;@@ -301,10 +301,10 @@ export const notifySecretAccessBypass = async (};type TSecretAccessPolicyRow = Awaited<- ReturnType<TSecretAccessApprovalPolicyBridgeDALFactory["findSecretAccessPolicies"]>+ ReturnType<TSecretAccessApprovalGlobalPolicyBridgeDALFactory["findSecretAccessPolicies"]>>[number];type TApprovalWithRequestId = Awaited<- ReturnType<TSecretAccessApprovalRequestBridgeDALFactory["findApprovalsByRequestIds"]>+ ReturnType<TSecretAccessApprovalGlobalRequestBridgeDALFactory["findApprovalsByRequestIds"]>>[number];export type TSecretAccessRequestListInput = {diff --git a/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-service.ts b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.tssimilarity index 91%rename from backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-service.tsrename to backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.tsindex 454950e9dc..8009714ba9 100644--- a/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-service.ts+++ b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.ts@@ -40,21 +40,21 @@ import {notifySecretAccessBypass,notifySecretAccessStepApprovers,toLegacyAccessApprovalRequest-} from "./secret-access-approval-request-bridge-fns";+} from "./secret-access-approval-global-request-bridge-fns";import {- TCountSecretAccessApprovalRequestsDTO,- TCreateSecretAccessApprovalRequestDTO,- TListSecretAccessApprovalRequestsDTO,- TReviewSecretAccessApprovalRequestDTO,- TRevokeSecretAccessApprovalRequestDTO,- TSecretAccessApprovalRequestBridgeServiceFactoryDep-} from "./secret-access-approval-request-bridge-types";--export type TSecretAccessApprovalRequestBridgeServiceFactory = ReturnType<- typeof secretAccessApprovalRequestBridgeServiceFactory+ TCountSecretAccessApprovalGlobalRequestsDTO,+ TCreateSecretAccessApprovalGlobalRequestDTO,+ TListSecretAccessApprovalGlobalRequestsDTO,+ TReviewSecretAccessApprovalGlobalRequestDTO,+ TRevokeSecretAccessApprovalGlobalRequestDTO,+ TSecretAccessApprovalGlobalRequestBridgeServiceFactoryDep+} from "./secret-access-approval-global-request-bridge-types";++export type TSecretAccessApprovalGlobalRequestBridgeServiceFactory = ReturnType<+ typeof secretAccessApprovalGlobalRequestBridgeServiceFactory>;-export const secretAccessApprovalRequestBridgeServiceFactory = ({+export const secretAccessApprovalGlobalRequestBridgeServiceFactory = ({projectDAL,permissionService,userDAL,@@ -65,8 +65,8 @@ export const secretAccessApprovalRequestBridgeServiceFactory = ({approvalRequestApprovalsDAL,approvalRequestGrantsDAL,additionalPrivilegeDAL,- secretAccessApprovalPolicyBridgeDAL,- secretAccessApprovalRequestBridgeDAL,+ secretAccessApprovalGlobalPolicyBridgeDAL,+ secretAccessApprovalGlobalRequestBridgeDAL,smtpService,notificationService,kmsService,@@ -74,23 +74,23 @@ export const secretAccessApprovalRequestBridgeServiceFactory = ({microsoftTeamsService,projectMicrosoftTeamsConfigDAL,queueService,- secretAccessApprovalResource-}: TSecretAccessApprovalRequestBridgeServiceFactoryDep) => {+ secretAccessApprovalGlobalResource+}: TSecretAccessApprovalGlobalRequestBridgeServiceFactoryDep) => {const $findPolicyById = async (policyId: string, message: string) => {- const [policy] = await secretAccessApprovalPolicyBridgeDAL.findSecretAccessPolicies({ policyId });+ const [policy] = await secretAccessApprovalGlobalPolicyBridgeDAL.findSecretAccessPolicies({ policyId });if (!policy) throw new NotFoundError({ message });return policy;};const $findRequestById = async (requestId: string) => {- const request = await secretAccessApprovalRequestBridgeDAL.findSecretAccessRequestById(requestId);+ const request = await secretAccessApprovalGlobalRequestBridgeDAL.findSecretAccessRequestById(requestId);if (!request) throw new NotFoundError({ message: `Access request with ID '${requestId}' not found` });return request;};const $findRequestByIdFromPrimary = async (requestId: string) => {const request = await approvalRequestDAL.transaction((tx) =>- secretAccessApprovalRequestBridgeDAL.findSecretAccessRequestById(requestId, tx)+ secretAccessApprovalGlobalRequestBridgeDAL.findSecretAccessRequestById(requestId, tx));if (!request) throw new NotFoundError({ message: `Access request with ID '${requestId}' not found` });return request;@@ -102,25 +102,25 @@ export const secretAccessApprovalRequestBridgeServiceFactory = ({};const $loadRequestRows = async (filter: { projectId: string; policyId?: string; requesterId?: string }) => {- const requests = await secretAccessApprovalRequestBridgeDAL.findSecretAccessRequests(filter);+ const requests = await secretAccessApprovalGlobalRequestBridgeDAL.findSecretAccessRequests(filter);if (!requests.length) return [];const requestIds = requests.map((request) => request.id);const [policies, grants, approvals] = await Promise.all([- secretAccessApprovalPolicyBridgeDAL.findSecretAccessPolicies({ projectId: filter.projectId }),- secretAccessApprovalRequestBridgeDAL.findGrantsByRequestIds(requestIds),- secretAccessApprovalRequestBridgeDAL.findApprovalsByRequestIds(requestIds)+ secretAccessApprovalGlobalPolicyBridgeDAL.findSecretAccessPolicies({ projectId: filter.projectId }),+ secretAccessApprovalGlobalRequestBridgeDAL.findGrantsByRequestIds(requestIds),+ secretAccessApprovalGlobalRequestBridgeDAL.findApprovalsByRequestIds(requestIds)]);const [privileges, groupMembers] = await Promise.all([- secretAccessApprovalRequestBridgeDAL.findPrivilegesByGrantIds(grants.map((grant) => grant.id)),- secretAccessApprovalRequestBridgeDAL.findGroupMembers(collectSecretAccessPolicyGroupIds(policies))+ secretAccessApprovalGlobalRequestBridgeDAL.findPrivilegesByGrantIds(grants.map((grant) => grant.id)),+ secretAccessApprovalGlobalRequestBridgeDAL.findGroupMembers(collectSecretAccessPolicyGroupIds(policies))]);const userIds = collectSecretAccessRequestUserIds({ requests, policies, grants, approvals, groupMembers });const [users, orgMemberships] = await Promise.all([- secretAccessApprovalRequestBridgeDAL.findUsersByIds(userIds),- secretAccessApprovalRequestBridgeDAL.findOrgMembershipActivity(requests[0].organizationId, userIds)+ secretAccessApprovalGlobalRequestBridgeDAL.findUsersByIds(userIds),+ secretAccessApprovalGlobalRequestBridgeDAL.findOrgMembershipActivity(requests[0].organizationId, userIds)]);return composeSecretAccessRequestRows({@@ -135,7 +135,7 @@ export const secretAccessApprovalRequestBridgeServiceFactory = ({});};- const listAccessApprovalRequests = async ({ projectId }: TListSecretAccessApprovalRequestsDTO) => {+ const listAccessApprovalRequests = async ({ projectId }: TListSecretAccessApprovalGlobalRequestsDTO) => {const rows = await $loadRequestRows({ projectId });return rows.flatMap((row) => {@@ -173,7 +173,7 @@ export const secretAccessApprovalRequestBridgeServiceFactory = ({projectId,policyId,requesterId- }: TCountSecretAccessApprovalRequestsDTO) => {+ }: TCountSecretAccessApprovalGlobalRequestsDTO) => {const rows = await $loadRequestRows({ projectId, policyId, requesterId });const now = new Date();@@ -290,7 +290,7 @@ export const secretAccessApprovalRequestBridgeServiceFactory = ({isTemporary,temporaryRange,note- }: TCreateSecretAccessApprovalRequestDTO) => {+ }: TCreateSecretAccessApprovalGlobalRequestDTO) => {const requestData: TSecretAccessRequestData = {permissions,isTemporary,@@ -301,7 +301,7 @@ export const secretAccessApprovalRequestBridgeServiceFactory = ({throw new BadRequestError({ message: "A temporary range is required for temporary requests" });}- const constraintValidation = secretAccessApprovalResource.validateConstraints(policy, requestData);+ const constraintValidation = secretAccessApprovalGlobalResource.validateConstraints(policy, requestData);if (!constraintValidation.valid) {throw new BadRequestError({ message: constraintValidation.errors?.join("; ") ?? "Policy constraints not met" });}@@ -316,7 +316,7 @@ export const secretAccessApprovalRequestBridgeServiceFactory = ({throw new BadRequestError({ message: `Policy '${policy.name}' has no approvers configured` });}- const activeGrant = await secretAccessApprovalResource.canAccess(projectId, requestedByUserId, {+ const activeGrant = await secretAccessApprovalGlobalResource.canAccess(projectId, requestedByUserId, {envId,secretPath,permissions,@@ -326,7 +326,7 @@ export const secretAccessApprovalRequestBridgeServiceFactory = ({throw new BadRequestError({ message: "You already have an active privilege with the same criteria" });}- const pendingRequests = await secretAccessApprovalRequestBridgeDAL.findPendingRequests({+ const pendingRequests = await secretAccessApprovalGlobalRequestBridgeDAL.findPendingRequests({policyId: policy.id,requesterId: requestedByUserId});@@ -408,7 +408,7 @@ export const secretAccessApprovalRequestBridgeServiceFactory = ({actorId,actorOrgId,actorAuthMethod- }: TReviewSecretAccessApprovalRequestDTO) => {+ }: TReviewSecretAccessApprovalGlobalRequestDTO) => {const request = await $findRequestById(requestId);if (!request.policyId) {throw new BadRequestError({ message: "The policy associated with this access request has been deleted." });@@ -523,7 +523,7 @@ export const secretAccessApprovalRequestBridgeServiceFactory = ({const isEligible =actor === ActorType.USER &&isSelfReview &&- (await secretAccessApprovalResource.isBreakGlassEligible({+ (await secretAccessApprovalGlobalResource.isBreakGlassEligible({policy,bypassers: policy.bypassers,actor: { id: actorId },@@ -577,7 +577,7 @@ export const secretAccessApprovalRequestBridgeServiceFactory = ({));const approved = await approvalRequestDAL.updateById(requestId, { status: ApprovalRequestStatus.Approved }, tx);- await secretAccessApprovalResource.postApprovalTxRoutine(approved as TApprovalRequest, tx, {+ await secretAccessApprovalGlobalResource.postApprovalTxRoutine(approved as TApprovalRequest, tx, {bypassReason: trimmedBypassReason});@@ -697,7 +697,7 @@ export const secretAccessApprovalRequestBridgeServiceFactory = ({}await approvalRequestDAL.updateById(requestId, { status: ApprovalRequestStatus.Approved }, tx);- await secretAccessApprovalResource.postApprovalTxRoutine(locked as TApprovalRequest, tx);+ await secretAccessApprovalGlobalResource.postApprovalTxRoutine(locked as TApprovalRequest, tx);return { approval: createdApproval, nextStep: null };});@@ -751,7 +751,7 @@ export const secretAccessApprovalRequestBridgeServiceFactory = ({actorId,actorOrgId,actorAuthMethod- }: TRevokeSecretAccessApprovalRequestDTO) => {+ }: TRevokeSecretAccessApprovalGlobalRequestDTO) => {const request = await $findRequestById(requestId);if (!request.requesterId) {throw new NotFoundError({ message: "The user who created this access request no longer exists" });@@ -777,7 +777,7 @@ export const secretAccessApprovalRequestBridgeServiceFactory = ({const canGrantPrivilegesLegacy = permission.can(ProjectPermissionMemberActions.GrantPrivileges, memberSubject);const [policy] = request.policyId- ? await secretAccessApprovalPolicyBridgeDAL.findSecretAccessPolicies({ policyId: request.policyId })+ ? await secretAccessApprovalGlobalPolicyBridgeDAL.findSecretAccessPolicies({ policyId: request.policyId }): [];let isApprover = false;diff --git a/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-types.ts b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-types.tssimilarity index 74%rename from backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-types.tsrename to backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-types.tsindex 48061ca0b0..6e4b911672 100644--- a/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-types.ts+++ b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-types.ts@@ -13,21 +13,21 @@ import {TApprovalRequestStepEligibleApproversDALFactory,TApprovalRequestStepsDALFactory} from "@app/services/approval-policy/approval-request-dal";-import { TSecretAccessApprovalResource } from "@app/services/approval-policy/secret-access/secret-access-policy-factory";+import { TSecretAccessApprovalGlobalResource } from "@app/services/approval-policy/secret-access/secret-access-policy-factory";import { TSecretAccessPolicy } from "@app/services/approval-policy/secret-access/secret-access-policy-types";import { TKmsServiceFactory } from "@app/services/kms/kms-service";import { TMicrosoftTeamsServiceFactory } from "@app/services/microsoft-teams/microsoft-teams-service";import { TProjectMicrosoftTeamsConfigDALFactory } from "@app/services/microsoft-teams/project-microsoft-teams-config-dal";import { TNotificationServiceFactory } from "@app/services/notification/notification-service";import { TProjectDALFactory } from "@app/services/project/project-dal";-import { TSecretAccessApprovalPolicyBridgeDALFactory } from "@app/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-dal";+import { TSecretAccessApprovalGlobalPolicyBridgeDALFactory } from "@app/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-dal";import { TProjectSlackConfigDALFactory } from "@app/services/slack/project-slack-config-dal";import { TSmtpService } from "@app/services/smtp/smtp-service";import { TUserDALFactory } from "@app/services/user/user-dal";-import { TSecretAccessApprovalRequestBridgeDALFactory } from "./secret-access-approval-request-bridge-dal";+import { TSecretAccessApprovalGlobalRequestBridgeDALFactory } from "./secret-access-approval-global-request-bridge-dal";-export type TSecretAccessApprovalRequestBridgeServiceFactoryDep = {+export type TSecretAccessApprovalGlobalRequestBridgeServiceFactoryDep = {projectDAL: Pick<TProjectDALFactory, "findById">;permissionService: Pick<TPermissionServiceFactory, "getProjectPermission">;userDAL: Pick<TUserDALFactory, "find" | "findById">;@@ -41,9 +41,12 @@ export type TSecretAccessApprovalRequestBridgeServiceFactoryDep = {approvalRequestApprovalsDAL: Pick<TApprovalRequestApprovalsDALFactory, "create" | "find">;approvalRequestGrantsDAL: Pick<TApprovalRequestGrantsDALFactory, "updateById" | "findByIdForUpdate">;additionalPrivilegeDAL: Pick<TAdditionalPrivilegeDALFactory, "delete">;- secretAccessApprovalPolicyBridgeDAL: Pick<TSecretAccessApprovalPolicyBridgeDALFactory, "findSecretAccessPolicies">;- secretAccessApprovalRequestBridgeDAL: Pick<- TSecretAccessApprovalRequestBridgeDALFactory,+ secretAccessApprovalGlobalPolicyBridgeDAL: Pick<+ TSecretAccessApprovalGlobalPolicyBridgeDALFactory,+ "findSecretAccessPolicies"+ >;+ secretAccessApprovalGlobalRequestBridgeDAL: Pick<+ TSecretAccessApprovalGlobalRequestBridgeDALFactory,| "findSecretAccessRequestById"| "findSecretAccessRequests"| "findPendingRequests"@@ -61,13 +64,13 @@ export type TSecretAccessApprovalRequestBridgeServiceFactoryDep = {microsoftTeamsService: Pick<TMicrosoftTeamsServiceFactory, "sendNotification">;projectMicrosoftTeamsConfigDAL: Pick<TProjectMicrosoftTeamsConfigDALFactory, "getIntegrationDetailsByProject">;queueService: Pick<TQueueServiceFactory, "queue">;- secretAccessApprovalResource: Pick<- TSecretAccessApprovalResource,+ secretAccessApprovalGlobalResource: Pick<+ TSecretAccessApprovalGlobalResource,"canAccess" | "validateConstraints" | "postApprovalTxRoutine" | "isBreakGlassEligible">;};-export type TCreateSecretAccessApprovalRequestDTO = {+export type TCreateSecretAccessApprovalGlobalRequestDTO = {policy: TSecretAccessPolicy;projectId: string;envId: string;@@ -82,7 +85,11 @@ export type TCreateSecretAccessApprovalRequestDTO = {note?: string;};-export type TListSecretAccessApprovalRequestsDTO = { projectId: string };-export type TCountSecretAccessApprovalRequestsDTO = { projectId: string; policyId?: string; requesterId?: string };-export type TReviewSecretAccessApprovalRequestDTO = TReviewAccessRequestDTO;-export type TRevokeSecretAccessApprovalRequestDTO = TRevokeAccessRequestDTO;+export type TListSecretAccessApprovalGlobalRequestsDTO = { projectId: string };+export type TCountSecretAccessApprovalGlobalRequestsDTO = {+ projectId: string;+ policyId?: string;+ requesterId?: string;+};+export type TReviewSecretAccessApprovalGlobalRequestDTO = TReviewAccessRequestDTO;+export type TRevokeSecretAccessApprovalGlobalRequestDTO = TRevokeAccessRequestDTO;