mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-10 11:29:02 +00:00
feat(rbac): removed audit log option for time being, v3 secret patch and reload permission flash screen fix
This commit is contained in:
@@ -55,6 +55,9 @@ export const getSecretsRaw = async (req: Request, res: Response) => {
|
|||||||
secretPath = getFolderWithPathFromId(folder.nodes, folderId).folderPath;
|
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
|
let permissionCheckFn: (env: string, secPath: string) => boolean; // used to pass as callback function to import secret
|
||||||
if (req.user?._id) {
|
if (req.user?._id) {
|
||||||
const { permission } = await getUserProjectPermissions(req.user._id, workspaceId);
|
const { permission } = await getUserProjectPermissions(req.user._id, workspaceId);
|
||||||
|
|||||||
@@ -225,8 +225,8 @@ export const GetSecretsV2 = z.object({
|
|||||||
|
|
||||||
export const GetSecretsRawV3 = z.object({
|
export const GetSecretsRawV3 = z.object({
|
||||||
query: z.object({
|
query: z.object({
|
||||||
workspaceId: z.string().trim(),
|
workspaceId: z.string().trim().optional(),
|
||||||
environment: z.string().trim(),
|
environment: z.string().trim().optional(),
|
||||||
secretPath: z.string().trim().default("/"),
|
secretPath: z.string().trim().default("/"),
|
||||||
folderId: z.string().trim().optional(),
|
folderId: z.string().trim().optional(),
|
||||||
include_imports: z
|
include_imports: z
|
||||||
|
|||||||
@@ -16,14 +16,6 @@ export const ProjectPermissionProvider = ({ children }: Props): JSX.Element => {
|
|||||||
const workspaceId = currentWorkspace?._id || "";
|
const workspaceId = currentWorkspace?._id || "";
|
||||||
const { data: permission, isLoading } = useGetUserProjectPermissions({ workspaceId });
|
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) {
|
if ((isLoading && currentWorkspace) || isWsLoading) {
|
||||||
return (
|
return (
|
||||||
<div className="flex items-center justify-center w-screen h-screen bg-bunker-800">
|
<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 (
|
return (
|
||||||
<ProjectPermissionContext.Provider value={permission!}>
|
<ProjectPermissionContext.Provider value={permission!}>
|
||||||
{children}
|
{children}
|
||||||
|
|||||||
@@ -138,7 +138,6 @@ export const AppLayout = ({ children }: LayoutProps) => {
|
|||||||
|
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
|
||||||
|
|
||||||
const logout = useLogoutUser();
|
const logout = useLogoutUser();
|
||||||
const logOutUser = async () => {
|
const logOutUser = async () => {
|
||||||
try {
|
try {
|
||||||
@@ -488,7 +487,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
|
|||||||
</MenuItem>
|
</MenuItem>
|
||||||
</a>
|
</a>
|
||||||
</Link>
|
</Link>
|
||||||
<Link href={`/project/${currentWorkspace?._id}/audit-logs`} passHref>
|
{/* <Link href={`/project/${currentWorkspace?._id}/audit-logs`} passHref>
|
||||||
<a>
|
<a>
|
||||||
<MenuItem
|
<MenuItem
|
||||||
isSelected={
|
isSelected={
|
||||||
@@ -499,30 +498,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
|
|||||||
Audit Logs
|
Audit Logs
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
</a>
|
</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> */}
|
||||||
{/* <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>
|
<Link href={`/project/${currentWorkspace?._id}/settings`} passHref>
|
||||||
<a>
|
<a>
|
||||||
<MenuItem
|
<MenuItem
|
||||||
|
|||||||
-7
@@ -3,7 +3,6 @@ import { faElementor } from "@fortawesome/free-brands-svg-icons";
|
|||||||
import {
|
import {
|
||||||
faAnchorLock,
|
faAnchorLock,
|
||||||
faArrowLeft,
|
faArrowLeft,
|
||||||
faBook,
|
|
||||||
faCog,
|
faCog,
|
||||||
faKey,
|
faKey,
|
||||||
faLock,
|
faLock,
|
||||||
@@ -83,12 +82,6 @@ const SINGLE_PERMISSION_LIST = [
|
|||||||
icon: faTags,
|
icon: faTags,
|
||||||
formName: "tags"
|
formName: "tags"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
title: "Audit Logs",
|
|
||||||
subtitle: "Audit log management control",
|
|
||||||
icon: faBook,
|
|
||||||
formName: "audit-logs"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
title: "IP Allowlist",
|
title: "IP Allowlist",
|
||||||
subtitle: "IP allowlist management control",
|
subtitle: "IP allowlist management control",
|
||||||
|
|||||||
Reference in New Issue
Block a user