fix: fix more status codes and error messages

cs3org · Jan 2, 2024 · 08b3c1c · 08b3c1c
1 parent 8e51f9a
commit 08b3c1c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/internal/grpc/services/gateway/storageprovider.go b/internal/grpc/services/gateway/storageprovider.go
@@ -709,7 +709,7 @@ func (s *svc) Move(ctx context.Context, req *provider.MoveRequest) (*provider.Mo
 
  if sourceProviderInfo.Address != destProviderInfo.Address {
  return &provider.MoveResponse{
- Status: status.NewUnimplemented(ctx, nil, "gateway does not support cross storage move, use copy and delete"),
+ Status: status.NewPermissionDenied(ctx, nil, "cross storage moves are not permitted, use copy and delete"),
  }, nil
  }
 

diff --git a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go
@@ -666,7 +666,7 @@ func (s *service) Move(ctx context.Context, req *provider.MoveRequest) (*provide
 
  if dstReceivedShare.Share.Id.OpaqueId != srcReceivedShare.Share.Id.OpaqueId {
  return &provider.MoveResponse{
- Status: status.NewPermissionDenied(ctx, nil, "sharesstorageprovider: can not move between shares"),
+ Status: status.NewPermissionDenied(ctx, nil, "cross storage moves are not permitted, use copy and delete"),
  }, nil
  }
 

diff --git a/internal/http/services/owncloud/ocdav/move.go b/internal/http/services/owncloud/ocdav/move.go
@@ -283,8 +283,6 @@ func (s *svc) handleMove(ctx context.Context, w http.ResponseWriter, r *http.Req
  status = http.StatusPreconditionFailed
  case rpc.Code_CODE_PERMISSION_DENIED:
  status = http.StatusForbidden
- // create oc10 compatible error message
- m = "Destination directory is not writable"
  case rpc.Code_CODE_UNIMPLEMENTED:
  // We translate this into a Bad Gateway error as per https://www.rfc-editor.org/rfc/rfc4918#section-9.9.4
  // > 502 (Bad Gateway) - This may occur when the destination is on another