Merge pull request #5031 from 2403905/issue-10813

Allow to accepted invite after it was once deleted
cs3org · Jan 8, 2025 · 9d64adf · 9d64adf
2 parents 2f48e2c + 50edf91
commit 9d64adf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/changelog/unreleased/ocm-accept-invite.md b/changelog/unreleased/ocm-accept-invite.md
@@ -0,0 +1,6 @@
+Bugfix: Allow to accepted invite after it was once deleted
+
+Allowed to accepted invite even after it was once deleted on the invite receiver or invite creation side.
+
+https://github.com/cs3org/reva/pull/5031
+https://github.com/owncloud/ocis/issues/10813
diff --git a/internal/grpc/services/ocminvitemanager/ocminvitemanager.go b/internal/grpc/services/ocminvitemanager/ocminvitemanager.go
@@ -222,12 +222,14 @@ func (s *service) ForwardInvite(ctx context.Context, req *invitepb.ForwardInvite
 		Mail:        remoteUser.Email,
 		DisplayName: remoteUser.Name,
 	}); err != nil {
-		if !errors.Is(err, invite.ErrUserAlreadyAccepted) {
-			// skip error if user was already accepted
+		if errors.Is(err, invite.ErrUserAlreadyAccepted) {
 			return &invitepb.ForwardInviteResponse{
-				Status: status.NewInternal(ctx, err.Error()),
+				Status: status.NewAlreadyExists(ctx, err, err.Error()),
 			}, nil
 		}
+		return &invitepb.ForwardInviteResponse{
+			Status: status.NewInternal(ctx, err.Error()),
+		}, nil
 	}
 
 	return &invitepb.ForwardInviteResponse{
@@ -276,14 +278,12 @@ func (s *service) AcceptInvite(ctx context.Context, req *invitepb.AcceptInviteRe
 	remoteUser := req.GetRemoteUser()
 
 	if err := s.repo.AddRemoteUser(ctx, token.GetUserId(), remoteUser); err != nil {
-		if errors.Is(err, invite.ErrUserAlreadyAccepted) {
+		if !errors.Is(err, invite.ErrUserAlreadyAccepted) {
+			// skip error if user was already accepted
 			return &invitepb.AcceptInviteResponse{
-				Status: status.NewAlreadyExists(ctx, err, err.Error()),
+				Status: status.NewInternal(ctx, err.Error()),
 			}, nil
 		}
-		return &invitepb.AcceptInviteResponse{
-			Status: status.NewInternal(ctx, err.Error()),
-		}, nil
 	}
 
 	return &invitepb.AcceptInviteResponse{