awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-08 02:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(rbac): resolved viewer permission in list

Browse Source
This commit is contained in:
Akhil Mohan
2023-09-08 21:22:36 +05:30
parent 4ca95f4d79
commit 252042fb20
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/controllers/v1/roleController.ts
+2 -2
View File
@@ -193,7 +193,7 @@ export const getUserPermissions = async (req: Request, res: Response) => {
const { const {
params: { orgId } params: { orgId }
} = await validateRequest(GetUserPermission, req); } = await validateRequest(GetUserPermission, req);
const { permission } = await getUserOrgPermissions(req.user.id, orgId); const { permission } = await getUserOrgPermissions(req.user._id, orgId);
res.status(200).json({ res.status(200).json({
data: { data: {
@@ -206,7 +206,7 @@ export const getUserWorkspacePermissions = async (req: Request, res: Response) =
const { const {
params: { workspaceId } params: { workspaceId }
} = await validateRequest(GetUserProjectPermission, req); } = await validateRequest(GetUserProjectPermission, req);
const { permission } = await getUserProjectPermissions(req.user.id, workspaceId); const { permission } = await getUserProjectPermissions(req.user._id, workspaceId);
res.status(200).json({ res.status(200).json({
data: { data: {
backend/src/services/ProjectRoleService.ts
+1 -1
View File
@@ -225,7 +225,7 @@ export const getUserProjectPermissions = async (userId: string, workspaceId: str
if (membership.role === "admin") return { permission: adminProjectPermissions, membership }; if (membership.role === "admin") return { permission: adminProjectPermissions, membership };
if (membership.role === "member") return { permission: memberProjectPermissions, membership }; if (membership.role === "member") return { permission: memberProjectPermissions, membership };
if (membership.role === "viewer") return { permission: memberProjectPermissions, membership }; if (membership.role === "viewer") return { permission: viewerProjectPermission, membership };
if (membership.role === "custom") { if (membership.role === "custom") {
const permission = createMongoAbility<ProjectPermissionSet>(membership.customRole.permissions); const permission = createMongoAbility<ProjectPermissionSet>(membership.customRole.permissions);
frontend/src/views/Project/MembersPage/components/ProjectRoleListTab/components/ProjectRoleList/ProjectRoleList.tsx
+1 -1
View File
@@ -102,7 +102,7 @@ export const ProjectRoleList = ({ isRolesLoading, roles = [], onSelectRole }: Pr
{isRolesLoading && <TableSkeleton columns={4} innerKey="org-roles" />} {isRolesLoading && <TableSkeleton columns={4} innerKey="org-roles" />}
{roles?.map((role) => { {roles?.map((role) => {
const { _id: id, name, createdAt, slug } = role; const { _id: id, name, createdAt, slug } = role;
const isNonMutatable = ["owner", "admin", "member"].includes(slug); const isNonMutatable = ["admin", "member", "viewer"].includes(slug);
return ( return (
<Tr key={`role-list-${id}`}> <Tr key={`role-list-${id}`}>
frontend/src/views/Project/MembersPage/components/ProjectRoleListTab/components/ProjectRoleModifySection/ProjectRoleModifySection.tsx
+1 -1
View File
@@ -108,7 +108,7 @@ type Props = {
export const ProjectRoleModifySection = ({ role, onGoBack }: Props) => { export const ProjectRoleModifySection = ({ role, onGoBack }: Props) => {
const [searchPermission, setSearchPermission] = useState(""); const [searchPermission, setSearchPermission] = useState("");
const isNonEditable = ["owner", "admin", "member"].includes(role?.slug || ""); const isNonEditable = ["admin", "member", "viewer"].includes(role?.slug || "");
const isNewRole = !role?.slug; const isNewRole = !role?.slug;
const { createNotification } = useNotificationContext(); const { createNotification } = useNotificationContext();