From eb48e73a54420c5604ce0eb9521107dabc0a6b87 Mon Sep 17 00:00:00 2001 From: Simone Gotti Date: Wed, 19 Feb 2020 10:03:13 +0100 Subject: [PATCH] gateway: move authentication apis to /api/v1alpha/auth Move the various authentication apis to /api/v1alpha/auth since they should be versioned like other apis. --- internal/services/gateway/gateway.go | 10 +++++----- services/gateway/client/client.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/services/gateway/gateway.go b/internal/services/gateway/gateway.go index 626ea32..657d92a 100644 --- a/internal/services/gateway/gateway.go +++ b/internal/services/gateway/gateway.go @@ -315,14 +315,14 @@ func (g *Gateway) Run(ctx context.Context) error { apirouter.Handle("/version", versionHandler).Methods("GET") + apirouter.Handle("/auth/login", loginUserHandler).Methods("POST") + apirouter.Handle("/auth/authorize", authorizeHandler).Methods("POST") + apirouter.Handle("/auth/register", registerHandler).Methods("POST") + apirouter.Handle("/auth/oauth2/callback", oauth2callbackHandler).Methods("GET") + // TODO(sgotti) add auth to these requests reposRouter.Handle("/repos/{rest:.*}", reposHandler).Methods("GET", "POST") - router.Handle("/api/login", loginUserHandler).Methods("POST") - router.Handle("/api/authorize", authorizeHandler).Methods("POST") - router.Handle("/api/register", registerHandler).Methods("POST") - router.Handle("/api/oauth2/callback", oauth2callbackHandler).Methods("GET") - router.Handle("/webhooks", webhooksHandler).Methods("POST") router.PathPrefix("/").HandlerFunc(handlers.NewWebBundleHandlerFunc(g.c.APIExposedURL)) diff --git a/services/gateway/client/client.go b/services/gateway/client/client.go index f8b4df8..234cd85 100644 --- a/services/gateway/client/client.go +++ b/services/gateway/client/client.go @@ -430,7 +430,7 @@ func (c *Client) RegisterUser(ctx context.Context, req *gwapitypes.RegisterUserR } res := new(gwapitypes.RegisterUserResponse) - resp, err := c.getParsedResponse(ctx, "POST", "/register", nil, jsonContent, bytes.NewReader(reqj), res) + resp, err := c.getParsedResponse(ctx, "POST", "/auth/register", nil, jsonContent, bytes.NewReader(reqj), res) return res, resp, err }