feat(rbac): changed the action names for org

backend/src/controllers/v1/membershipOrgController.ts

@@ -19,7 +19,7 @@ import {
 import { validateUserEmail } from "../../validation";
 import { validateRequest } from "../../helpers/validation";
 import {
-  GeneralPermissionActions,
+  OrgPermissionActions,
   OrgPermissionSubjects,
   getUserOrgPermissions
 } from "../../services/RoleService";
@@ -50,7 +50,7 @@ export const deleteMembershipOrg = async (req: Request, _res: Response) => {
     membershipOrgToDelete.organization.toString()
   );
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Delete,
+    OrgPermissionActions.Delete,
     OrgPermissionSubjects.Member
   );
 
@@ -98,7 +98,7 @@ export const inviteUserToOrganization = async (req: Request, res: Response) => {
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Create,
+    OrgPermissionActions.Create,
     OrgPermissionSubjects.Member
   );
 

backend/src/controllers/v1/organizationController.ts

@@ -14,9 +14,8 @@ import { licenseServerKeyRequest } from "../../config/request";
 import { validateRequest } from "../../helpers/validation";
 import * as reqValidator from "../../validation/organization";
 import {
-  GeneralPermissionActions,
+  OrgPermissionActions,
   OrgPermissionSubjects,
-  WorkspacePermissionActions,
   getUserOrgPermissions
 } from "../../services/RoleService";
 import { OrganizationNotFoundError } from "../../utils/errors";
@@ -104,7 +103,7 @@ export const getOrganizationMembers = async (req: Request, res: Response) => {
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Read,
+    OrgPermissionActions.Read,
     OrgPermissionSubjects.Member
   );
 
@@ -130,7 +129,7 @@ export const getOrganizationWorkspaces = async (req: Request, res: Response) =>
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    WorkspacePermissionActions.Read,
+    OrgPermissionActions.Read,
     OrgPermissionSubjects.Workspace
   );
 
@@ -172,7 +171,7 @@ export const changeOrganizationName = async (req: Request, res: Response) => {
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Edit,
+    OrgPermissionActions.Edit,
     OrgPermissionSubjects.Settings
   );
 
@@ -207,7 +206,7 @@ export const getOrganizationIncidentContacts = async (req: Request, res: Respons
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Read,
+    OrgPermissionActions.Read,
     OrgPermissionSubjects.IncidentAccount
   );
 
@@ -234,7 +233,7 @@ export const addOrganizationIncidentContact = async (req: Request, res: Response
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Create,
+    OrgPermissionActions.Create,
     OrgPermissionSubjects.IncidentAccount
   );
 
@@ -263,7 +262,7 @@ export const deleteOrganizationIncidentContact = async (req: Request, res: Respo
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Delete,
+    OrgPermissionActions.Delete,
     OrgPermissionSubjects.IncidentAccount
   );
 
@@ -292,7 +291,7 @@ export const createOrganizationPortalSession = async (req: Request, res: Respons
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Edit,
+    OrgPermissionActions.Edit,
     OrgPermissionSubjects.Billing
   );
 
@@ -356,11 +355,11 @@ export const getOrganizationMembersAndTheirWorkspaces = async (req: Request, res
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Read,
+    OrgPermissionActions.Read,
     OrgPermissionSubjects.Member
   );
   ForbiddenError.from(permission).throwUnlessCan(
-    WorkspacePermissionActions.Read,
+    OrgPermissionActions.Read,
     OrgPermissionSubjects.Workspace
   );
 

backend/src/controllers/v1/roleController.ts

