awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

update permission action name for org admin console

Browse Source
This commit is contained in:
Maidul Islam
2024-08-05 10:01:15 -04:00
parent 711a4179ce
commit e4a2137991
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/ee/services/permission/org-permission.ts
View File

@@ -10,7 +10,7 @@ export enum OrgPermissionActions {
}
export enum OrgPermissionAdminConsoleAction {
GrantAccessProjects = "grant-access-projects"
AccessAllProjects = "access-all-projects"
}
export enum OrgPermissionSubjects {
@@ -113,7 +113,7 @@ const buildAdminPermission = () => {
can(OrgPermissionActions.Edit, OrgPermissionSubjects.Kms);
can(OrgPermissionActions.Delete, OrgPermissionSubjects.Kms);
can(OrgPermissionAdminConsoleAction.GrantAccessProjects, OrgPermissionSubjects.AdminConsole);
can(OrgPermissionAdminConsoleAction.AccessAllProjects, OrgPermissionSubjects.AdminConsole);
return build({ conditionsMatcher });
};

4
backend/src/services/org-admin/org-admin-service.ts
View File

@@ -53,7 +53,7 @@ export const orgAdminServiceFactory = ({
actorOrgId
);
ForbiddenError.from(permission).throwUnlessCan(
OrgPermissionAdminConsoleAction.GrantAccessProjects,
OrgPermissionAdminConsoleAction.AccessAllProjects,
OrgPermissionSubjects.AdminConsole
);
const projects = await projectDAL.find(
@@ -85,7 +85,7 @@ export const orgAdminServiceFactory = ({
actorOrgId
);
ForbiddenError.from(permission).throwUnlessCan(
OrgPermissionAdminConsoleAction.GrantAccessProjects,
OrgPermissionAdminConsoleAction.AccessAllProjects,
OrgPermissionSubjects.AdminConsole
);

2
frontend/src/context/OrgPermissionContext/types.ts
View File

@@ -25,7 +25,7 @@ export enum OrgPermissionSubjects {
}
export enum OrgPermissionAdminConsoleAction {
GrantAccessProjects = "grant-access-projects"
AccessAllProjects = "access-all-projects"
}
export type OrgPermissionSet =

2
frontend/src/views/Org/RolePage/components/OrgRoleModifySection.utils.ts
View File

@@ -14,7 +14,7 @@ const generalPermissionSchema = z
const adminConsolePermissionSchmea = z
.object({
"grant-access-projects": z.boolean().optional()
"access-all-projects": z.boolean().optional()
})
.optional();

8
frontend/src/views/Org/RolePage/components/RolePermissionsSection/OrgPermissionAdminConsoleRow.tsx
View File

@@ -20,7 +20,7 @@ enum Permission {
}
const PERMISSION_ACTIONS = [
{ action: "grant-access-projects", label: "Grant access projects" }
{ action: "access-all-projects", label: "Access all organization projects" }
] as const;
export const OrgPermissionAdminConsoleRow = ({ isEditable, control, setValue }: Props) => {
@@ -33,7 +33,7 @@ export const OrgPermissionAdminConsoleRow = ({ isEditable, control, setValue }:
});
const selectedPermissionCategory = useMemo(() => {
if (rule?.["grant-access-projects"]) {
if (rule?.["access-all-projects"]) {
return Permission.Custom;
}
return Permission.NoAccess;
@@ -63,7 +63,7 @@ export const OrgPermissionAdminConsoleRow = ({ isEditable, control, setValue }:
if (val === Permission.NoAccess) {
setValue(
"permissions.admin-console",
{ "grant-access-projects": false },
{ "access-all-projects": false },
{ shouldDirty: true }
);
}
@@ -78,7 +78,7 @@ export const OrgPermissionAdminConsoleRow = ({ isEditable, control, setValue }:
<Td>
<FontAwesomeIcon icon={isRowExpanded ? faChevronDown : faChevronRight} />
</Td>
<Td>Admin Console</Td>
<Td>Organization Admin Console</Td>
<Td>
<Select
value={selectedPermissionCategory}

2
frontend/src/views/OrgAdminPage/components/OrgAdminProjects/OrgAdminProjects.tsx
View File

@@ -161,7 +161,7 @@ export const OrgAdminProjects = withPermission(
);
},
{
action: OrgPermissionAdminConsoleAction.GrantAccessProjects,
action: OrgPermissionAdminConsoleAction.AccessAllProjects,
subject: OrgPermissionSubjects.AdminConsole
}
);