[handlers] minor fixes

Author: capcom6

internal/config/module.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"strings"
 	"time"
 
 	"github.com/android-sms-gateway/server/internal/sms-gateway/handlers"
@@ -53,7 +54,7 @@ var Module = fx.Module(
 	}),
 	fx.Provide(func(cfg Config) push.Config {
 		mode := push.ModeFCM
-		if cfg.Gateway.Mode == "private" {
+		if cfg.Gateway.Mode == GatewayModePrivate {
 			mode = push.ModeUpstream
 		}
 
@@ -78,15 +79,25 @@ var Module = fx.Module(
 		}
 	}),
 	fx.Provide(func(cfg Config) handlers.Config {
-		if cfg.HTTP.API.Host == "" {
+		// Default and normalize API path/host
+		if cfg.HTTP.API.Path == "" {
 			cfg.HTTP.API.Path = "/api"
 		}
+		// Ensure leading slash and trim trailing slash (except root)
+		if !strings.HasPrefix(cfg.HTTP.API.Path, "/") {
+			cfg.HTTP.API.Path = "/" + cfg.HTTP.API.Path
+		}
+		if cfg.HTTP.API.Path != "/" && strings.HasSuffix(cfg.HTTP.API.Path, "/") {
+			cfg.HTTP.API.Path = strings.TrimRight(cfg.HTTP.API.Path, "/")
+		}
+		// Guard against misconfigured scheme in host (accept "host[:port]" only)
+		cfg.HTTP.API.Host = strings.TrimPrefix(strings.TrimPrefix(cfg.HTTP.API.Host, "https://"), "http://")
 
 		return handlers.Config{
 			PublicHost:      cfg.HTTP.API.Host,
 			PublicPath:      cfg.HTTP.API.Path,
 			UpstreamEnabled: cfg.Gateway.Mode == GatewayModePublic,
-			OpanAPIEnabled:  cfg.HTTP.OpenAPI.Enabled,
+			OpenAPIEnabled:  cfg.HTTP.OpenAPI.Enabled,
 		}
 	}),
 	fx.Provide(func(cfg Config) messages.Config {

internal/sms-gateway/handlers/config.go

@@ -5,5 +5,5 @@ type Config struct {
 	PublicPath string
 
 	UpstreamEnabled bool
-	OpanAPIEnabled  bool
+	OpenAPIEnabled  bool
 }

internal/sms-gateway/handlers/root.go

@@ -21,7 +21,7 @@ func (h *rootHandler) Register(app *fiber.App) {
 }
 
 func (h *rootHandler) registerOpenAPI(router fiber.Router) {
-	if !h.config.OpanAPIEnabled {
+	if !h.config.OpenAPIEnabled {
 		return
 	}
 

internal/sms-gateway/openapi/openapi.go

@@ -26,14 +26,9 @@ func (s *Handler) Register(router fiber.Router, publicHost, publicPath string) {
 		func(c *fiber.Ctx) error {
 			if SwaggerInfo.Host == "" {
 				SwaggerInfo.Host = c.Hostname()
-				// SwaggerInfo.BasePath = "/api"
 			}
 
-			scheme := "http"
-			if c.Secure() {
-				scheme = "https"
-			}
-			SwaggerInfo.Schemes = []string{scheme}
+			SwaggerInfo.Schemes = []string{c.Protocol()}
 			return c.Next()
 		},
 		etag.New(etag.Config{Weak: true}),