From 4ccd3d7ace5c5acb9888a811bcfefa1ea06666f5 Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Sat, 1 Apr 2023 14:51:39 -0800
Subject: [PATCH]  fix swagger stuff

---
 backend/app/api/main.go             |  3 ---
 backend/app/api/routes.go           |  2 +-
 backend/internal/sys/config/conf.go | 22 ++++++++--------------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/backend/app/api/main.go b/backend/app/api/main.go
index d966a48..aac6c6d 100644
--- a/backend/app/api/main.go
+++ b/backend/app/api/main.go
@@ -13,7 +13,6 @@ import (
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 
-	"github.com/hay-kot/homebox/backend/app/api/static/docs"
 	"github.com/hay-kot/homebox/backend/internal/core/services"
 	"github.com/hay-kot/homebox/backend/internal/data/ent"
 	"github.com/hay-kot/homebox/backend/internal/data/migrations"
@@ -53,8 +52,6 @@ func main() {
 		panic(err)
 	}
 
-	docs.SwaggerInfo.Host = cfg.Swagger.Host
-
 	if err := run(cfg); err != nil {
 		panic(err)
 	}
diff --git a/backend/app/api/routes.go b/backend/app/api/routes.go
index e36ee02..d361a78 100644
--- a/backend/app/api/routes.go
+++ b/backend/app/api/routes.go
@@ -41,7 +41,7 @@ func (a *app) mountRoutes(r *chi.Mux, chain *errchain.ErrChain, repos *repo.AllR
 	registerMimes()
 
 	r.Get("/swagger/*", httpSwagger.Handler(
-		httpSwagger.URL(fmt.Sprintf("%s://%s/swagger/doc.json", a.conf.Swagger.Scheme, a.conf.Swagger.Host)),
+		httpSwagger.URL(fmt.Sprintf("/swagger/doc.json")),
 	))
 
 	// =========================================================================
diff --git a/backend/internal/sys/config/conf.go b/backend/internal/sys/config/conf.go
index c1655c2..6ece6c5 100644
--- a/backend/internal/sys/config/conf.go
+++ b/backend/internal/sys/config/conf.go
@@ -15,15 +15,14 @@ const (
 )
 
 type Config struct {
-	Mode    string      `yaml:"mode" conf:"default:development"` // development or production
-	Web     WebConfig   `yaml:"web"`
-	Storage Storage     `yaml:"storage"`
-	Log     LoggerConf  `yaml:"logger"`
-	Mailer  MailerConf  `yaml:"mailer"`
-	Swagger SwaggerConf `yaml:"swagger"`
-	Demo    bool        `yaml:"demo"`
-	Debug   DebugConf   `yaml:"debug"`
-	Options Options     `yaml:"options"`
+	Mode    string     `yaml:"mode" conf:"default:development"` // development or production
+	Web     WebConfig  `yaml:"web"`
+	Storage Storage    `yaml:"storage"`
+	Log     LoggerConf `yaml:"logger"`
+	Mailer  MailerConf `yaml:"mailer"`
+	Demo    bool       `yaml:"demo"`
+	Debug   DebugConf  `yaml:"debug"`
+	Options Options    `yaml:"options"`
 }
 
 type Options struct {
@@ -36,11 +35,6 @@ type DebugConf struct {
 	Port    string `yaml:"port" conf:"default:4000"`
 }
 
-type SwaggerConf struct {
-	Host   string `yaml:"host" conf:"default:localhost:7745"`
-	Scheme string `yaml:"scheme" conf:"default:http"`
-}
-
 type WebConfig struct {
 	Port          string `yaml:"port" conf:"default:7745"`
 	Host          string `yaml:"host"`