From 6f9a66a0d745d47be71b8d6f5ae260d08bb0e676 Mon Sep 17 00:00:00 2001 From: Sheen Capadngan Date: Fri, 21 Mar 2025 18:48:02 +0800 Subject: [PATCH] misc: finalized error message --- backend/src/ee/services/group/group-service.ts | 4 ++-- backend/src/ee/services/permission/permission-fns.ts | 4 +++- backend/src/services/group-project/group-project-service.ts | 4 ++-- .../src/services/identity-project/identity-project-service.ts | 4 ++-- backend/src/services/identity-ua/identity-ua-service.ts | 2 +- backend/src/services/identity/identity-service.ts | 2 +- backend/src/services/org/org-service.ts | 2 +- .../services/project-membership/project-membership-service.ts | 2 +- 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/backend/src/ee/services/group/group-service.ts b/backend/src/ee/services/group/group-service.ts index 68df7ca69..916e1eee1 100644 --- a/backend/src/ee/services/group/group-service.ts +++ b/backend/src/ee/services/group/group-service.ts @@ -100,7 +100,7 @@ export const groupServiceFactory = ({ throw new ForbiddenRequestError({ name: "PermissionBoundaryError", message: constructPermissionErrorMessage( - "Failed to create a more privileged group", + "Failed to create group", membership.shouldUseNewPrivilegeSystem, OrgPermissionGroupActions.ManagePrivileges, OrgPermissionSubjects.Groups @@ -185,7 +185,7 @@ export const groupServiceFactory = ({ throw new ForbiddenRequestError({ name: "PermissionBoundaryError", message: constructPermissionErrorMessage( - "Failed to update a more privileged group", + "Failed to update group", membership.shouldUseNewPrivilegeSystem, OrgPermissionGroupActions.ManagePrivileges, OrgPermissionSubjects.Groups diff --git a/backend/src/ee/services/permission/permission-fns.ts b/backend/src/ee/services/permission/permission-fns.ts index 753fff856..a9478d597 100644 --- a/backend/src/ee/services/permission/permission-fns.ts +++ b/backend/src/ee/services/permission/permission-fns.ts @@ -188,7 +188,9 @@ const constructPermissionErrorMessage = ( opSubject: OrgPermissionSet[1] | ProjectPermissionSet[1] ) => { return `${baseMessage}${ - shouldUseNewPrivilegeSystem ? `. Missing permission ${opAction as string} on ${opSubject as string}` : "" + shouldUseNewPrivilegeSystem + ? `. Missing permission ${opAction as string} on ${opSubject as string}` + : ". Privilege level is not high enough to perform this action" }`; }; diff --git a/backend/src/services/group-project/group-project-service.ts b/backend/src/services/group-project/group-project-service.ts index 3fface7e8..4849b2083 100644 --- a/backend/src/services/group-project/group-project-service.ts +++ b/backend/src/services/group-project/group-project-service.ts @@ -116,7 +116,7 @@ export const groupProjectServiceFactory = ({ throw new ForbiddenRequestError({ name: "PermissionBoundaryError", message: constructPermissionErrorMessage( - "Failed to assign group to a more privileged role", + "Failed to assign group to role", membership.shouldUseNewPrivilegeSystem, ProjectPermissionGroupActions.ManagePrivileges, ProjectPermissionSub.Groups @@ -294,7 +294,7 @@ export const groupProjectServiceFactory = ({ throw new ForbiddenRequestError({ name: "PermissionBoundaryError", message: constructPermissionErrorMessage( - "Failed to assign group to a more privileged role", + "Failed to assign group to role", membership.shouldUseNewPrivilegeSystem, ProjectPermissionGroupActions.ManagePrivileges, ProjectPermissionSub.Groups diff --git a/backend/src/services/identity-project/identity-project-service.ts b/backend/src/services/identity-project/identity-project-service.ts index 398444553..bba30d7bc 100644 --- a/backend/src/services/identity-project/identity-project-service.ts +++ b/backend/src/services/identity-project/identity-project-service.ts @@ -104,7 +104,7 @@ export const identityProjectServiceFactory = ({ throw new ForbiddenRequestError({ name: "PermissionBoundaryError", message: constructPermissionErrorMessage( - "Failed to assign to a more privileged role", + "Failed to assign to role", membership.shouldUseNewPrivilegeSystem, ProjectPermissionIdentityActions.ManagePrivileges, ProjectPermissionSub.Identity @@ -212,7 +212,7 @@ export const identityProjectServiceFactory = ({ throw new ForbiddenRequestError({ name: "PermissionBoundaryError", message: constructPermissionErrorMessage( - "Failed to change to a more privileged role", + "Failed to change role", membership.shouldUseNewPrivilegeSystem, ProjectPermissionIdentityActions.ManagePrivileges, ProjectPermissionSub.Identity diff --git a/backend/src/services/identity-ua/identity-ua-service.ts b/backend/src/services/identity-ua/identity-ua-service.ts index 43abdf131..117249580 100644 --- a/backend/src/services/identity-ua/identity-ua-service.ts +++ b/backend/src/services/identity-ua/identity-ua-service.ts @@ -446,7 +446,7 @@ export const identityUaServiceFactory = ({ throw new ForbiddenRequestError({ name: "PermissionBoundaryError", message: constructPermissionErrorMessage( - "Failed to create client secret for a more privileged identity.", + "Failed to create client secret for identity.", membership.shouldUseNewPrivilegeSystem, OrgPermissionIdentityActions.CreateToken, OrgPermissionSubjects.Identity diff --git a/backend/src/services/identity/identity-service.ts b/backend/src/services/identity/identity-service.ts index 763fbfa9c..d06572d04 100644 --- a/backend/src/services/identity/identity-service.ts +++ b/backend/src/services/identity/identity-service.ts @@ -78,7 +78,7 @@ export const identityServiceFactory = ({ throw new ForbiddenRequestError({ name: "PermissionBoundaryError", message: constructPermissionErrorMessage( - "Failed to create a more privileged identity", + "Failed to create identity", membership.shouldUseNewPrivilegeSystem, OrgPermissionIdentityActions.ManagePrivileges, OrgPermissionSubjects.Identity diff --git a/backend/src/services/org/org-service.ts b/backend/src/services/org/org-service.ts index e1592a654..eeb0e09ac 100644 --- a/backend/src/services/org/org-service.ts +++ b/backend/src/services/org/org-service.ts @@ -951,7 +951,7 @@ export const orgServiceFactory = ({ throw new ForbiddenRequestError({ name: "PermissionBoundaryError", message: constructPermissionErrorMessage( - "Failed to invite user to a more privileged role in the project", + "Failed to invite user to the project", membership.shouldUseNewPrivilegeSystem, ProjectPermissionMemberActions.ManagePrivileges, ProjectPermissionSub.Member diff --git a/backend/src/services/project-membership/project-membership-service.ts b/backend/src/services/project-membership/project-membership-service.ts index f45d9cc24..98c2b1d3b 100644 --- a/backend/src/services/project-membership/project-membership-service.ts +++ b/backend/src/services/project-membership/project-membership-service.ts @@ -288,7 +288,7 @@ export const projectMembershipServiceFactory = ({ throw new ForbiddenRequestError({ name: "PermissionBoundaryError", message: constructPermissionErrorMessage( - `Failed to change to a more privileged role ${requestedRoleChange}`, + `Failed to change role ${requestedRoleChange}`, membership.shouldUseNewPrivilegeSystem, ProjectPermissionMemberActions.ManagePrivileges, ProjectPermissionSub.Member