feat #7: allow saving the selected backend choice

README.md

@@ -1,7 +1,6 @@
 # PolyculeConnect
 
 [![status-badge](https://ci-polycule-connect.chapoline.me/api/badges/1/status.svg)](https://ci-polycule-connect.chapoline.me/repos/1)
-[![status-badge](https://ci-server.internal.faercol.me/api/badges/2/status.svg)](https://ci-server.internal.faercol.me/repos/2)
 
 ![Project logo](./polyculeconnect/static/img/logo-text.png)
 

polyculeconnect/cmd/serve/serve.go

@@ -43,7 +43,7 @@ func serve() {
 	logger.L.Infof("Initialized storage backend %q", conf.StorageType)
 	dexConf := dex_server.Config{
 		Web: dex_server.WebConfig{
-			Dir:   conf.StaticDir,
+			Dir:   "./",
 			Theme: "default",
 		},
 		Storage:                storageType,

polyculeconnect/config/config.go

@@ -21,7 +21,6 @@ const (
 	varServerHost   envVar = "SERVER_HOST"
 	varServerPort   envVar = "SERVER_PORT"
 	varServerSocket envVar = "SERVER_SOCK_PATH"
-	varServerStaticDir envVar = "SERVER_STATIC_DIR"
 
 	varIssuer envVar = "ISSUER"
 
@@ -57,7 +56,6 @@ const (
 	defaultServerHost   = "0.0.0.0"
 	defaultServerPort   = 5000
 	defaultServerSocket = ""
-	defaultServerStaticDir = "./"
 
 	defaultIssuer = "http://localhost:5000"
 
@@ -114,7 +112,6 @@ type AppConfig struct {
 	StorageType       string
 	StorageConfig     *StorageConfig
 	OpenConnectConfig *OpenConnectConfig
-	StaticDir         string
 }
 
 func parseLevel(lvlStr string) logrus.Level {
@@ -145,7 +142,6 @@ func (ac *AppConfig) getConfFromEnv() {
 	ac.Host = getStringFromEnv(varServerHost, defaultServerHost)
 	ac.Port = getIntFromEnv(varServerPort, defaultServerPort)
 	ac.SockPath = getStringFromEnv(varServerSocket, defaultServerSocket)
-	ac.StaticDir = getStringFromEnv(varServerStaticDir, defaultServerStaticDir)
 
 	ac.StorageType = getStringFromEnv(varStorageType, string(defaultStorageType))
 	ac.StorageConfig.Database = getStringFromEnv(varStorageDB, defaultStorageDB)

polyculeconnect/config/config_test.go

@@ -17,7 +17,6 @@ var defaultConfig = AppConfig{
 	Port:        defaultServerPort,
 	SockPath:    defaultServerSocket,
 	StorageType: string(defaultStorageType),
-	StaticDir:   "./",
 	StorageConfig: &StorageConfig{
 		File:     defaultStorageFile,
 		Host:     defaultStorageHost,

polyculeconnect/controller/ui/static.go

@@ -15,31 +15,22 @@ import (
 const StaticRoute = "/static/"
 
 type StaticController struct {
-	baseDir string
-}
-
-func NewStaticController(baseDir string) *StaticController {
-	return &StaticController{
-		baseDir: baseDir,
-	}
 }
 
 func (sc *StaticController) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	fs := http.FileServer(http.Dir(sc.baseDir + "/static"))
+	fs := http.FileServer(http.Dir("./static"))
 	http.StripPrefix(StaticRoute, fs).ServeHTTP(w, r)
 }
 
 type IndexController struct {
 	l                     *logrus.Logger
 	downstreamConstroller http.Handler
-	baseDir               string
 }
 
-func NewIndexController(l *logrus.Logger, downstream http.Handler, baseDir string) *IndexController {
+func NewIndexController(l *logrus.Logger, downstream http.Handler) *IndexController {
 	return &IndexController{
 		l:                     l,
 		downstreamConstroller: downstream,
-		baseDir:               baseDir,
 	}
 }
 
@@ -48,9 +39,9 @@ func (ic IndexController) serveUI(w http.ResponseWriter, r *http.Request) (int,
 		"issuer": func() string { return "toto" },
 	}
 
-	lp := filepath.Join(ic.baseDir, "templates", "index.html")
+	lp := filepath.Join("templates", "index.html")
-	hdrTpl := filepath.Join(ic.baseDir, "templates", "header.html")
+	hdrTpl := filepath.Join("templates", "header.html")
-	footTpl := filepath.Join(ic.baseDir, "templates", "footer.html")
+	footTpl := filepath.Join("templates", "footer.html")
 	tmpl, err := template.New("index.html").Funcs(funcs).ParseFiles(hdrTpl, footTpl, lp)
 	if err != nil {
 		return http.StatusInternalServerError, -1, fmt.Errorf("failed to init template: %w", err)

polyculeconnect/server/server.go

@@ -64,8 +64,8 @@ func New(appConf *config.AppConfig, dexSrv *dex_server.Server, logger *logrus.Lo
 	}
 
 	controllers := map[string]http.Handler{
-		ui.StaticRoute: middlewares.WithLogger(ui.NewStaticController(appConf.StaticDir), logger),
+		ui.StaticRoute: middlewares.WithLogger(&ui.StaticController{}, logger),
-		"/":            middlewares.WithLogger(ui.NewIndexController(logger, dexSrv, appConf.StaticDir), logger),
+		"/":            middlewares.WithLogger(ui.NewIndexController(logger, dexSrv), logger),
 	}
 
 	m := http.NewServeMux()