Skip to content

Add API to return auth settings #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
feedmeapples merged 1 commit into from
Dec 23, 2021
Merged

Add API to return auth settings #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions server/routes/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,18 @@ import (
"github.com/labstack/echo-contrib/session"
"github.com/labstack/echo/v4"
"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/metadata"

"github.com/temporalio/ui-server/server/config"
"github.com/temporalio/ui-server/server/generated/api/workflowservice/v1"
"google.golang.org/grpc"
)

// SetAPIRoutes sets api routes
func SetAPIRoutes(e *echo.Echo, temporalConn *grpc.ClientConn) error {
func SetAPIRoutes(e *echo.Echo, cfg *config.Config, temporalConn *grpc.ClientConn) error {
api := e.Group("/api")
api.GET("/v1/me", getCurrentUser)
api.GET("/v1/settings", getSettings(cfg))
api.Match([]string{"GET", "POST", "PUT", "PATCH", "DELETE"}, "/*", temporalAPIHandler(temporalConn))
return nil
}
Expand Down Expand Up @@ -90,6 +92,22 @@ func getCurrentUser(c echo.Context) error {
return c.JSON(http.StatusOK, user)
}

func getSettings(cfg *config.Config) func(echo.Context) error {
return func(c echo.Context) error {
settings := struct {
Auth struct {
Enabled bool
}
}{
struct{ Enabled bool }{
cfg.Auth.Enabled,
},
}

return c.JSON(http.StatusOK, settings)
}
}

func withMarshaler() runtime.ServeMuxOption {
jsonpb := &gateway.JSONPb{
EmitDefaults: true,
Expand Down
2 changes: 1 addition & 1 deletion server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func NewServer(opts ...server_options.ServerOption) *Server {
)))

conn := rpc.CreateFrontendGRPCConnection(serverOpts.Config.TemporalGRPCAddress)
routes.SetAPIRoutes(e, conn)
routes.SetAPIRoutes(e, serverOpts.Config, conn)

routes.SetAuthRoutes(e, &serverOpts.Config.Auth)
if serverOpts.Config.EnableOpenAPI {
Expand Down