IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Minor api refactoring / code clean up

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-06-10 10:15:42 +02:00
parent 63cc794f37
commit 2266ef6809
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/api.go
View File

@ -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)

12
pkg/api/signup.go
View File

@ -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 ApiError(401, "User signup is disabled", nil)
return
} }
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 ApiError(500, "failed to create user", err)
return
} }
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")
} }