From 052576526fc220cc96f2cdd229c91cbef114bec7 Mon Sep 17 00:00:00 2001
From: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>
Date: Thu, 15 Aug 2024 18:01:41 +0200
Subject: [PATCH] Fixing tests

---
 internal/grpc/services/ocminvitemanager/ocminvitemanager.go   | 2 +-
 internal/http/services/experimental/sciencemesh/token.go      | 2 ++
 tests/integration/grpc/ocm_invitation_test.go                 | 4 ++--
 .../grpc/{ocm_share_test.go.disabled => ocm_share_test.go}    | 0
 4 files changed, 5 insertions(+), 3 deletions(-)
 rename tests/integration/grpc/{ocm_share_test.go.disabled => ocm_share_test.go} (100%)

diff --git a/internal/grpc/services/ocminvitemanager/ocminvitemanager.go b/internal/grpc/services/ocminvitemanager/ocminvitemanager.go
index adac2c0e41..7015918d11 100644
--- a/internal/grpc/services/ocminvitemanager/ocminvitemanager.go
+++ b/internal/grpc/services/ocminvitemanager/ocminvitemanager.go
@@ -234,7 +234,7 @@ func getOCMEndpoint(originProvider *ocmprovider.ProviderInfo) (string, error) {
 func (s *service) AcceptInvite(ctx context.Context, req *invitepb.AcceptInviteRequest) (*invitepb.AcceptInviteResponse, error) {
 	token, err := s.repo.GetToken(ctx, req.InviteToken.Token)
 	if err != nil {
-		if errors.Is(err, ocmd.ErrTokenInvalid) {
+		if errors.Is(err, invite.ErrTokenNotFound) {
 			return &invitepb.AcceptInviteResponse{
 				Status: status.NewInvalid(ctx, "token invalid or not found"),
 			}, nil
diff --git a/internal/http/services/experimental/sciencemesh/token.go b/internal/http/services/experimental/sciencemesh/token.go
index a4708ac69c..199148a9a3 100644
--- a/internal/http/services/experimental/sciencemesh/token.go
+++ b/internal/http/services/experimental/sciencemesh/token.go
@@ -177,6 +177,8 @@ func (h *tokenHandler) AcceptInvite(w http.ResponseWriter, r *http.Request) {
 	}
 	if forwardInviteResponse.Status.Code != rpc.Code_CODE_OK {
 		switch forwardInviteResponse.Status.Code {
+		case rpc.Code_CODE_NOT_FOUND:
+			fallthrough
 		case rpc.Code_CODE_INVALID_ARGUMENT:
 			reqres.WriteError(w, r, reqres.APIErrorInvalidParameter, "invalid or non existing token", nil)
 			return
diff --git a/tests/integration/grpc/ocm_invitation_test.go b/tests/integration/grpc/ocm_invitation_test.go
index 1427963ba6..fe8a78e59a 100644
--- a/tests/integration/grpc/ocm_invitation_test.go
+++ b/tests/integration/grpc/ocm_invitation_test.go
@@ -262,7 +262,7 @@ var _ = Describe("ocm invitation workflow", func() {
 			})
 		})
 
-		Describe("marie accept a not existing token", func() {
+		Describe("marie accept a non existing token", func() {
 			var cleanup func()
 			BeforeEach(func() {
 				variables, cleanup, err = initData(driver, nil, nil)
@@ -276,7 +276,7 @@ var _ = Describe("ocm invitation workflow", func() {
 			It("will not complete the invitation workflow", func() {
 				forwardRes, err := cesnetgw.ForwardInvite(ctxMarie, &invitepb.ForwardInviteRequest{
 					InviteToken: &invitepb.InviteToken{
-						Token: "not-existing-token",
+						Token: "non-existing-token",
 					},
 					OriginSystemProvider: cernbox,
 				})
diff --git a/tests/integration/grpc/ocm_share_test.go.disabled b/tests/integration/grpc/ocm_share_test.go
similarity index 100%
rename from tests/integration/grpc/ocm_share_test.go.disabled
rename to tests/integration/grpc/ocm_share_test.go