From 942e1a82c284caf1648e450437f362ebf25b7c34 Mon Sep 17 00:00:00 2001
From: Akhil Mohan <akhilmhdh@gmail.com>
Date: Thu, 14 Sep 2023 21:34:13 +0530
Subject: [PATCH] feat(rbac): removed audit log option for time being, v3
 secret patch and reload permission flash screen fix

---
 .../src/controllers/v3/secretsController.ts   |  3 +++
 backend/src/validation/secrets.ts             |  4 +--
 .../ProjectPermissionContext.tsx              | 16 ++++++------
 frontend/src/layouts/AppLayout/AppLayout.tsx  | 26 +------------------
 .../ProjectRoleModifySection.tsx              |  7 -----
 5 files changed, 14 insertions(+), 42 deletions(-)

diff --git a/backend/src/controllers/v3/secretsController.ts b/backend/src/controllers/v3/secretsController.ts
index fad50b0ca..a528436af 100644
--- a/backend/src/controllers/v3/secretsController.ts
+++ b/backend/src/controllers/v3/secretsController.ts
@@ -55,6 +55,9 @@ export const getSecretsRaw = async (req: Request, res: Response) => {
     secretPath = getFolderWithPathFromId(folder.nodes, folderId).folderPath;
   }
 
+  if (!environment || !workspaceId)
+    throw BadRequestError({ message: "Missing environment or workspace id" });
+
   let permissionCheckFn: (env: string, secPath: string) => boolean; // used to pass as callback function to import secret
   if (req.user?._id) {
     const { permission } = await getUserProjectPermissions(req.user._id, workspaceId);
diff --git a/backend/src/validation/secrets.ts b/backend/src/validation/secrets.ts
index 700a3ea5d..cc541ab9e 100644
--- a/backend/src/validation/secrets.ts
+++ b/backend/src/validation/secrets.ts
@@ -225,8 +225,8 @@ export const GetSecretsV2 = z.object({
 
 export const GetSecretsRawV3 = z.object({
   query: z.object({
-    workspaceId: z.string().trim(),
-    environment: z.string().trim(),
+    workspaceId: z.string().trim().optional(),
+    environment: z.string().trim().optional(),
     secretPath: z.string().trim().default("/"),
     folderId: z.string().trim().optional(),
     include_imports: z
diff --git a/frontend/src/context/ProjectPermissionContext/ProjectPermissionContext.tsx b/frontend/src/context/ProjectPermissionContext/ProjectPermissionContext.tsx
index 732466cf6..bb7fab7ec 100644
--- a/frontend/src/context/ProjectPermissionContext/ProjectPermissionContext.tsx
+++ b/frontend/src/context/ProjectPermissionContext/ProjectPermissionContext.tsx
@@ -16,14 +16,6 @@ export const ProjectPermissionProvider = ({ children }: Props): JSX.Element => {
   const workspaceId = currentWorkspace?._id || "";
   const { data: permission, isLoading } = useGetUserProjectPermissions({ workspaceId });
 
-  if (!permission && currentWorkspace) {
-    return (
-      <div className="flex items-center justify-center w-screen h-screen bg-bunker-800">
-        Failed to load user permissions
-      </div>
-    );
-  }
-
   if ((isLoading && currentWorkspace) || isWsLoading) {
     return (
       <div className="flex items-center justify-center w-screen h-screen bg-bunker-800">
@@ -37,6 +29,14 @@ export const ProjectPermissionProvider = ({ children }: Props): JSX.Element => {
     );
   }
 
+  if (!permission && currentWorkspace) {
+    return (
+      <div className="flex items-center justify-center w-screen h-screen bg-bunker-800">
+        Failed to load user permissions
+      </div>
+    );
+  }
+
   return (
     <ProjectPermissionContext.Provider value={permission!}>
       {children}
diff --git a/frontend/src/layouts/AppLayout/AppLayout.tsx b/frontend/src/layouts/AppLayout/AppLayout.tsx
index d03161f30..47f7570d8 100644
--- a/frontend/src/layouts/AppLayout/AppLayout.tsx
+++ b/frontend/src/layouts/AppLayout/AppLayout.tsx
@@ -138,7 +138,6 @@ export const AppLayout = ({ children }: LayoutProps) => {
 
   const { t } = useTranslation();
 
-
   const logout = useLogoutUser();
   const logOutUser = async () => {
     try {
@@ -488,7 +487,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
                           </MenuItem>
                         </a>
                       </Link>
-                      <Link href={`/project/${currentWorkspace?._id}/audit-logs`} passHref>
+                      {/* <Link href={`/project/${currentWorkspace?._id}/audit-logs`} passHref>
                         <a>
                           <MenuItem
                             isSelected={
@@ -499,30 +498,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
                             Audit Logs
                           </MenuItem>
                         </a>
-                      </Link>
-                      {/* <Link href={`/project/${currentWorkspace?._id}/logs`} passHref>
-                        <a>
-                          <MenuItem
-                            isSelected={
-                              router.asPath === `/project/${currentWorkspace?._id}/logs`
-                            }
-                            icon="system-outline-168-view-headline"
-                          >
-                            Audit Logs
-                          </MenuItem>
-                        </a>
                       </Link> */}
-                      {/* <Link href={`/project/${currentWorkspace?._id}/secret-scanning`} passHref>
-                      <a>
-                        <MenuItem
-                          isSelected={router.asPath === `/project/${currentWorkspace?._id}/secret-scanning`}
-                          // icon={<FontAwesomeIcon icon={faFileLines} size="lg" />}
-                          icon="system-outline-82-extension"
-                        >
-                          Audit Logs
-                        </MenuItem>
-                      </a>
-                    </Link> */}
                       <Link href={`/project/${currentWorkspace?._id}/settings`} passHref>
                         <a>
                           <MenuItem
diff --git a/frontend/src/views/Project/MembersPage/components/ProjectRoleListTab/components/ProjectRoleModifySection/ProjectRoleModifySection.tsx b/frontend/src/views/Project/MembersPage/components/ProjectRoleListTab/components/ProjectRoleModifySection/ProjectRoleModifySection.tsx
index 5a0f1c51c..7e39e3450 100644
--- a/frontend/src/views/Project/MembersPage/components/ProjectRoleListTab/components/ProjectRoleModifySection/ProjectRoleModifySection.tsx
+++ b/frontend/src/views/Project/MembersPage/components/ProjectRoleListTab/components/ProjectRoleModifySection/ProjectRoleModifySection.tsx
@@ -3,7 +3,6 @@ import { faElementor } from "@fortawesome/free-brands-svg-icons";
 import {
   faAnchorLock,
   faArrowLeft,
-  faBook,
   faCog,
   faKey,
   faLock,
@@ -83,12 +82,6 @@ const SINGLE_PERMISSION_LIST = [
     icon: faTags,
     formName: "tags"
   },
-  {
-    title: "Audit Logs",
-    subtitle: "Audit log management control",
-    icon: faBook,
-    formName: "audit-logs"
-  },
   {
     title: "IP Allowlist",
     subtitle: "IP allowlist management control",