awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: refactor membership check

Browse Source
This commit is contained in:
Piyush Gupta
2025-12-03 17:55:09 +05:30
parent f92cd95125
commit a6d1e24c03
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
backend/src/services/auth/auth-login-service.ts
View File

@@ -557,7 +557,7 @@ export const authLoginServiceFactory = ({
const isSubOrganization = Boolean(selectedOrg.rootOrgId && selectedOrg.id !== selectedOrg.rootOrgId);
let membershipRole;
const membershipRole = (await membershipRoleDAL.findOne({ membershipId: orgMembership.id })).role;
if (isSubOrganization) {
if (!selectedOrg.rootOrgId) {
@@ -579,19 +579,6 @@ export const authLoginServiceFactory = ({
message: "User does not have access to the root organization"
});
}
membershipRole = (await membershipRoleDAL.findOne({ membershipId: orgMembership.id })).role;
} else {
// For root organizations, check membership using the existing method
const userOrgs = await orgDAL.findAllOrgsByUserId(user.id);
const selectedOrgMembership = userOrgs.find((org) => org.id === organizationId && org.userStatus !== "invited");
if (!selectedOrgMembership) {
throw new ForbiddenRequestError({
message: `User does not have access to the organization named ${selectedOrg.name}`
});
}
membershipRole = selectedOrgMembership.userRole;
}
if (