github/infisical
1
0
Fork 0
mirror of https://github.com/Infisical/infisical.git synced 2026-01-09 15:38:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4990 from Infisical/fix-additional-privilege-old-projects

Browse Source 
fix(additional-privileges): return correct project membership ID
This commit is contained in:
varonix
2025-12-08 03:25:01 -05:00
committed by GitHub
parent 1269e7c245 20570094be
commit a6631217f1
4 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/ee/routes/v2/identity-project-additional-privilege-router.ts
View File

@@ -84,7 +84,6 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
privilege: { privilege: {
...privilege, ...privilege,
identityId: req.body.identityId, identityId: req.body.identityId,
projectMembershipId: req.body.projectId,
projectId: req.body.projectId, projectId: req.body.projectId,
slug: privilege.name slug: privilege.name
} }
@@ -168,7 +167,6 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
privilege: { privilege: {
...privilege, ...privilege,
identityId: privilegeDoc.actorIdentityId as string, identityId: privilegeDoc.actorIdentityId as string,
projectMembershipId: privilegeDoc.projectId as string,
projectId: privilegeDoc.projectId as string, projectId: privilegeDoc.projectId as string,
slug: privilege.name slug: privilege.name
} }
@@ -222,7 +220,6 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
privilege: { privilege: {
...privilege, ...privilege,
identityId: privilegeDoc.actorIdentityId as string, identityId: privilegeDoc.actorIdentityId as string,
projectMembershipId: privilegeDoc.projectId as string,
projectId: privilegeDoc.projectId as string, projectId: privilegeDoc.projectId as string,
slug: privilege.name slug: privilege.name
} }
@@ -276,7 +273,6 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
privilege: { privilege: {
...privilege, ...privilege,
identityId: privilegeDoc.actorIdentityId as string, identityId: privilegeDoc.actorIdentityId as string,
projectMembershipId: privilegeDoc.projectId as string,
projectId: privilegeDoc.projectId as string, projectId: privilegeDoc.projectId as string,
slug: privilege.name slug: privilege.name
} }
@@ -339,7 +335,6 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
privilege: { privilege: {
...privilege, ...privilege,
identityId: req.query.identityId, identityId: req.query.identityId,
projectMembershipId: privilege.projectId as string,
projectId, projectId,
slug: privilege.name slug: privilege.name
} }
@@ -391,7 +386,6 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
privileges: privileges.map((privilege) => ({ privileges: privileges.map((privilege) => ({
...privilege, ...privilege,
identityId: req.query.identityId, identityId: req.query.identityId,
projectMembershipId: privilege.projectId as string,
projectId: req.query.projectId, projectId: req.query.projectId,
slug: privilege.name slug: privilege.name
})) }))

4
backend/src/server/routes/sanitizedSchema/identitiy-additional-privilege.ts
View File

@@ -2,6 +2,8 @@ import { IdentityProjectAdditionalPrivilegeSchema } from "@app/db/schemas";
import { UnpackedPermissionSchema } from "./permission"; import { UnpackedPermissionSchema } from "./permission";
export const SanitizedIdentityPrivilegeSchema = IdentityProjectAdditionalPrivilegeSchema.extend({ export const SanitizedIdentityPrivilegeSchema = IdentityProjectAdditionalPrivilegeSchema.omit({
projectMembershipId: true
}).extend({
permissions: UnpackedPermissionSchema.array() permissions: UnpackedPermissionSchema.array()
}); });

35
backend/src/services/additional-privilege/additional-privilege-service.ts
View File

@@ -79,7 +79,10 @@ export const additionalPrivilegeServiceFactory = ({
}); });
return { return {
additionalPrivilege: { ...additionalPrivilege, permissions: unpackPermissions(additionalPrivilege.permissions) } additionalPrivilege: {
...additionalPrivilege,
permissions: unpackPermissions(additionalPrivilege.permissions)
}
}; };
} }
@@ -103,7 +106,10 @@ export const additionalPrivilegeServiceFactory = ({
}); });
return { return {
additionalPrivilege: { ...additionalPrivilege, permissions: unpackPermissions(additionalPrivilege.permissions) } additionalPrivilege: {
...additionalPrivilege,
permissions: unpackPermissions(additionalPrivilege.permissions)
}
}; };
}; };
@@ -136,7 +142,10 @@ export const additionalPrivilegeServiceFactory = ({
}); });
return { return {
additionalPrivilege: { ...additionalPrivilege, permissions: unpackPermissions(additionalPrivilege.permissions) } additionalPrivilege: {
...additionalPrivilege,
permissions: unpackPermissions(additionalPrivilege.permissions)
}
}; };
} }
@@ -158,7 +167,10 @@ export const additionalPrivilegeServiceFactory = ({
}); });
return { return {
additionalPrivilege: { ...additionalPrivilege, permissions: unpackPermissions(additionalPrivilege.permissions) } additionalPrivilege: {
...additionalPrivilege,
permissions: unpackPermissions(additionalPrivilege.permissions)
}
}; };
}; };
@@ -179,7 +191,10 @@ export const additionalPrivilegeServiceFactory = ({
const additionalPrivilege = await additionalPrivilegeDAL.deleteById(existingPrivilege.id); const additionalPrivilege = await additionalPrivilegeDAL.deleteById(existingPrivilege.id);
return { return {
additionalPrivilege: { ...additionalPrivilege, permissions: unpackPermissions(additionalPrivilege.permissions) } additionalPrivilege: {
...additionalPrivilege,
permissions: unpackPermissions(additionalPrivilege.permissions)
}
}; };
}; };
@@ -199,7 +214,10 @@ export const additionalPrivilegeServiceFactory = ({
throw new NotFoundError({ message: `Additional privilege with id ${selector.id} doesn't exist` }); throw new NotFoundError({ message: `Additional privilege with id ${selector.id} doesn't exist` });
return { return {
additionalPrivilege: { ...additionalPrivilege, permissions: unpackPermissions(additionalPrivilege.permissions) } additionalPrivilege: {
...additionalPrivilege,
permissions: unpackPermissions(additionalPrivilege.permissions)
}
}; };
}; };
@@ -219,7 +237,10 @@ export const additionalPrivilegeServiceFactory = ({
throw new NotFoundError({ message: `Additional privilege with name ${selector.name} doesn't exist` }); throw new NotFoundError({ message: `Additional privilege with name ${selector.name} doesn't exist` });
return { return {
additionalPrivilege: { ...additionalPrivilege, permissions: unpackPermissions(additionalPrivilege.permissions) } additionalPrivilege: {
...additionalPrivilege,
permissions: unpackPermissions(additionalPrivilege.permissions)
}
}; };
}; };

1
frontend/src/hooks/api/identityProjectAdditionalPrivilege/types.tsx
View File

@@ -5,7 +5,6 @@ export enum IdentityProjectAdditionalPrivilegeTemporaryMode {
} }
export type TIdentityProjectPrivilege = { export type TIdentityProjectPrivilege = {
projectMembershipId: string;
slug: string; slug: string;
id: string; id: string;
createdAt: Date; createdAt: Date;