diff --git a/backend/src/services/org/org-service.ts b/backend/src/services/org/org-service.ts index de518c829..aa28a1dfc 100644 --- a/backend/src/services/org/org-service.ts +++ b/backend/src/services/org/org-service.ts @@ -1274,6 +1274,8 @@ export const orgServiceFactory = ({ message: "No pending invitation found" }); + const organization = await orgDAL.findById(orgId); + await tokenService.validateTokenForUser({ type: TokenType.TOKEN_EMAIL_ORG_INVITATION, userId: user.id, @@ -1296,6 +1298,13 @@ export const orgServiceFactory = ({ return { user }; } + if ( + organization.authEnforced && + !(organization.bypassOrgAuthEnabled && orgMembership.role === OrgMembershipRole.Admin) + ) { + return { user }; + } + const appCfg = getConfig(); const token = jwt.sign( {