@@ -2,7 +2,7 @@ import { Request, Response } from "express";
 import { BadRequestError } from "../../utils/errors";
 import Role from "../../models/role";
 import {
-  GeneralPermissionActions,
+  OrgPermissionActions,
   OrgPermissionSubjects,
   adminPermissions,
   getUserOrgPermissions,
@@ -30,7 +30,7 @@ export const createRole = async (req: Request, res: Response) => {
   } = await validateRequest(CreateRoleSchema, req);
 
   const { permission } = await getUserOrgPermissions(req.user.id, orgId);
-  if (permission.cannot(GeneralPermissionActions.Create, OrgPermissionSubjects.Role)) {
+  if (permission.cannot(OrgPermissionActions.Create, OrgPermissionSubjects.Role)) {
     throw BadRequestError({ message: "User doesn't have the permission." });
   }
 
@@ -68,7 +68,7 @@ export const updateRole = async (req: Request, res: Response) => {
   const isOrgRole = !workspaceId; // if workspaceid is provided then its a workspace rule
 
   const { permission } = await getUserOrgPermissions(req.user.id, orgId);
-  if (permission.cannot(GeneralPermissionActions.Edit, OrgPermissionSubjects.Role)) {
+  if (permission.cannot(OrgPermissionActions.Edit, OrgPermissionSubjects.Role)) {
     throw BadRequestError({ message: "User doesn't have the permission." });
   }
 
@@ -112,7 +112,7 @@ export const deleteRole = async (req: Request, res: Response) => {
   }
 
   const { permission } = await getUserOrgPermissions(req.user.id, role.organization.toString());
-  if (permission.cannot(GeneralPermissionActions.Delete, OrgPermissionSubjects.Role)) {
+  if (permission.cannot(OrgPermissionActions.Delete, OrgPermissionSubjects.Role)) {
     throw BadRequestError({ message: "User doesn't have the permission." });
   }
   await Role.findByIdAndDelete(role.id);
@@ -132,7 +132,7 @@ export const getRoles = async (req: Request, res: Response) => {
   const isOrgRole = !workspaceId;
 
   const { permission } = await getUserOrgPermissions(req.user.id, orgId);
-  if (permission.cannot(GeneralPermissionActions.Read, OrgPermissionSubjects.Role)) {
+  if (permission.cannot(OrgPermissionActions.Read, OrgPermissionSubjects.Role)) {
     throw BadRequestError({ message: "User doesn't have the permission." });
   }
 

backend/src/controllers/v1/secretScanningController.ts

@@ -12,7 +12,7 @@ import { Organization } from "../../models";
 import { validateRequest } from "../../helpers/validation";
 import * as reqValidator from "../../validation/secretScanning";
 import {
-  GeneralPermissionActions,
+  OrgPermissionActions,
   OrgPermissionSubjects,
   getUserOrgPermissions
 } from "../../services/RoleService";
@@ -33,7 +33,7 @@ export const createInstallationSession = async (req: Request, res: Response) =>
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Create,
+    OrgPermissionActions.Create,
     OrgPermissionSubjects.SecretScanning
   );
 
@@ -69,7 +69,7 @@ export const linkInstallationToOrganization = async (req: Request, res: Response
     installationSession.organization.toString()
   );
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Edit,
+    OrgPermissionActions.Edit,
     OrgPermissionSubjects.SecretScanning
   );
 
@@ -131,7 +131,7 @@ export const getRisksForOrganization = async (req: Request, res: Response) => {
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Read,
+    OrgPermissionActions.Read,
     OrgPermissionSubjects.SecretScanning
   );
 
@@ -151,7 +151,7 @@ export const updateRisksStatus = async (req: Request, res: Response) => {
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Edit,
+    OrgPermissionActions.Edit,
     OrgPermissionSubjects.SecretScanning
   );
 

backend/src/controllers/v1/workspaceController.ts

@@ -15,8 +15,8 @@ import { addMemberships } from "../../helpers/membership";
 import { ADMIN } from "../../variables";
 import { OrganizationNotFoundError } from "../../utils/errors";
 import {
+  OrgPermissionActions,
   OrgPermissionSubjects,
-  WorkspacePermissionActions,
   getUserOrgPermissions
 } from "../../services/RoleService";
 import { ForbiddenError } from "@casl/ability";
@@ -146,7 +146,7 @@ export const createWorkspace = async (req: Request, res: Response) => {
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    WorkspacePermissionActions.Create,
+    OrgPermissionActions.Create,
     OrgPermissionSubjects.Workspace
   );
 

backend/src/controllers/v2/organizationsController.ts

@@ -9,9 +9,8 @@ import { CUSTOM } from "../../variables";
 import * as reqValidator from "../../validation/organization";
 import { validateRequest } from "../../helpers/validation";
 import {
-  GeneralPermissionActions,
+  OrgPermissionActions,
   OrgPermissionSubjects,
-  WorkspacePermissionActions,
   getUserOrgPermissions
 } from "../../services/RoleService";
 import { ForbiddenError } from "@casl/ability";
@@ -61,7 +60,7 @@ export const getOrganizationMemberships = async (req: Request, res: Response) =>
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Read,
+    OrgPermissionActions.Read,
     OrgPermissionSubjects.Member
   );
 
@@ -139,7 +138,7 @@ export const updateOrganizationMembership = async (req: Request, res: Response)
   } = await validateRequest(reqValidator.UpdateOrgMemberv2, req);
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Edit,
+    OrgPermissionActions.Edit,
     OrgPermissionSubjects.Member
   );
 
@@ -220,7 +219,7 @@ export const deleteOrganizationMembership = async (req: Request, res: Response)
   } = await validateRequest(reqValidator.DeleteOrgMemberv2, req);
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Delete,
+    OrgPermissionActions.Delete,
     OrgPermissionSubjects.Member
   );
 
