Skip to content

Commit e9bf424

Browse files
committed
fix: use consistent invitation state keys
1 parent 221bced commit e9bf424

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

model/sharing/invitation.go

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,7 @@ func (s *Sharing) SendInvitationsToMembers(
132132
continue
133133
}
134134

135-
key := m.Email
136-
if key == "" {
137-
key = m.Instance
138-
}
135+
key := invitationStateKey(m)
139136
// If an instance URL is available, the owner's Cozy has already
140137
// created a shortcut, so we don't need to send an invitation.
141138
if m.Instance == "" {
@@ -184,11 +181,17 @@ func (s *Sharing) SendInvitationsToMembers(
184181
}
185182
}
186183

187-
func delegatedInvitationState(m Member, invitationStates map[string]string) (string, bool) {
188-
key := m.Instance
189-
if key == "" {
190-
key = m.Email
184+
// invitationStateKey matches the owner response key: the Cozy instance URL is
185+
// preferred when available, with the email address as a fallback.
186+
func invitationStateKey(m Member) string {
187+
if m.Instance != "" {
188+
return m.Instance
191189
}
190+
return m.Email
191+
}
192+
193+
func delegatedInvitationState(m Member, invitationStates map[string]string) (string, bool) {
194+
key := invitationStateKey(m)
192195
if key == "" {
193196
return "", false
194197
}

0 commit comments

Comments
 (0)