awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-06 22:27:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix populate service in getAuthDataProjectPermissions

Browse Source
This commit is contained in:
Tuan Dang
2023-11-24 20:10:50 +07:00
parent 0c0139ac8f
commit 29016fbb23
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/ee/services/ProjectRoleService.ts
+6 -6
View File
@@ -290,27 +290,27 @@ export const getAuthDataProjectPermissions = async ({
break; break;
} }
case ActorType.SERVICE_V3: { case ActorType.SERVICE_V3: {
const serviceMembership = await MachineMembership.findOne({ const machineMembership = await MachineMembership.findOne({
machineIdentity: authData.authPayload._id, machineIdentity: authData.authPayload._id,
workspace: workspaceId workspace: workspaceId
}) })
.populate<{ .populate<{
customRole: IRole & { permissions: RawRuleOf<MongoAbility<ProjectPermissionSet>>[] }; customRole: IRole & { permissions: RawRuleOf<MongoAbility<ProjectPermissionSet>>[] };
machineIdentity: IMachineIdentity machineIdentity: IMachineIdentity
}>("customRole service") }>("customRole machineIdentity")
.exec(); .exec();
if (!serviceMembership || (serviceMembership.role === "custom" && !serviceMembership.customRole)) { if (!machineMembership || (machineMembership.role === "custom" && !machineMembership.customRole)) {
throw UnauthorizedRequestError(); throw UnauthorizedRequestError();
} }
checkIPAgainstBlocklist({ checkIPAgainstBlocklist({
ipAddress: authData.ipAddress, ipAddress: authData.ipAddress,
trustedIps: serviceMembership.machineIdentity.trustedIps trustedIps: machineMembership.machineIdentity.trustedIps
}); });
role = serviceMembership.role; role = machineMembership.role;
customRole = serviceMembership.customRole; customRole = machineMembership.customRole;
break; break;
} }
default: default: