From a6d1e24c038332212bb7b9208fbca20f5c25551d Mon Sep 17 00:00:00 2001 From: Piyush Gupta Date: Wed, 3 Dec 2025 17:55:09 +0530 Subject: [PATCH] chore: refactor membership check --- backend/src/services/auth/auth-login-service.ts | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/backend/src/services/auth/auth-login-service.ts b/backend/src/services/auth/auth-login-service.ts index 96fe5fff0..6082e382f 100644 --- a/backend/src/services/auth/auth-login-service.ts +++ b/backend/src/services/auth/auth-login-service.ts @@ -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 (