From c91a93ef2a72ba39827a74311eaf4c5fb5f400cb Mon Sep 17 00:00:00 2001
From: Akhil Mohan <akhilmhdh@gmail.com>
Date: Thu, 7 Sep 2023 20:39:00 +0530
Subject: [PATCH] feat(rbac): resolved secret import not listing

---
 .../src/controllers/v1/secretImportController.ts    | 13 +++++++------
 backend/src/validation/secretImports.ts             |  2 +-
 frontend/src/views/DashboardPage/DashboardPage.tsx  | 10 ++++------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/backend/src/controllers/v1/secretImportController.ts b/backend/src/controllers/v1/secretImportController.ts
index 209da36ac..b912c0653 100644
--- a/backend/src/controllers/v1/secretImportController.ts
+++ b/backend/src/controllers/v1/secretImportController.ts
@@ -275,7 +275,9 @@ export const deleteSecretImport = async (req: Request, res: Response) => {
 };
 
 export const getSecretImports = async (req: Request, res: Response) => {
-  const { workspaceId, environment, folderId } = req.query;
+  const {
+    query: { workspaceId, environment, folderId }
+  } = await validateRequest(reqValidator.GetSecretImportsV1, req);
   const importSecDoc = await SecretImport.findOne({
     workspace: workspaceId,
     environment,
@@ -325,11 +327,10 @@ export const getSecretImports = async (req: Request, res: Response) => {
 };
 
 export const getAllSecretsFromImport = async (req: Request, res: Response) => {
-  const { workspaceId, environment, folderId } = req.query as {
-    workspaceId: string;
-    environment: string;
-    folderId: string;
-  };
+  const {
+    query: { workspaceId, environment, folderId }
+  } = await validateRequest(reqValidator.GetAllSecretsFromImportV1, req);
+
   const importSecDoc = await SecretImport.findOne({
     workspace: workspaceId,
     environment,
diff --git a/backend/src/validation/secretImports.ts b/backend/src/validation/secretImports.ts
index 7c27667bc..92867a67b 100644
--- a/backend/src/validation/secretImports.ts
+++ b/backend/src/validation/secretImports.ts
@@ -40,7 +40,7 @@ export const GetSecretImportsV1 = z.object({
   query: z.object({
     workspaceId: z.string().trim(),
     environment: z.string().trim(),
-    folderId: z.string().trim()
+    folderId: z.string().trim().default("root")
   })
 });
 
diff --git a/frontend/src/views/DashboardPage/DashboardPage.tsx b/frontend/src/views/DashboardPage/DashboardPage.tsx
index 6e8509aba..d8b04eac0 100644
--- a/frontend/src/views/DashboardPage/DashboardPage.tsx
+++ b/frontend/src/views/DashboardPage/DashboardPage.tsx
@@ -3,7 +3,6 @@ import { FormProvider, useFieldArray, useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { useRouter } from "next/router";
 import { subject } from "@casl/ability";
-import { Can } from "@casl/react";
 import {
   closestCenter,
   DndContext,
@@ -927,10 +926,9 @@ export const DashboardPage = () => {
                   <DropdownMenuContent align="end" className="left-20 z-[60] mt-1 w-[10.8rem]">
                     <div className="rounded-md border border-mineshaft-600 bg-mineshaft-800 p-1">
                       <div className="w-full pb-1">
-                        <Can
-                          ability={permission}
-                          I={ProjectPermissionActions.Delete}
-                          a={ProjectPermissionSub.SecretRollback}
+                        <ProjectPermissionCan
+                          I={ProjectPermissionActions.Create}
+                          a={ProjectPermissionSub.Folders}
                         >
                           {(isAllowed) => (
                             <Button
@@ -944,7 +942,7 @@ export const DashboardPage = () => {
                               Add Folder
                             </Button>
                           )}
-                        </Can>
+                        </ProjectPermissionCan>
                       </div>
                       <div className="w-full">
                         <ProjectPermissionCan