Browse Source

Minor api refactoring / code clean up

Torkel Ödegaard 10 years ago
parent
commit
2266ef6809
2 changed files with 6 additions and 8 deletions
  1. 1 1
      pkg/api/api.go
  2. 5 7
      pkg/api/signup.go

+ 1 - 1
pkg/api/api.go

@@ -39,7 +39,7 @@ func Register(r *macaron.Macaron) {
 
 
 	// sign up
 	// sign up
 	r.Get("/signup", Index)
 	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
 	// reset password
 	r.Get("/user/password/send-reset-email", Index)
 	r.Get("/user/password/send-reset-email", Index)

+ 5 - 7
pkg/api/signup.go

@@ -10,17 +10,15 @@ import (
 )
 )
 
 
 // POST /api/user/signup
 // POST /api/user/signup
-func SignUp(c *middleware.Context, cmd m.CreateUserCommand) {
+func SignUp(c *middleware.Context, cmd m.CreateUserCommand) Response {
 	if !setting.AllowUserSignUp {
 	if !setting.AllowUserSignUp {
-		c.JsonApiErr(401, "User signup is disabled", nil)
-		return
+		return ApiError(401, "User signup is disabled", nil)
 	}
 	}
 
 
 	cmd.Login = cmd.Email
 	cmd.Login = cmd.Email
 
 
 	if err := bus.Dispatch(&cmd); err != nil {
 	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
 	user := cmd.Result
@@ -34,7 +32,7 @@ func SignUp(c *middleware.Context, cmd m.CreateUserCommand) {
 
 
 	loginUserWithUser(&user, c)
 	loginUserWithUser(&user, c)
 
 
-	c.JsonOK("User created and logged in")
-
 	metrics.M_Api_User_SignUp.Inc(1)
 	metrics.M_Api_User_SignUp.Inc(1)
+
+	return ApiSuccess("User created and logged in")
 }
 }