From 088f4faf82f73e8dc54a88325cc5bdc7455925c2 Mon Sep 17 00:00:00 2001
From: Melora Hugues <dev@faercol.me>
Date: Wed, 3 Jan 2024 17:10:20 +0100
Subject: [PATCH] fix: allow setting the issuer from environment variables

---
 README.md                             |  2 ++
 polyculeconnect/config/config.go      | 10 ++++++++++
 polyculeconnect/config/config_test.go |  3 +++
 3 files changed, 15 insertions(+)

diff --git a/README.md b/README.md
index 35755b8..b02382c 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,8 @@ The rest of the configuration is handled through environment variables
 # Can be debug,info,warning,error
 LOG_LEVEL = "info"
 
+ISSUER = "http://localhost"
+
 # Can be net,unix
 SERVER_MODE = "net"
 SERVER_HOST = "0.0.0.0"
diff --git a/polyculeconnect/config/config.go b/polyculeconnect/config/config.go
index 690d023..ae245c6 100644
--- a/polyculeconnect/config/config.go
+++ b/polyculeconnect/config/config.go
@@ -22,6 +22,8 @@ const (
 	varServerPort   envVar = "SERVER_PORT"
 	varServerSocket envVar = "SERVER_SOCK_PATH"
 
+	varIssuer envVar = "ISSUER"
+
 	varStorageType      envVar = "STORAGE_TYPE"
 	varStorageFile      envVar = "STORAGE_FILEPATH"
 	varStorageHost      envVar = "STORAGE_HOST"
@@ -55,6 +57,8 @@ const (
 	defaultServerPort   = 5000
 	defaultServerSocket = ""
 
+	defaultIssuer = "locahost"
+
 	defaultStorageType      = Memory
 	defaultStorageFile      = "./polyculeconnect.db"
 	defaultStorageHost      = "127.0.0.1"
@@ -125,6 +129,9 @@ func (ac *AppConfig) UnmarshalJSON(data []byte) error {
 		return fmt.Errorf("failed to read JSON: %w", err)
 	}
 	ac.OpenConnectConfig = jsonConf.OpenConnectConfig
+	if ac.OpenConnectConfig == nil {
+		ac.OpenConnectConfig = &OpenConnectConfig{}
+	}
 	return nil
 }
 
@@ -145,6 +152,8 @@ func (ac *AppConfig) getConfFromEnv() {
 	ac.StorageConfig.Password = getStringFromEnv(varStoragePassword, defaultStoragePassword)
 	ac.StorageConfig.Ssl.CaFile = getStringFromEnv(varStorageSSLCaFile, defaultStorageSSLCaFile)
 	ac.StorageConfig.Ssl.Mode = getStringFromEnv(varStorageSSLMode, defaultStorageSSLMode)
+
+	ac.OpenConnectConfig.Issuer = getStringFromEnv(varIssuer, defaultIssuer)
 }
 
 func (ac *AppConfig) RedirectURI() string {
@@ -154,6 +163,7 @@ func (ac *AppConfig) RedirectURI() string {
 func New(filepath string) (*AppConfig, error) {
 	var conf AppConfig
 	conf.StorageConfig = &StorageConfig{}
+	conf.OpenConnectConfig = &OpenConnectConfig{}
 	content, err := os.ReadFile(filepath)
 	if err != nil {
 		if !errors.Is(err, fs.ErrNotExist) {
diff --git a/polyculeconnect/config/config_test.go b/polyculeconnect/config/config_test.go
index 2e93854..86d480d 100644
--- a/polyculeconnect/config/config_test.go
+++ b/polyculeconnect/config/config_test.go
@@ -29,6 +29,9 @@ var defaultConfig = AppConfig{
 			CaFile string
 		}{Mode: defaultStorageSSLMode, CaFile: defaultStorageSSLCaFile},
 	},
+	OpenConnectConfig: &OpenConnectConfig{
+		Issuer: defaultIssuer,
+	},
 }
 
 func initJson(t *testing.T, content string) string {