From 2991e4a19b3087f35dbe49cdfdea1ce0a0a8a9c1 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Sat, 25 Nov 2023 11:11:05 +0100 Subject: [PATCH] fix: fix error code handling --- services/graph/pkg/service/v0/links.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/services/graph/pkg/service/v0/links.go b/services/graph/pkg/service/v0/links.go index d86a4e2fc2..868d0880c0 100644 --- a/services/graph/pkg/service/v0/links.go +++ b/services/graph/pkg/service/v0/links.go @@ -10,6 +10,7 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/go-chi/render" libregraph "github.com/owncloud/libre-graph-api-go" "github.com/owncloud/ocis/v2/services/graph/pkg/linktype" @@ -21,12 +22,12 @@ func (g Graph) CreateLink(w http.ResponseWriter, r *http.Request) { logger.Info().Msg("calling create link") driveID, err := parseIDParam(r, "driveID") if err != nil { - errorcode.RenderError(w, r, err) + errorcode.InvalidRequest.Render(w, r, http.StatusBadRequest, err.Error()) return } driveItemID, err := parseIDParam(r, "itemID") if err != nil { - errorcode.RenderError(w, r, err) + errorcode.InvalidRequest.Render(w, r, http.StatusBadRequest, err.Error()) return } if driveID.StorageId != driveItemID.StorageId || driveID.SpaceId != driveItemID.SpaceId { @@ -93,6 +94,10 @@ func (g Graph) createLink(ctx context.Context, driveItemID *providerv1beta1.Reso Password: createLink.GetPassword(), }, } + if createLink.ExpirationDateTime != nil { + req.GetGrant().Expiration = utils.TimeToTS(createLink.GetExpirationDateTime()) + } + // set displayname and password protected as arbitrary metadata req.ResourceInfo.ArbitraryMetadata = &providerv1beta1.ArbitraryMetadata{ Metadata: map[string]string{