@@ -284,7 +283,7 @@ export const getOrganizationWorkspaces = async (req: Request, res: Response) =>
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    WorkspacePermissionActions.Read,
+    OrgPermissionActions.Read,
     OrgPermissionSubjects.Workspace
   );
 

backend/src/ee/controllers/v1/organizationsController.ts

@@ -6,7 +6,7 @@ import { EELicenseService } from "../../services";
 import { validateRequest } from "../../../helpers/validation";
 import * as reqValidator from "../../../validation/organization";
 import {
-  GeneralPermissionActions,
+  OrgPermissionActions,
   OrgPermissionSubjects,
   getUserOrgPermissions
 } from "../../../services/RoleService";
@@ -22,7 +22,7 @@ export const getOrganizationPlansTable = async (req: Request, res: Response) =>
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Read,
+    OrgPermissionActions.Read,
     OrgPermissionSubjects.Billing
   );
 
@@ -44,7 +44,7 @@ export const getOrganizationPlan = async (req: Request, res: Response) => {
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Read,
+    OrgPermissionActions.Read,
     OrgPermissionSubjects.Billing
   );
 
@@ -72,11 +72,11 @@ export const startOrganizationTrial = async (req: Request, res: Response) => {
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Create,
+    OrgPermissionActions.Create,
     OrgPermissionSubjects.Billing
   );
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Edit,
+    OrgPermissionActions.Edit,
     OrgPermissionSubjects.Billing
   );
 
@@ -118,7 +118,7 @@ export const getOrganizationPlanBillingInfo = async (req: Request, res: Response
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Read,
+    OrgPermissionActions.Read,
     OrgPermissionSubjects.Billing
   );
 
@@ -151,7 +151,7 @@ export const getOrganizationPlanTable = async (req: Request, res: Response) => {
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Read,
+    OrgPermissionActions.Read,
     OrgPermissionSubjects.Billing
   );
 
@@ -178,7 +178,7 @@ export const getOrganizationBillingDetails = async (req: Request, res: Response)
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Read,
+    OrgPermissionActions.Read,
     OrgPermissionSubjects.Billing
   );
 
@@ -206,7 +206,7 @@ export const updateOrganizationBillingDetails = async (req: Request, res: Respon
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Edit,
+    OrgPermissionActions.Edit,
     OrgPermissionSubjects.Billing
   );
 
@@ -240,7 +240,7 @@ export const getOrganizationPmtMethods = async (req: Request, res: Response) =>
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Read,
+    OrgPermissionActions.Read,
     OrgPermissionSubjects.Billing
   );
 
@@ -273,7 +273,7 @@ export const addOrganizationPmtMethod = async (req: Request, res: Response) => {
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Create,
+    OrgPermissionActions.Create,
     OrgPermissionSubjects.Billing
   );
 
