JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

satellite/console: fix unverified invite email

Browse Source 
When checking if invited user is unverified, initialize oldest
with unverified row rather than empty User, because empty User
CreatedAt is zero, so no real user could be created earlier.

Change-Id: I74dd8f7fc82951cbb61071632a74b1a9443b41fe
This commit is contained in:
Cameron 2023-09-01 15:11:55 -04:00
parent c9591e9754
commit 6896241933
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
satellite/console/service.go
View File

@ -3664,29 +3664,28 @@ func (s *Service) InviteProjectMembers(ctx context.Context, projectID uuid.UUID,
}
invitedUser, unverified, err := s.store.Users().GetByEmailWithUnverified(ctx, email)
if err == nil {
if invitedUser != nil {
_, err = s.isProjectMember(ctx, invitedUser.ID, projectID)
if err != nil && !ErrNoMembership.Has(err) {
return nil, Error.Wrap(err)
} else if err == nil {
return nil, ErrAlreadyMember.New("%s is already a member", email)
}
users = append(users, invitedUser)
} else {
oldest := User{}
for _, u := range unverified {
if u.CreatedAt.Before(oldest.CreatedAt) {
oldest = u
}
}
unverifiedUsers = append(unverifiedUsers, oldest)
}
} else if errs.Is(err, sql.ErrNoRows) {
newUserEmails = append(newUserEmails, email)
} else {
if err != nil {
return nil, Error.Wrap(err)
}
if invitedUser != nil {
_, err = s.isProjectMember(ctx, invitedUser.ID, projectID)
if err != nil && !ErrNoMembership.Has(err) {
return nil, Error.Wrap(err)
} else if err == nil {
return nil, ErrAlreadyMember.New("%s is already a member", email)
}
users = append(users, invitedUser)
} else if len(unverified) > 0 {
oldest := unverified[0]
for _, u := range unverified {
if u.CreatedAt.Before(oldest.CreatedAt) {
oldest = u
}
}
unverifiedUsers = append(unverifiedUsers, oldest)
} else {
newUserEmails = append(newUserEmails, email)
}
}
inviteTokens := make(map[string]string)