Feat: Request access

backend/scripts/generate-schema-types.ts

@@ -5,7 +5,7 @@ import knex from "knex";
 import { writeFileSync } from "fs";
 
 dotenv.config({
-  path: path.join(__dirname, "../../.env.migration")
+  path: path.join(__dirname, "../../.env")
 });
 
 const db = knex({

backend/src/db/migrations/20240330075122_access-approval-policy.ts

@@ -34,6 +34,7 @@ export async function up(knex: Knex): Promise<void> {
 export async function down(knex: Knex): Promise<void> {
   await knex.schema.dropTableIfExists(TableName.AccessApprovalPolicyApprover);
   await knex.schema.dropTableIfExists(TableName.AccessApprovalPolicy);
+
   await dropOnUpdateTrigger(knex, TableName.AccessApprovalPolicy);
   await dropOnUpdateTrigger(knex, TableName.AccessApprovalPolicyApprover);
 }

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

@@ -155,7 +155,6 @@ export const accessApprovalPolicyServiceFactory = ({
       actorAuthMethod,
       actorOrgId
     );
-
     ForbiddenError.from(permission).throwUnlessCan(ProjectPermissionActions.Edit, ProjectPermissionSub.SecretApproval);
 
     const updatedPolicy = await accessApprovalPolicyDAL.transaction(async (tx) => {
@@ -179,7 +178,6 @@ export const accessApprovalPolicyServiceFactory = ({
         );
 
         await verifyApprovers({
-          projectId: accessApprovalPolicy.projectId,
           orgId: actorOrgId,
           envSlug: accessApprovalPolicy.environment.slug,
           secretPath: doc.secretPath!,
@@ -189,8 +187,6 @@ export const accessApprovalPolicyServiceFactory = ({
         });
 
         if (secretApprovers.length !== approvers.length)
-          throw new BadRequestError({ message: "Approver not found in project" });
-        if (doc.approvals > secretApprovers.length)
           throw new BadRequestError({ message: "Approvals cannot be greater than approvers" });
         await accessApprovalPolicyApproverDAL.delete({ policyId: doc.id }, tx);
         await accessApprovalPolicyApproverDAL.insertMany(

frontend/src/views/SecretApprovalPage/SecretApprovalPage.tsx

@@ -67,6 +67,10 @@ export const SecretApprovalPage = () => {
         <TabPanel value={TabSection.ResourcePolicies}>
           <AccessApprovalPolicyList workspaceId={projectId} />
         </TabPanel>
+
+        <TabPanel value={TabSection.ResourcePolicies}>
+          <AccessApprovalPolicyList workspaceId={workspaceId} />
+        </TabPanel>
       </Tabs>
     </div>
   );

frontend/src/views/SecretApprovalPage/components/AccessApprovalPolicyList/AccessApprovalPolicyList.tsx

@@ -83,7 +83,7 @@ export const AccessApprovalPolicyList = ({ workspaceId }: IProps) => {
 
   return (
     <div>
-      <div className="mb-6 flex justify-between items-end">
+      <div className="mb-6 flex items-end justify-between">
         <div className="flex flex-col">
           <span className="text-xl font-semibold text-mineshaft-100">Access Request Policies</span>
           <div className="mt-2 text-sm text-bunker-300">

frontend/src/views/SecretApprovalPage/components/AccessApprovalPolicyList/components/AccessPolicyForm.tsx

@@ -177,7 +177,6 @@ export const AccessPolicyForm = ({
           />
 
           <Controller
-            control={control}
             name="secretPath"
             render={({ field, fieldState: { error } }) => (
               <FormControl label="Secret Path" isError={Boolean(error)} errorText={error?.message}>
@@ -187,8 +186,6 @@ export const AccessPolicyForm = ({
           />
 
           <Controller
-            control={control}
-            name="approvers"
             render={({ field: { value, onChange }, fieldState: { error } }) => (
               <FormControl
                 label="Approvers Required"