diff --git a/README.md b/README.md index c6343b02..ec5e6de3 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ project, which is unfortunate. However, this approach does have some advantages: ## Swagger UI -Flamenco Manager has a SwaggerUI interface at http://localhost:8080/api/swagger-ui/ +Flamenco Manager has a SwaggerUI interface at http://localhost:8080/api/v3/swagger-ui/ ## SocketIO diff --git a/cmd/flamenco-manager/main.go b/cmd/flamenco-manager/main.go index 222d4f4e..9fd0c843 100644 --- a/cmd/flamenco-manager/main.go +++ b/cmd/flamenco-manager/main.go @@ -287,7 +287,7 @@ func buildWebService( api.RegisterHandlers(e, flamenco) webUpdater.RegisterHandlers(e) swagger_ui.RegisterSwaggerUIStaticFiles(e) - e.GET("/api/openapi3.json", func(c echo.Context) error { + e.GET("/api/v3/openapi3.json", func(c echo.Context) error { return c.JSON(http.StatusOK, swagger) }) diff --git a/internal/manager/swagger_ui/static/index.html b/internal/manager/swagger_ui/static/index.html index 12295651..f7ffd4ad 100644 --- a/internal/manager/swagger_ui/static/index.html +++ b/internal/manager/swagger_ui/static/index.html @@ -39,7 +39,7 @@ window.onload = function() { // Begin Swagger UI call region const ui = SwaggerUIBundle({ - url: "/api/openapi3.json", + url: "/api/v3/openapi3.json", dom_id: '#swagger-ui', deepLinking: true, presets: [ diff --git a/internal/manager/swagger_ui/swagger_ui.go b/internal/manager/swagger_ui/swagger_ui.go index 8fe553f4..f0d9809d 100644 --- a/internal/manager/swagger_ui/swagger_ui.go +++ b/internal/manager/swagger_ui/swagger_ui.go @@ -12,6 +12,8 @@ import ( //go:embed static var swaggerUI embed.FS +const swaggerURL = "/api/v3/swagger-ui/" + func RegisterSwaggerUIStaticFiles(router *echo.Echo) { files, err := fs.Sub(swaggerUI, "static") if err != nil { @@ -19,5 +21,5 @@ func RegisterSwaggerUIStaticFiles(router *echo.Echo) { } httpHandler := http.FileServer(http.FS(files)) - router.GET("/api/swagger-ui/*", echo.WrapHandler(http.StripPrefix("/api/swagger-ui/", httpHandler))) + router.GET(swaggerURL+"*", echo.WrapHandler(http.StripPrefix(swaggerURL, httpHandler))) } diff --git a/web/app/src/App.vue b/web/app/src/App.vue index 92d90b0b..3fccdcab 100644 --- a/web/app/src/App.vue +++ b/web/app/src/App.vue @@ -17,7 +17,7 @@ addon - | API + | API | version: {{ flamencoVersion }}