@@ -314,7 +314,7 @@ export const deleteOrganizationPmtMethod = async (req: Request, res: Response) =
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Delete,
+    OrgPermissionActions.Delete,
     OrgPermissionSubjects.Billing
   );
 
@@ -344,7 +344,7 @@ export const getOrganizationTaxIds = async (req: Request, res: Response) => {
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Read,
+    OrgPermissionActions.Read,
     OrgPermissionSubjects.Billing
   );
 
@@ -377,7 +377,7 @@ export const addOrganizationTaxId = async (req: Request, res: Response) => {
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Create,
+    OrgPermissionActions.Create,
     OrgPermissionSubjects.Billing
   );
 
@@ -414,7 +414,7 @@ export const deleteOrganizationTaxId = async (req: Request, res: Response) => {
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Delete,
+    OrgPermissionActions.Delete,
     OrgPermissionSubjects.Billing
   );
 
@@ -447,7 +447,7 @@ export const getOrganizationInvoices = async (req: Request, res: Response) => {
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Read,
+    OrgPermissionActions.Read,
     OrgPermissionSubjects.Billing
   );
 
@@ -482,7 +482,7 @@ export const getOrganizationLicenses = async (req: Request, res: Response) => {
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Read,
+    OrgPermissionActions.Read,
     OrgPermissionSubjects.Billing
   );
 

backend/src/ee/controllers/v1/ssoController.ts

@@ -11,7 +11,7 @@ import { EELicenseService } from "../../services";
 import * as reqValidator from "../../../validation/sso";
 import { validateRequest } from "../../../helpers/validation";
 import {
-  GeneralPermissionActions,
+  OrgPermissionActions,
   OrgPermissionSubjects,
   getUserOrgPermissions
 } from "../../../services/RoleService";
@@ -49,7 +49,7 @@ export const getSSOConfig = async (req: Request, res: Response) => {
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Read,
+    OrgPermissionActions.Read,
     OrgPermissionSubjects.Sso
   );
 
@@ -73,7 +73,7 @@ export const updateSSOConfig = async (req: Request, res: Response) => {
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Edit,
+    OrgPermissionActions.Edit,
     OrgPermissionSubjects.Sso
   );
 
