opencode/yao
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update AcceptInvitation method to support optional user ID parameter

Browse source 
- Modified the AcceptInvitation method to accept an optional user ID parameter, allowing for updates to the user ID when accepting invitations without an existing user ID.
- Adjusted related tests to include the new user ID parameter, ensuring comprehensive coverage of invitation acceptance scenarios.
- Updated the team invitation acceptance logic to utilize the new parameter, enhancing the invitation flow and user management capabilities.
This commit is contained in:
Max 2025-10-14 14:15:41 +08:00
parent 721f47c345
commit 168313c757
5 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
openapi/oauth/providers/user/member.go
View file

@ -238,7 +238,8 @@ func (u *DefaultUser) AddMember(ctx context.Context, teamID string, userID strin
}
// AcceptInvitation accepts a team invitation
func (u *DefaultUser) AcceptInvitation(ctx context.Context, invitationID string, invitationToken string) error {
// userID can be empty - if provided and invitation doesn't have user_id, it will be updated
func (u *DefaultUser) AcceptInvitation(ctx context.Context, invitationID string, invitationToken string, userID string) error {
// Find member by invitation_id and token
m := model.Select(u.memberModel)
members, err := m.Get(model.QueryParam{
@ -277,6 +278,11 @@ func (u *DefaultUser) AcceptInvitation(ctx context.Context, invitationID string,
"invitation_token": nil, // Clear the token
}
// If invitation doesn't have a user_id (unregistered user invitation), update it with provided userID
if userID != "" && (member["user_id"] == nil || member["user_id"] == "") {
updateData["user_id"] = userID
}
affected, err := m.UpdateWhere(model.QueryParam{
Wheres: []model.QueryWhere{
{Column: "id", Value: memberID},

8
openapi/oauth/providers/user/member_test.go
View file

@ -278,7 +278,7 @@ func TestMemberInvitationFlow(t *testing.T) {
// Test AcceptInvitation
t.Run("AcceptInvitation", func(t *testing.T) {
err := testProvider.AcceptInvitation(ctx, invitationID, invitationToken)
err := testProvider.AcceptInvitation(ctx, invitationID, invitationToken, "")
assert.NoError(t, err)
// Verify member status changed to active
@ -295,14 +295,14 @@ func TestMemberInvitationFlow(t *testing.T) {
// Test AcceptInvitation with invalid token
t.Run("AcceptInvitation_InvalidToken", func(t *testing.T) {
err := testProvider.AcceptInvitation(ctx, invitationID, "invalid-token")
err := testProvider.AcceptInvitation(ctx, invitationID, "invalid-token", "")
assert.Error(t, err)
assert.Contains(t, err.Error(), "invitation not found")
})
// Test AcceptInvitation with already accepted token
t.Run("AcceptInvitation_AlreadyAccepted", func(t *testing.T) {
err := testProvider.AcceptInvitation(ctx, invitationID, invitationToken)
err := testProvider.AcceptInvitation(ctx, invitationID, invitationToken, "")
assert.Error(t, err)
assert.Contains(t, err.Error(), "invitation not found")
})
@ -750,7 +750,7 @@ func TestMemberInvitationExpiry(t *testing.T) {
// Test AcceptInvitation with expired token
t.Run("AcceptInvitation_ExpiredToken", func(t *testing.T) {
err := testProvider.AcceptInvitation(ctx, invitationID, "expired-token-"+testUUID)
err := testProvider.AcceptInvitation(ctx, invitationID, "expired-token-"+testUUID, "")
assert.Error(t, err)
assert.Contains(t, err.Error(), "invitation has expired")
})

2
openapi/oauth/providers/user/team_test.go
View file

@ -381,7 +381,7 @@ func TestTeamMemberOperations(t *testing.T) {
assert.NotEmpty(t, invitationID)
// Accept the invitation
err = testProvider.AcceptInvitation(ctx, invitationID, invitationToken)
err = testProvider.AcceptInvitation(ctx, invitationID, invitationToken, "")
assert.NoError(t, err)
// Verify member status changed to active

2
openapi/oauth/types/interfaces.go
View file

@ -308,7 +308,7 @@ type UserProvider interface {
// Member Invitation Management
AddMember(ctx context.Context, teamID string, userID string, roleID string, invitedBy string) (int64, error)
AcceptInvitation(ctx context.Context, invitationID string, invitationToken string) error
AcceptInvitation(ctx context.Context, invitationID string, invitationToken string, userID string) error
// Robot Member Operations
CreateRobotMember(ctx context.Context, teamID string, robotData maps.MapStrAny) (int64, error)

21
openapi/user/team_invitation.go
View file

@ -528,25 +528,8 @@ func GinTeamInvitationAccept(c *gin.Context) {
return
}
// If invitation doesn't have a user_id (unregistered user invitation), update it with current user
if invitationData["user_id"] == nil || invitationData["user_id"] == "" {
updateData := maps.MapStrAny{
"user_id": userID,
}
err = provider.UpdateMemberByInvitationID(ctx, invitationID, updateData)
if err != nil {
log.Error("Failed to update invitation with user_id: %v", err)
errorResp := &response.ErrorResponse{
Code: response.ErrServerError.Code,
ErrorDescription: "Failed to process invitation",
}
response.RespondWithError(c, response.StatusInternalServerError, errorResp)
return
}
}
// Accept the invitation
err = provider.AcceptInvitation(ctx, invitationID, req.Token)
// Accept the invitation (will update user_id if invitation doesn't have one)
err = provider.AcceptInvitation(ctx, invitationID, req.Token, userID)
if err != nil {
log.Error("Failed to accept invitation: %v", err)
// Check error type for appropriate response