From 2cd6ee361eeb88cfa63eaf1e1860c2601f5a540c Mon Sep 17 00:00:00 2001
From: jkoberg <jkoberg@owncloud.com>
Date: Wed, 27 Sep 2023 11:44:52 +0200
Subject: [PATCH] dont reload web config on request

Signed-off-by: jkoberg <jkoberg@owncloud.com>
---
 .../unreleased/dont-reload-web-config.md      |  5 +++
 services/web/pkg/service/v0/service.go        | 43 +++++--------------
 2 files changed, 16 insertions(+), 32 deletions(-)
 create mode 100644 changelog/unreleased/dont-reload-web-config.md

diff --git a/changelog/unreleased/dont-reload-web-config.md b/changelog/unreleased/dont-reload-web-config.md
new file mode 100644
index 00000000000..02aca03c9f0
--- /dev/null
+++ b/changelog/unreleased/dont-reload-web-config.md
@@ -0,0 +1,5 @@
+Bugfix: Don't reload web config
+
+When requesting `config.json` file from the server, web service would reload the file if a path is set. This will remove config entries set via Envvar. Since we want to have the possiblity to set configuration from both sources we removed the reading from file. The file will still be loaded on service startup.
+
+https://github.com/owncloud/ocis/pull/7369
diff --git a/services/web/pkg/service/v0/service.go b/services/web/pkg/service/v0/service.go
index 003fe3c42be..0681eba03b5 100644
--- a/services/web/pkg/service/v0/service.go
+++ b/services/web/pkg/service/v0/service.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
-	"os"
 	"strconv"
 	"strings"
 	"time"
@@ -94,42 +93,22 @@ func (p Web) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 }
 
 func (p Web) getPayload() (payload []byte, err error) {
-	if p.config.Web.Path == "" {
-		// render dynamically using config
-
-		// build theme url
-		if themeServer, err := url.Parse(p.config.Web.ThemeServer); err == nil {
-			p.config.Web.Config.Theme = themeServer.String() + p.config.Web.ThemePath
-		} else {
-			p.config.Web.Config.Theme = p.config.Web.ThemePath
-		}
-
-		// make apps render as empty array if it is empty
-		// TODO remove once https://github.com/golang/go/issues/27589 is fixed
-		if len(p.config.Web.Config.Apps) == 0 {
-			p.config.Web.Config.Apps = make([]string, 0)
-		}
+	// render dynamically using config
 
-		return json.Marshal(p.config.Web.Config)
+	// build theme url
+	if themeServer, err := url.Parse(p.config.Web.ThemeServer); err == nil {
+		p.config.Web.Config.Theme = themeServer.String() + p.config.Web.ThemePath
+	} else {
+		p.config.Web.Config.Theme = p.config.Web.ThemePath
 	}
 
-	// try loading from file
-	if _, err = os.Stat(p.config.Web.Path); os.IsNotExist(err) {
-		p.logger.Fatal().
-			Err(err).
-			Str("config", p.config.Web.Path).
-			Msg("web config doesn't exist")
+	// make apps render as empty array if it is empty
+	// TODO remove once https://github.com/golang/go/issues/27589 is fixed
+	if len(p.config.Web.Config.Apps) == 0 {
+		p.config.Web.Config.Apps = make([]string, 0)
 	}
 
-	payload, err = os.ReadFile(p.config.Web.Path)
-
-	if err != nil {
-		p.logger.Fatal().
-			Err(err).
-			Str("config", p.config.Web.Path).
-			Msg("failed to read custom config")
-	}
-	return
+	return json.Marshal(p.config.Web.Config)
 }
 
 // Config implements the Service interface.