From 9485e8cfeed1d52f10d3516c55844550b31b4e52 Mon Sep 17 00:00:00 2001 From: utkarshcmu Date: Mon, 16 Nov 2015 06:55:02 -0800 Subject: [PATCH 1/3] /api/admin/users returns user ID --- pkg/api/admin_users.go | 11 +++++++++-- pkg/models/user.go | 5 +++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pkg/api/admin_users.go b/pkg/api/admin_users.go index a293032c200..f5704abee9a 100644 --- a/pkg/api/admin_users.go +++ b/pkg/api/admin_users.go @@ -37,7 +37,14 @@ func AdminCreateUser(c *middleware.Context, form dtos.AdminCreateUserForm) { metrics.M_Api_Admin_User_Create.Inc(1) - c.JsonOK("User created") + user := cmd.Result + + result := m.UserIdDTO{ + Message: "User created", + Id: user.Id, + } + + c.JSON(200, result) } func AdminUpdateUserPassword(c *middleware.Context, form dtos.AdminUpdateUserPasswordForm) { @@ -96,5 +103,5 @@ func AdminDeleteUser(c *middleware.Context) { return } - c.JsonOK("User deleted") + c.JsonOK("User deleted") } diff --git a/pkg/models/user.go b/pkg/models/user.go index 64067d59654..4ab24b11363 100644 --- a/pkg/models/user.go +++ b/pkg/models/user.go @@ -157,3 +157,8 @@ type UserSearchHitDTO struct { Email string `json:"email"` IsAdmin bool `json:"isAdmin"` } + +type UserIdDTO struct { + Id int64 `json:"id"` + Message string `json:"message"` +} From e5931e264bfcc6316fc295ecec2abcc78dca3077 Mon Sep 17 00:00:00 2001 From: utkarshcmu Date: Mon, 16 Nov 2015 06:56:46 -0800 Subject: [PATCH 2/3] Updated http_api docs --- docs/sources/reference/http_api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/reference/http_api.md b/docs/sources/reference/http_api.md index 609f12269ca..eb1e235b1f7 100644 --- a/docs/sources/reference/http_api.md +++ b/docs/sources/reference/http_api.md @@ -1388,7 +1388,7 @@ Create new user HTTP/1.1 200 Content-Type: application/json - {"message":"User created"} + {"id":5,"message":"User created"} ### Password for User From f5db9950f83e22689db28c95d31be31feb6c2851 Mon Sep 17 00:00:00 2001 From: utkarshcmu Date: Mon, 16 Nov 2015 07:28:38 -0800 Subject: [PATCH 3/3] fixed gofmt tests --- pkg/api/admin_users.go | 14 +++++++------- pkg/models/user.go | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/api/admin_users.go b/pkg/api/admin_users.go index f5704abee9a..7690630aaa2 100644 --- a/pkg/api/admin_users.go +++ b/pkg/api/admin_users.go @@ -37,14 +37,14 @@ func AdminCreateUser(c *middleware.Context, form dtos.AdminCreateUserForm) { metrics.M_Api_Admin_User_Create.Inc(1) - user := cmd.Result + user := cmd.Result - result := m.UserIdDTO{ - Message: "User created", - Id: user.Id, - } + result := m.UserIdDTO{ + Message: "User created", + Id: user.Id, + } - c.JSON(200, result) + c.JSON(200, result) } func AdminUpdateUserPassword(c *middleware.Context, form dtos.AdminUpdateUserPasswordForm) { @@ -103,5 +103,5 @@ func AdminDeleteUser(c *middleware.Context) { return } - c.JsonOK("User deleted") + c.JsonOK("User deleted") } diff --git a/pkg/models/user.go b/pkg/models/user.go index 4ab24b11363..2842bad490d 100644 --- a/pkg/models/user.go +++ b/pkg/models/user.go @@ -159,6 +159,6 @@ type UserSearchHitDTO struct { } type UserIdDTO struct { - Id int64 `json:"id"` - Message string `json:"message"` + Id int64 `json:"id"` + Message string `json:"message"` }