Fix: Rebase errors

backend/src/ee/routes/v1/access-approval-request-router.ts

@@ -2,6 +2,10 @@ import { z } from "zod";
 
 import { AccessApprovalRequestsReviewersSchema, AccessApprovalRequestsSchema } from "@app/db/schemas";
 import { ApprovalStatus } from "@app/ee/services/access-approval-request/access-approval-request-types";
+import { verifyAuth } from "@app/server/plugins/auth/verify-auth";
+import { AuthMode } from "@app/services/auth/auth-type";
+
+export const registerAccessApprovalRequestRouter = async (server: FastifyZodProvider) => {
   server.route({
     url: "/",
     method: "POST",

backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts

@@ -179,6 +179,7 @@ export const accessApprovalPolicyServiceFactory = ({
         );
 
         await verifyApprovers({
+          projectId: accessApprovalPolicy.projectId,
           orgId: actorOrgId,
           envSlug: accessApprovalPolicy.environment.slug,
           secretPath: doc.secretPath!,