summaryrefslogtreecommitdiffstats
path: root/api4
diff options
context:
space:
mode:
authorlisakycho <lisakycho@gmail.com>2018-06-07 09:45:49 -0700
committerJoram Wilander <jwawilander@gmail.com>2018-06-07 12:45:49 -0400
commite09b3c566b2de1da1d916d3e209c96d43be739e2 (patch)
tree3a9629a4fdac0a6e43382a17484458cc60ce2a25 /api4
parentc8d95958335c8daf8e67aa021c2c82f78bf4abd4 (diff)
downloadchat-e09b3c566b2de1da1d916d3e209c96d43be739e2.tar.gz
chat-e09b3c566b2de1da1d916d3e209c96d43be739e2.tar.bz2
chat-e09b3c566b2de1da1d916d3e209c96d43be739e2.zip
Get the count of the all system users at endpoint /users/stats (#8847)
* Get the count of the all system users at endpoint /users/stats * Added GetTotalUsersStats test in api4 * Changed pluralization and added the test back.
Diffstat (limited to 'api4')
-rw-r--r--api4/user.go15
-rw-r--r--api4/user_test.go35
2 files changed, 30 insertions, 20 deletions
diff --git a/api4/user.go b/api4/user.go
index 2292544c4..39d2eac61 100644
--- a/api4/user.go
+++ b/api4/user.go
@@ -22,6 +22,7 @@ func (api *API) InitUser() {
api.BaseRoutes.Users.Handle("/usernames", api.ApiSessionRequired(getUsersByNames)).Methods("POST")
api.BaseRoutes.Users.Handle("/search", api.ApiSessionRequired(searchUsers)).Methods("POST")
api.BaseRoutes.Users.Handle("/autocomplete", api.ApiSessionRequired(autocompleteUsers)).Methods("GET")
+ api.BaseRoutes.Users.Handle("/stats", api.ApiSessionRequired(getTotalUsersStats)).Methods("GET")
api.BaseRoutes.User.Handle("", api.ApiSessionRequired(getUser)).Methods("GET")
api.BaseRoutes.User.Handle("/image", api.ApiSessionRequiredTrustRequester(getProfileImage)).Methods("GET")
@@ -278,6 +279,20 @@ func setProfileImage(c *Context, w http.ResponseWriter, r *http.Request) {
ReturnStatusOK(w)
}
+func getTotalUsersStats(c *Context, w http.ResponseWriter, r *http.Request) {
+ if c.Err != nil {
+ return
+ }
+
+ if stats, err := c.App.GetTotalUsersStats(); err != nil {
+ c.Err = err
+ return
+ } else {
+ w.Write([]byte(stats.ToJson()))
+ return
+ }
+}
+
func getUsers(c *Context, w http.ResponseWriter, r *http.Request) {
inTeamId := r.URL.Query().Get("in_team")
notInTeamId := r.URL.Query().Get("not_in_team")
diff --git a/api4/user_test.go b/api4/user_test.go
index 593208c92..53aaf7a99 100644
--- a/api4/user_test.go
+++ b/api4/user_test.go
@@ -909,6 +909,21 @@ func TestGetUsersByUsernames(t *testing.T) {
CheckUnauthorizedStatus(t, resp)
}
+func TestGetTotalUsersStat(t *testing.T) {
+ th := Setup().InitBasic().InitSystemAdmin()
+ defer th.TearDown()
+ Client := th.Client
+
+ total := <-th.App.Srv.Store.User().GetTotalUsersCount()
+
+ rstats, resp := Client.GetTotalUsersStats("")
+ CheckNoError(t, resp)
+
+ if rstats.TotalUsersCount != total.Data.(int64) {
+ t.Fatal("wrong count")
+ }
+}
+
func TestUpdateUser(t *testing.T) {
th := Setup().InitBasic().InitSystemAdmin()
defer th.TearDown()
@@ -1749,30 +1764,23 @@ func TestUpdateUserPassword(t *testing.T) {
/*func TestResetPassword(t *testing.T) {
th := Setup().InitBasic()
Client := th.Client
-
Client.Logout()
-
user := th.BasicUser
-
// Delete all the messages before check the reset password
utils.DeleteMailBox(user.Email)
-
success, resp := Client.SendPasswordResetEmail(user.Email)
CheckNoError(t, resp)
if !success {
t.Fatal("should have succeeded")
}
-
_, resp = Client.SendPasswordResetEmail("")
CheckBadRequestStatus(t, resp)
-
// Should not leak whether the email is attached to an account or not
success, resp = Client.SendPasswordResetEmail("notreal@example.com")
CheckNoError(t, resp)
if !success {
t.Fatal("should have succeeded")
}
-
// Check if the email was send to the right email address and the recovery key match
var resultsMailbox utils.JSONMessageHeaderInbucket
err := utils.RetryInbucket(5, func() error {
@@ -1784,7 +1792,6 @@ func TestUpdateUserPassword(t *testing.T) {
t.Log(err)
t.Log("No email was received, maybe due load on the server. Disabling this verification")
}
-
var recoveryTokenString string
if err == nil && len(resultsMailbox) > 0 {
if !strings.ContainsAny(resultsMailbox[0].To[0], user.Email) {
@@ -1801,7 +1808,6 @@ func TestUpdateUserPassword(t *testing.T) {
}
}
}
-
var recoveryToken *model.Token
if result := <-th.App.Srv.Store.Token().GetByToken(recoveryTokenString); result.Err != nil {
t.Log(recoveryTokenString)
@@ -1809,44 +1815,33 @@ func TestUpdateUserPassword(t *testing.T) {
} else {
recoveryToken = result.Data.(*model.Token)
}
-
_, resp = Client.ResetPassword(recoveryToken.Token, "")
CheckBadRequestStatus(t, resp)
-
_, resp = Client.ResetPassword(recoveryToken.Token, "newp")
CheckBadRequestStatus(t, resp)
-
_, resp = Client.ResetPassword("", "newpwd")
CheckBadRequestStatus(t, resp)
-
_, resp = Client.ResetPassword("junk", "newpwd")
CheckBadRequestStatus(t, resp)
-
code := ""
for i := 0; i < model.TOKEN_SIZE; i++ {
code += "a"
}
-
_, resp = Client.ResetPassword(code, "newpwd")
CheckBadRequestStatus(t, resp)
-
success, resp = Client.ResetPassword(recoveryToken.Token, "newpwd")
CheckNoError(t, resp)
if !success {
t.Fatal("should have succeeded")
}
-
Client.Login(user.Email, "newpwd")
Client.Logout()
-
_, resp = Client.ResetPassword(recoveryToken.Token, "newpwd")
CheckBadRequestStatus(t, resp)
-
authData := model.NewId()
if result := <-app.Srv.Store.User().UpdateAuthData(user.Id, "random", &authData, "", true); result.Err != nil {
t.Fatal(result.Err)
}
-
_, resp = Client.SendPasswordResetEmail(user.Email)
CheckBadRequestStatus(t, resp)
}*/