From 2266ef680977d436a491786fc5b21c1672c07229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 10 Jun 2015 10:15:42 +0200 Subject: [PATCH] Minor api refactoring / code clean up --- pkg/api/api.go | 2 +- pkg/api/signup.go | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index 7a96b095348..f33b08e6477 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -39,7 +39,7 @@ func Register(r *macaron.Macaron) { // sign up r.Get("/signup", Index) - r.Post("/api/user/signup", bind(m.CreateUserCommand{}), SignUp) + r.Post("/api/user/signup", bind(m.CreateUserCommand{}), wrap(SignUp)) // reset password r.Get("/user/password/send-reset-email", Index) diff --git a/pkg/api/signup.go b/pkg/api/signup.go index d2723cee95c..77305caba70 100644 --- a/pkg/api/signup.go +++ b/pkg/api/signup.go @@ -10,17 +10,15 @@ import ( ) // POST /api/user/signup -func SignUp(c *middleware.Context, cmd m.CreateUserCommand) { +func SignUp(c *middleware.Context, cmd m.CreateUserCommand) Response { if !setting.AllowUserSignUp { - c.JsonApiErr(401, "User signup is disabled", nil) - return + return ApiError(401, "User signup is disabled", nil) } cmd.Login = cmd.Email if err := bus.Dispatch(&cmd); err != nil { - c.JsonApiErr(500, "failed to create user", err) - return + return ApiError(500, "failed to create user", err) } user := cmd.Result @@ -34,7 +32,7 @@ func SignUp(c *middleware.Context, cmd m.CreateUserCommand) { loginUserWithUser(&user, c) - c.JsonOK("User created and logged in") - metrics.M_Api_User_SignUp.Inc(1) + + return ApiSuccess("User created and logged in") }