|
@@ -1,9 +1,11 @@
|
|
|
package controller
|
|
|
|
|
|
import (
|
|
|
+ "context"
|
|
|
"encoding/json"
|
|
|
"errors"
|
|
|
"fmt"
|
|
|
+ "github.com/gravitl/netmaker/db"
|
|
|
"net/http"
|
|
|
"reflect"
|
|
|
"time"
|
|
@@ -584,6 +586,18 @@ func getUsers(w http.ResponseWriter, r *http.Request) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
+ for i, user := range users {
|
|
|
+ // only setting num_access_tokens here, because only UI needs it.
|
|
|
+ user.NumAccessTokens, err = (&schema.UserAccessToken{
|
|
|
+ UserName: user.UserName,
|
|
|
+ }).CountByUser(db.WithContext(context.TODO()))
|
|
|
+ if err != nil {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+
|
|
|
+ users[i] = user
|
|
|
+ }
|
|
|
+
|
|
|
logic.SortUsers(users[:])
|
|
|
logger.Log(2, r.Header.Get("user"), "fetched users")
|
|
|
json.NewEncoder(w).Encode(users)
|