@@ -208,7 +208,7 @@ export const createSSOConfig = async (req: Request, res: Response) => {
 
   const { permission } = await getUserOrgPermissions(req.user._id, organizationId);
   ForbiddenError.from(permission).throwUnlessCan(
-    GeneralPermissionActions.Create,
+    OrgPermissionActions.Create,
     OrgPermissionSubjects.Sso
   );
 

backend/src/services/RoleService.ts

@@ -4,18 +4,13 @@ import { IRole } from "../models/role";
 import { BadRequestError, UnauthorizedRequestError } from "../utils/errors";
 import { ACCEPTED } from "../variables";
 
-export enum GeneralPermissionActions {
+export enum OrgPermissionActions {
   Read = "read",
   Create = "create",
   Edit = "edit",
   Delete = "delete"
 }
 
-export enum WorkspacePermissionActions {
-  Read = "read",
-  Create = "create"
-}
-
 export enum OrgPermissionSubjects {
   Workspace = "workspace",
   Role = "role",
@@ -28,55 +23,56 @@ export enum OrgPermissionSubjects {
 }
 
 export type OrgPermissionSet =
-  | [WorkspacePermissionActions, OrgPermissionSubjects.Workspace]
-  | [GeneralPermissionActions, OrgPermissionSubjects.Role]
-  | [GeneralPermissionActions, OrgPermissionSubjects.Member]
-  | [GeneralPermissionActions, OrgPermissionSubjects.Settings]
-  | [GeneralPermissionActions, OrgPermissionSubjects.IncidentAccount]
-  | [GeneralPermissionActions, OrgPermissionSubjects.Sso]
-  | [GeneralPermissionActions, OrgPermissionSubjects.SecretScanning]
-  | [GeneralPermissionActions, OrgPermissionSubjects.Billing];
+  | [OrgPermissionActions.Read, OrgPermissionSubjects.Workspace]
+  | [OrgPermissionActions.Create, OrgPermissionSubjects.Workspace]
+  | [OrgPermissionActions, OrgPermissionSubjects.Role]
+  | [OrgPermissionActions, OrgPermissionSubjects.Member]
+  | [OrgPermissionActions, OrgPermissionSubjects.Settings]
+  | [OrgPermissionActions, OrgPermissionSubjects.IncidentAccount]
+  | [OrgPermissionActions, OrgPermissionSubjects.Sso]
+  | [OrgPermissionActions, OrgPermissionSubjects.SecretScanning]
+  | [OrgPermissionActions, OrgPermissionSubjects.Billing];
 
 const buildAdminPermission = () => {
   const { can, build } = new AbilityBuilder<MongoAbility<OrgPermissionSet>>(createMongoAbility);
   // ws permissions
-  can(WorkspacePermissionActions.Read, OrgPermissionSubjects.Workspace);
-  can(WorkspacePermissionActions.Create, OrgPermissionSubjects.Workspace);
+  can(OrgPermissionActions.Read, OrgPermissionSubjects.Workspace);
+  can(OrgPermissionActions.Create, OrgPermissionSubjects.Workspace);
   // role permission
-  can(GeneralPermissionActions.Read, OrgPermissionSubjects.Role);
-  can(GeneralPermissionActions.Create, OrgPermissionSubjects.Role);
-  can(GeneralPermissionActions.Edit, OrgPermissionSubjects.Role);
-  can(GeneralPermissionActions.Delete, OrgPermissionSubjects.Role);
+  can(OrgPermissionActions.Read, OrgPermissionSubjects.Role);
+  can(OrgPermissionActions.Create, OrgPermissionSubjects.Role);
+  can(OrgPermissionActions.Edit, OrgPermissionSubjects.Role);
+  can(OrgPermissionActions.Delete, OrgPermissionSubjects.Role);
 
-  can(GeneralPermissionActions.Read, OrgPermissionSubjects.Member);
-  can(GeneralPermissionActions.Create, OrgPermissionSubjects.Member);
-  can(GeneralPermissionActions.Edit, OrgPermissionSubjects.Member);
-  can(GeneralPermissionActions.Delete, OrgPermissionSubjects.Member);
+  can(OrgPermissionActions.Read, OrgPermissionSubjects.Member);
+  can(OrgPermissionActions.Create, OrgPermissionSubjects.Member);
+  can(OrgPermissionActions.Edit, OrgPermissionSubjects.Member);
+  can(OrgPermissionActions.Delete, OrgPermissionSubjects.Member);
 
-  can(GeneralPermissionActions.Read, OrgPermissionSubjects.SecretScanning);
-  can(GeneralPermissionActions.Create, OrgPermissionSubjects.SecretScanning);
-  can(GeneralPermissionActions.Edit, OrgPermissionSubjects.SecretScanning);
-  can(GeneralPermissionActions.Delete, OrgPermissionSubjects.SecretScanning);
+  can(OrgPermissionActions.Read, OrgPermissionSubjects.SecretScanning);
+  can(OrgPermissionActions.Create, OrgPermissionSubjects.SecretScanning);
+  can(OrgPermissionActions.Edit, OrgPermissionSubjects.SecretScanning);
+  can(OrgPermissionActions.Delete, OrgPermissionSubjects.SecretScanning);
 
-  can(GeneralPermissionActions.Read, OrgPermissionSubjects.Settings);
-  can(GeneralPermissionActions.Create, OrgPermissionSubjects.Settings);
-  can(GeneralPermissionActions.Edit, OrgPermissionSubjects.Settings);
-  can(GeneralPermissionActions.Delete, OrgPermissionSubjects.Settings);
+  can(OrgPermissionActions.Read, OrgPermissionSubjects.Settings);
+  can(OrgPermissionActions.Create, OrgPermissionSubjects.Settings);
+  can(OrgPermissionActions.Edit, OrgPermissionSubjects.Settings);
+  can(OrgPermissionActions.Delete, OrgPermissionSubjects.Settings);
 
-  can(GeneralPermissionActions.Read, OrgPermissionSubjects.IncidentAccount);
-  can(GeneralPermissionActions.Create, OrgPermissionSubjects.IncidentAccount);
-  can(GeneralPermissionActions.Edit, OrgPermissionSubjects.IncidentAccount);
-  can(GeneralPermissionActions.Delete, OrgPermissionSubjects.IncidentAccount);
+  can(OrgPermissionActions.Read, OrgPermissionSubjects.IncidentAccount);
+  can(OrgPermissionActions.Create, OrgPermissionSubjects.IncidentAccount);
+  can(OrgPermissionActions.Edit, OrgPermissionSubjects.IncidentAccount);
+  can(OrgPermissionActions.Delete, OrgPermissionSubjects.IncidentAccount);
 
-  can(GeneralPermissionActions.Read, OrgPermissionSubjects.Sso);
-  can(GeneralPermissionActions.Create, OrgPermissionSubjects.Sso);
-  can(GeneralPermissionActions.Edit, OrgPermissionSubjects.Sso);
-  can(GeneralPermissionActions.Delete, OrgPermissionSubjects.Sso);
+  can(OrgPermissionActions.Read, OrgPermissionSubjects.Sso);
+  can(OrgPermissionActions.Create, OrgPermissionSubjects.Sso);
+  can(OrgPermissionActions.Edit, OrgPermissionSubjects.Sso);
+  can(OrgPermissionActions.Delete, OrgPermissionSubjects.Sso);
 
-  can(GeneralPermissionActions.Read, OrgPermissionSubjects.Billing);
-  can(GeneralPermissionActions.Create, OrgPermissionSubjects.Billing);
-  can(GeneralPermissionActions.Edit, OrgPermissionSubjects.Billing);
-  can(GeneralPermissionActions.Delete, OrgPermissionSubjects.Billing);
+  can(OrgPermissionActions.Read, OrgPermissionSubjects.Billing);
+  can(OrgPermissionActions.Create, OrgPermissionSubjects.Billing);
+  can(OrgPermissionActions.Edit, OrgPermissionSubjects.Billing);
+  can(OrgPermissionActions.Delete, OrgPermissionSubjects.Billing);
 
   return build();
 };
@@ -86,15 +82,15 @@ export const adminPermissions = buildAdminPermission();
 const buildMemberPermission = () => {
   const { can, build } = new AbilityBuilder<MongoAbility<OrgPermissionSet>>(createMongoAbility);
 
-  can(WorkspacePermissionActions.Read, OrgPermissionSubjects.Workspace);
-  can(WorkspacePermissionActions.Create, OrgPermissionSubjects.Workspace);
-  can(GeneralPermissionActions.Read, OrgPermissionSubjects.Member);
-  can(GeneralPermissionActions.Read, OrgPermissionSubjects.Role);
-  can(GeneralPermissionActions.Read, OrgPermissionSubjects.Settings);
-  can(GeneralPermissionActions.Read, OrgPermissionSubjects.Billing);
-  can(GeneralPermissionActions.Read, OrgPermissionSubjects.Sso);
-  can(GeneralPermissionActions.Read, OrgPermissionSubjects.IncidentAccount);
-  can(GeneralPermissionActions.Read, OrgPermissionSubjects.SecretScanning);
+  can(OrgPermissionActions.Read, OrgPermissionSubjects.Workspace);
+  can(OrgPermissionActions.Create, OrgPermissionSubjects.Workspace);
+  can(OrgPermissionActions.Read, OrgPermissionSubjects.Member);
+  can(OrgPermissionActions.Read, OrgPermissionSubjects.Role);
+  can(OrgPermissionActions.Read, OrgPermissionSubjects.Settings);
+  can(OrgPermissionActions.Read, OrgPermissionSubjects.Billing);
+  can(OrgPermissionActions.Read, OrgPermissionSubjects.Sso);
+  can(OrgPermissionActions.Read, OrgPermissionSubjects.IncidentAccount);
+  can(OrgPermissionActions.Read, OrgPermissionSubjects.SecretScanning);
 
   return build();
 };