π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Move self-move validation into controller
Neeraj Gupta9cd9edcf1d99
diff --git a/server/pkg/api/collection.go b/server/pkg/api/collection.goindex 0cbec76790..ec2ff71a84 100644--- a/server/pkg/api/collection.go+++ b/server/pkg/api/collection.go@@ -291,11 +291,6 @@ func (h *CollectionHandler) MoveFiles(c *gin.Context) {handler.Error(c, stacktrace.Propagate(ente.ErrBatchSizeTooLarge, ""))return}- if request.ToCollectionID == request.FromCollectionID {- handler.Error(c, stacktrace.Propagate(ente.ErrBadRequest, "to and fromCollection should be different"))- return- }-if err := h.Controller.MoveFiles(c, request); err != nil {handler.Error(c, stacktrace.Propagate(err, ""))returndiff --git a/server/pkg/controller/collections/file_action.go b/server/pkg/controller/collections/file_action.goindex 1cd0eaf89e..665fbcce29 100644--- a/server/pkg/controller/collections/file_action.go+++ b/server/pkg/controller/collections/file_action.go@@ -83,7 +83,7 @@ func (c *CollectionController) RestoreFiles(ctx *gin.Context, userID int64, cIDfunc (c *CollectionController) MoveFiles(ctx *gin.Context, req ente.MoveFilesRequest) error {if req.FromCollectionID == req.ToCollectionID {- return stacktrace.Propagate(ente.ErrBadRequest, "source and destination collections are the same")+ return ente.NewBadRequestWithMessage("source and destination collections must differ")}userID := auth.GetUserID(ctx.Request.Header)r1, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{diff --git a/server/pkg/controller/collections/file_action_test.go b/server/pkg/controller/collections/file_action_test.goindex 77ec7b895d..ab379ce8c7 100644--- a/server/pkg/controller/collections/file_action_test.go+++ b/server/pkg/controller/collections/file_action_test.go@@ -13,7 +13,8 @@ func TestMoveFilesRejectsSameCollection(t *testing.T) {FromCollectionID: collectionID,ToCollectionID: collectionID,})- if !errors.Is(err, ente.ErrBadRequest) {- t.Fatalf("MoveFiles() error = %v, want %v", err, ente.ErrBadRequest)+ var apiErr *ente.ApiError+ if !errors.As(err, &apiErr) || apiErr.Code != ente.BadRequest {+ t.Fatalf("MoveFiles() error = %v, want %s", err, ente.BadRequest)}}