fix: Make register lookup broker if default to blank (#175)

Co-authored-by: Jon Lundy <jon@xuu.cc>
Reviewed-on: https://git.mills.io/saltyim/saltyim/pulls/175
Reviewed-by: James Mills <james@mills.io>
Co-authored-by: xuu <xuu@noreply@mills.io>
Co-committed-by: xuu <xuu@noreply@mills.io>

.gitignore

@@ -26,3 +26,4 @@
 
 /echobot.sh
 /execbot.sh
+environ.inc

internal/config.go

@@ -17,7 +17,9 @@ type Config struct {
 	Data  string `json:"-"`
 	Store string `json:"-"`
 
+
 	BaseURL       string
+	BrokerURI     string
 	PrimaryDomain string
 
 	AdminUser    string `json:"-"`

internal/options.go

@@ -120,6 +120,10 @@ func WithBaseURL(baseURL string) Option {
 			return err
 		}
 		cfg.BaseURL = baseURL
+		if baseURL != DefaultBaseURL {
+			cfg.BrokerURI = baseURL
+		}
+
 		cfg.baseURL = u
 		return nil
 	}

internal/pwa/components/configuration.go

@@ -121,7 +121,7 @@ func (c *Configuration) registerIdentity() func(button app.HTMLButton) {
 				log.Println("error", err)
 				return
 			}
-			err = registerClient.Register(app.Getenv("BaseURL"))
+			err = registerClient.Register(app.Getenv("BrokerURI"))
 			if err != nil { // TODO: pop dialog
 				log.Println("error", err)
 				c.dialog.ShowError("error registering to broker: ", err.Error())

internal/server.go

@@ -289,6 +289,7 @@ func (s *Server) initRoutes() {
 
 		Env: map[string]string{
 			"BaseURL":        strings.TrimSuffix(s.config.BaseURL, "/"),
+			"BrokerURI":      strings.TrimSuffix(s.config.BrokerURI, "/"),
 			"LookupEndpoint": strings.TrimSuffix(s.config.BaseURL, "/") + "/api/v1/lookup/",
 			"SendEndpoint":   strings.TrimSuffix(s.config.BaseURL, "/") + "/api/v1/send",
 		},