Merge remote-tracking branch 'origin' into groups-phase-2c

2026-10-14 14:34:09 +00:00 · 2024-04-25 17:03:23 -07:00
parent 8ff407927c 49c735caf9
commit 71e309bbcb
18 changed files with 620 additions and 56 deletions
@@ -342,11 +342,12 @@ export const samlConfigServiceFactory = ({
              orgId,
              inviteEmail: email,
              role: OrgMembershipRole.Member,
-              status: OrgMembershipStatus.Accepted
+              status: user.isAccepted ? OrgMembershipStatus.Accepted : OrgMembershipStatus.Invited // if user is fully completed, then set status to accepted, otherwise set it to invited so we can update it later
            },
            tx
          );
-        } else if (orgMembership.status === OrgMembershipStatus.Invited) {
+          // Only update the membership to Accepted if the user account is already completed.
+        } else if (orgMembership.status === OrgMembershipStatus.Invited && user.isAccepted) {
          await orgDAL.updateMembershipById(
            orgMembership.id,
            {