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
   );