3
0

More info about api, docs, webapp endpoints

This commit is contained in:
Denis Arh
2020-12-14 14:28:05 +01:00
parent 343aa84468
commit 629cdc06cd
2 changed files with 31 additions and 8 deletions
+28 -4
View File
@@ -11,6 +11,7 @@ import (
systemRest "github.com/cortezaproject/corteza-server/system/rest"
"github.com/go-chi/chi"
"go.uber.org/zap"
"net/http"
"strings"
"sync"
)
@@ -59,20 +60,43 @@ func (app *CortezaApp) mountHttpRoutes(r chi.Router) {
app.WsServer.ApiServerRoutes(r)
})
r.HandleFunc("/docs", func(w http.ResponseWriter, r *http.Request) {
// redirect to endpoint with slash
http.Redirect(w, r, "/"+apiBaseUrl+"/docs/", http.StatusPermanentRedirect)
})
r.HandleFunc("/docs*", server.ServeDocs("/"+apiBaseUrl+"/docs"))
})
app.Log.Info(
"JSON REST API enabled",
zap.String("baseUrl", app.Opt.HTTPServer.ApiBaseUrl),
)
app.Log.Info(
"API docs enabled",
zap.String("baseUrl", app.Opt.HTTPServer.ApiBaseUrl+"/docs"),
)
} else {
app.Log.Info("JSON REST API disabled")
}
if app.Opt.HTTPServer.WebappEnabled {
app.Log.Debug(
"serving web applications",
zap.String("baseUrl", webappBaseUrl),
r.Route("/"+webappBaseUrl, webapp.MakeWebappServer(app.Opt.HTTPServer))
app.Log.Info(
"client web applications enabled",
zap.String("baseUrl", app.Opt.HTTPServer.WebappBaseUrl),
zap.String("baseDir", app.Opt.HTTPServer.WebappBaseDir),
)
r.Route("/"+webappBaseUrl, webapp.MakeWebappServer(app.Opt.HTTPServer))
} else {
app.Log.Info("client web applications disabled")
}
if app.Opt.Federation.Enabled {
r.Route("/federation", federationRest.MountRoutes)
} else {
app.Log.Info(
"federation API disabled",
)
}
}
+3 -4
View File
@@ -41,14 +41,13 @@ func (s *server) MountRoutes(mm ...func(chi.Router)) {
func (s server) Serve(ctx context.Context) {
s.log.Info(
"Starting HTTP server with REST API",
"starting HTTP server",
zap.String("address", s.httpOpt.Addr),
zap.String("baseUrl", s.httpOpt.ApiBaseUrl),
)
listener, err := net.Listen("tcp", s.httpOpt.Addr)
if err != nil {
s.log.Error("Can not start server", zap.Error(err))
s.log.Error("can not start server", zap.Error(err))
return
}
@@ -100,7 +99,7 @@ func (s server) Serve(ctx context.Context) {
}
}
s.log.Info("Server stopped", zap.Error(err))
s.log.Info("HTTP server stopped", zap.Error(err))
}
func (s server) bindMiscRoutes(router chi.Router) {