|
@@ -884,6 +884,9 @@ func getUserV1(w http.ResponseWriter, r *http.Request) {
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
+ user.NumAccessTokens, _ = (&schema.UserAccessToken{
|
|
|
|
+ UserName: user.UserName,
|
|
|
|
+ }).CountByUser(r.Context())
|
|
userRoleTemplate, err := logic.GetRole(user.PlatformRoleID)
|
|
userRoleTemplate, err := logic.GetRole(user.PlatformRoleID)
|
|
if err != nil {
|
|
if err != nil {
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
|
@@ -923,6 +926,12 @@ func getUsers(w http.ResponseWriter, r *http.Request) {
|
|
|
|
|
|
users, err := logic.GetUsers()
|
|
users, err := logic.GetUsers()
|
|
|
|
|
|
|
|
+ for i := range users {
|
|
|
|
+ users[i].NumAccessTokens, _ = (&schema.UserAccessToken{
|
|
|
|
+ UserName: users[i].UserName,
|
|
|
|
+ }).CountByUser(r.Context())
|
|
|
|
+ }
|
|
|
|
+
|
|
if err != nil {
|
|
if err != nil {
|
|
logger.Log(0, "failed to fetch users: ", err.Error())
|
|
logger.Log(0, "failed to fetch users: ", err.Error())
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|