Move chi HTTP-Method registering into the NewService func

Signed-off-by: Christian Richter <[email protected]>
owncloud · Jun 4, 2024 · 6bb593e · 6bb593e
1 parent 1012a39
commit 6bb593e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/services/thumbnails/pkg/service/grpc/v0/service.go b/services/thumbnails/pkg/service/grpc/v0/service.go
@@ -127,6 +127,7 @@ func (g Thumbnail) handleCS3Source(ctx context.Context, req *thumbnailssvc.GetTh
 		return "", merrors.Forbidden(g.serviceID, "no download permission")
 	}
 
+	//nolint:dupl
 	tType := thumbnail.GetExtForMime(sRes.GetInfo().GetMimeType())
 	if tType == "" {
 		tType = req.GetThumbnailType().String()
@@ -214,6 +215,7 @@ func (g Thumbnail) handleWebdavSource(ctx context.Context, req *thumbnailssvc.Ge
 		return "", merrors.Forbidden(g.serviceID, "no download permission")
 	}
 
+	//nolint:dupl
 	tType := thumbnail.GetExtForMime(sRes.GetInfo().GetMimeType())
 	if tType == "" {
 		tType = req.GetThumbnailType().String()

diff --git a/services/webdav/pkg/service/v0/service.go b/services/webdav/pkg/service/v0/service.go
@@ -33,11 +33,6 @@ import (
 	"github.com/owncloud/ocis/v2/services/webdav/pkg/dav/requests"
 )
 
-func init() {
-	// register method with chi before any routing is set up
-	chi.RegisterMethod("REPORT")
-}
-
 var (
 	codesEnum = map[int]string{
 		http.StatusBadRequest:       "Sabre\\DAV\\Exception\\BadRequest",
@@ -94,6 +89,10 @@ func NewService(opts ...Option) (Service, error) {
 	if svc.config.DisablePreviews {
 		svc.thumbnailsClient = nil
 	}
+
+	// register method with chi before any routing is set up
+	chi.RegisterMethod("REPORT")
+
 	m.Route(options.Config.HTTP.Root, func(r chi.Router) {
 
 		if !svc.config.DisablePreviews {