sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[full-ci] bump reva

Browse Source
This commit is contained in:
Roman Perekhod
2025-01-08 15:56:01 +01:00
parent 621c863d9a
commit a0aaefabcb
5 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/github.com/cs3org/reva/v2/internal/grpc/services/ocminvitemanager/ocminvitemanager.go
Generated Vendored
+8 -8
View File
@@ -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{