implement first prototype of the logo upload API

services/web/pkg/assets/option.go

@@ -1,50 +0,0 @@
-package assets
-
-import (
-	"net/http"
-
-	"github.com/owncloud/ocis/v2/ocis-pkg/assetsfs"
-	"github.com/owncloud/ocis/v2/ocis-pkg/log"
-	"github.com/owncloud/ocis/v2/services/web"
-	"github.com/owncloud/ocis/v2/services/web/pkg/config"
-)
-
-// New returns a new http filesystem to serve assets.
-func New(opts ...Option) http.FileSystem {
-	options := newOptions(opts...)
-	return assetsfs.New(web.Assets, options.Config.Asset.Path, options.Logger)
-}
-
-// Option defines a single option function.
-type Option func(o *Options)
-
-// Options defines the available options for this package.
-type Options struct {
-	Logger log.Logger
-	Config *config.Config
-}
-
-// newOptions initializes the available default options.
-func newOptions(opts ...Option) Options {
-	opt := Options{}
-
-	for _, o := range opts {
-		o(&opt)
-	}
-
-	return opt
-}
-
-// Logger provides a function to set the logger option.
-func Logger(val log.Logger) Option {
-	return func(o *Options) {
-		o.Logger = val
-	}
-}
-
-// Config provides a function to set the config option.
-func Config(val *config.Config) Option {
-	return func(o *Options) {
-		o.Config = val
-	}
-}

services/web/pkg/assets/server.go

@@ -2,12 +2,13 @@ package assets
 
 import (
 	"bytes"
-	"golang.org/x/net/html"
 	"io"
 	"mime"
 	"net/http"
 	"path"
 	"path/filepath"
+
+	"golang.org/x/net/html"
 )
 
 type fileServer struct {

services/web/pkg/config/defaults/defaultconfig.go

@@ -1,8 +1,10 @@
 package defaults
 
 import (
+	"path/filepath"
 	"strings"
 
+	"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults"
 	"github.com/owncloud/ocis/v2/services/web/pkg/config"
 )
 
@@ -31,7 +33,7 @@ func DefaultConfig() *config.Config {
 			Name: "web",
 		},
 		Asset: config.Asset{
-			Path: "",
+			Path: filepath.Join(defaults.BaseDataPath(), "web/assets"),
 		},
 		Web: config.Web{
 			Path:        "",

services/web/pkg/service/v0/instrument.go

@@ -28,3 +28,8 @@ func (i instrument) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 func (i instrument) Config(w http.ResponseWriter, r *http.Request) {
 	i.next.Config(w, r)
 }
+
+// UploadLogo implements the Service interface.
+func (i instrument) UploadLogo(w http.ResponseWriter, r *http.Request) {
+	i.next.UploadLogo(w, r)
+}

services/web/pkg/service/v0/logging.go

@@ -28,3 +28,8 @@ func (l logging) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 func (l logging) Config(w http.ResponseWriter, r *http.Request) {
 	l.next.Config(w, r)
 }
+
+// UploadLogo implements the Service interface.
+func (l logging) UploadLogo(w http.ResponseWriter, r *http.Request) {
+	l.next.UploadLogo(w, r)
+}

services/web/pkg/service/v0/service.go

@@ -2,16 +2,21 @@ package svc
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
+	"io"
 	"net/http"
 	"net/url"
 	"os"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
 
 	"github.com/go-chi/chi/v5"
+	"github.com/owncloud/ocis/v2/ocis-pkg/assetsfs"
 	"github.com/owncloud/ocis/v2/ocis-pkg/log"
+	"github.com/owncloud/ocis/v2/services/web"
 	"github.com/owncloud/ocis/v2/services/web/pkg/assets"
 	"github.com/owncloud/ocis/v2/services/web/pkg/config"
 )
@@ -25,6 +30,7 @@ var (
 type Service interface {
 	ServeHTTP(http.ResponseWriter, *http.Request)
 	Config(http.ResponseWriter, *http.Request)
+	UploadLogo(http.ResponseWriter, *http.Request)
 }
 
 // NewService returns a service implementation for Service.
@@ -38,10 +44,12 @@ func NewService(opts ...Option) Service {
 		logger: options.Logger,
 		config: options.Config,
 		mux:    m,
+		fs:     assetsfs.New(web.Assets, options.Config.Asset.Path, options.Logger),
 	}
 
 	m.Route(options.Config.HTTP.Root, func(r chi.Router) {
 		r.Get("/config.json", svc.Config)
+		r.Post("/branding/logo", svc.UploadLogo)
 		r.Mount("/", svc.Static(options.Config.HTTP.CacheTTL))
 	})
 
@@ -58,6 +66,7 @@ type Web struct {
 	logger log.Logger
 	config *config.Config
 	mux    *chi.Mux
+	fs     *assetsfs.FileSystem
 }
 
 // ServeHTTP implements the Service interface.
@@ -131,12 +140,7 @@ func (p Web) Static(ttl int) http.HandlerFunc {
 
 	static := http.StripPrefix(
 		rootWithSlash,
-		assets.FileServer(
-			assets.New(
-				assets.Logger(p.logger),
-				assets.Config(p.config),
-			),
-		),
+		assets.FileServer(p.fs),
 	)
 
 	lastModified := time.Now().UTC().Format(http.TimeFormat)
@@ -161,3 +165,31 @@ func (p Web) Static(ttl int) http.HandlerFunc {
 		static.ServeHTTP(w, r)
 	}
 }
+
+// UploadLogo implements the endpoint to upload a custom logo for the oCIS instance.
+func (p Web) UploadLogo(w http.ResponseWriter, r *http.Request) {
+	file, fileHeader, err := r.FormFile("logo")
+	if err != nil {
+		if errors.Is(err, http.ErrMissingFile) {
+			w.WriteHeader(http.StatusBadRequest)
+		}
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	defer file.Close()
+
+	dst, err := p.fs.Create(filepath.Join("branding", filepath.Join("/", fileHeader.Filename)))
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	defer dst.Close()
+
+	_, err = io.Copy(dst, file)
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	w.WriteHeader(http.StatusOK)
+}

services/web/pkg/service/v0/tracing.go

@@ -24,3 +24,8 @@ func (t tracing) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 func (t tracing) Config(w http.ResponseWriter, r *http.Request) {
 	t.next.Config(w, r)
 }
+
+// UploadLogo implements the Service interface.
+func (t tracing) UploadLogo(w http.ResponseWriter, r *http.Request) {
+	t.next.UploadLogo(w, r)
+}