From a0aaefabcbf10ed61b19c83816a805497e04e779 Mon Sep 17 00:00:00 2001 From: Roman Perekhod Date: Wed, 8 Jan 2025 15:56:01 +0100 Subject: [PATCH] [full-ci] bump reva --- changelog/unreleased/ocm-accept-invite.md | 6 ++++++ go.mod | 2 +- go.sum | 4 ++-- .../ocminvitemanager/ocminvitemanager.go | 16 ++++++++-------- vendor/modules.txt | 2 +- 5 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 changelog/unreleased/ocm-accept-invite.md diff --git a/changelog/unreleased/ocm-accept-invite.md b/changelog/unreleased/ocm-accept-invite.md new file mode 100644 index 0000000000..d318411d62 --- /dev/null +++ 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/owncloud/ocis/pull/10834 +https://github.com/owncloud/ocis/issues/10813 diff --git a/go.mod b/go.mod index 563cac135e..7cff6a523a 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/cenkalti/backoff v2.2.1+incompatible github.com/coreos/go-oidc/v3 v3.11.0 github.com/cs3org/go-cs3apis v0.0.0-20241105092511-3ad35d174fc1 - github.com/cs3org/reva/v2 v2.27.1-0.20250107124628-bd76241aa776 + github.com/cs3org/reva/v2 v2.27.1-0.20250108145244-9d64adf0696e github.com/davidbyttow/govips/v2 v2.15.0 github.com/dhowden/tag v0.0.0-20240417053706-3d75831295e8 github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e diff --git a/go.sum b/go.sum index a137461062..7a5d0c8162 100644 --- a/go.sum +++ b/go.sum @@ -253,8 +253,8 @@ github.com/crewjam/saml v0.4.14 h1:g9FBNx62osKusnFzs3QTN5L9CVA/Egfgm+stJShzw/c= github.com/crewjam/saml v0.4.14/go.mod h1:UVSZCf18jJkk6GpWNVqcyQJMD5HsRugBPf4I1nl2mME= github.com/cs3org/go-cs3apis v0.0.0-20241105092511-3ad35d174fc1 h1:RU6LT6mkD16xZs011+8foU7T3LrPvTTSWeTQ9OgfhkA= github.com/cs3org/go-cs3apis v0.0.0-20241105092511-3ad35d174fc1/go.mod h1:DedpcqXl193qF/08Y04IO0PpxyyMu8+GrkD6kWK2MEQ= -github.com/cs3org/reva/v2 v2.27.1-0.20250107124628-bd76241aa776 h1:tNLN9UCR9OHhZUHftWKfJyNPPaS0HaT0QOH4zGln/UE= -github.com/cs3org/reva/v2 v2.27.1-0.20250107124628-bd76241aa776/go.mod h1:OrCNgIFkp3ROHiEjNCj8eZHACmYCD4owtFRuYFlYZkU= +github.com/cs3org/reva/v2 v2.27.1-0.20250108145244-9d64adf0696e h1:9gyNznHfnoMuBWxF+xuGyoMVXeGFDRjfDNdu8qaBZuw= +github.com/cs3org/reva/v2 v2.27.1-0.20250108145244-9d64adf0696e/go.mod h1:OrCNgIFkp3ROHiEjNCj8eZHACmYCD4owtFRuYFlYZkU= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= diff --git a/vendor/github.com/cs3org/reva/v2/internal/grpc/services/ocminvitemanager/ocminvitemanager.go b/vendor/github.com/cs3org/reva/v2/internal/grpc/services/ocminvitemanager/ocminvitemanager.go index 328cb2b75f..ec36801334 100644 --- a/vendor/github.com/cs3org/reva/v2/internal/grpc/services/ocminvitemanager/ocminvitemanager.go +++ b/vendor/github.com/cs3org/reva/v2/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{ diff --git a/vendor/modules.txt b/vendor/modules.txt index 1b015a15e6..d2410ee474 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -367,7 +367,7 @@ github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1 github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1 github.com/cs3org/go-cs3apis/cs3/tx/v1beta1 github.com/cs3org/go-cs3apis/cs3/types/v1beta1 -# github.com/cs3org/reva/v2 v2.27.1-0.20250107124628-bd76241aa776 +# github.com/cs3org/reva/v2 v2.27.1-0.20250108145244-9d64adf0696e ## explicit; go 1.22.0 github.com/cs3org/reva/v2/cmd/revad/internal/grace github.com/cs3org/reva/v2/cmd/revad/runtime