summaryrefslogtreecommitdiffstats
path: root/app/user.go
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-04-25 11:00:41 -0400
committerCorey Hulen <corey@hulen.com>2017-04-25 08:00:41 -0700
commitdb68e598a10d36013b7ff0994eca86e0464355e1 (patch)
treeec0f5e42c42d43afd4476f7e6b5ba9d3484577cc /app/user.go
parentcb668b92832193df7549c5a16543dcdfed44be56 (diff)
downloadchat-db68e598a10d36013b7ff0994eca86e0464355e1.tar.gz
chat-db68e598a10d36013b7ff0994eca86e0464355e1.tar.bz2
chat-db68e598a10d36013b7ff0994eca86e0464355e1.zip
PLT-4457 Added API to get multiple users by their usernames (#6218)
* Allow getting profiles by username without a team * Changed UserStore.GetProfilesByUsernames to return an array * PLT-4457 Added API to get multiple users by their usernames * Changed users/names route to users/usernames
Diffstat (limited to 'app/user.go')
-rw-r--r--app/user.go56
1 files changed, 22 insertions, 34 deletions
diff --git a/app/user.go b/app/user.go
index 827ad18f9..86e7cf0b0 100644
--- a/app/user.go
+++ b/app/user.go
@@ -430,11 +430,7 @@ func GetUsersPage(page int, perPage int, asAdmin bool) ([]*model.User, *model.Ap
return nil, err
}
- for _, user := range users {
- SanitizeProfile(user, asAdmin)
- }
-
- return users, nil
+ return sanitizeProfiles(users, asAdmin), nil
}
func GetUsersEtag() string {
@@ -479,11 +475,7 @@ func GetUsersInTeamPage(teamId string, page int, perPage int, asAdmin bool) ([]*
return nil, err
}
- for _, user := range users {
- SanitizeProfile(user, asAdmin)
- }
-
- return users, nil
+ return sanitizeProfiles(users, asAdmin), nil
}
func GetUsersNotInTeamPage(teamId string, page int, perPage int, asAdmin bool) ([]*model.User, *model.AppError) {
@@ -492,11 +484,7 @@ func GetUsersNotInTeamPage(teamId string, page int, perPage int, asAdmin bool) (
return nil, err
}
- for _, user := range users {
- SanitizeProfile(user, asAdmin)
- }
-
- return users, nil
+ return sanitizeProfiles(users, asAdmin), nil
}
func GetUsersInTeamEtag(teamId string) string {
@@ -537,11 +525,7 @@ func GetUsersInChannelPage(channelId string, page int, perPage int, asAdmin bool
return nil, err
}
- for _, user := range users {
- SanitizeProfile(user, asAdmin)
- }
-
- return users, nil
+ return sanitizeProfiles(users, asAdmin), nil
}
func GetUsersNotInChannel(teamId string, channelId string, offset int, limit int) ([]*model.User, *model.AppError) {
@@ -574,11 +558,7 @@ func GetUsersNotInChannelPage(teamId string, channelId string, page int, perPage
return nil, err
}
- for _, user := range users {
- SanitizeProfile(user, asAdmin)
- }
-
- return users, nil
+ return sanitizeProfiles(users, asAdmin), nil
}
func GetUsersWithoutTeamPage(page int, perPage int, asAdmin bool) ([]*model.User, *model.AppError) {
@@ -587,11 +567,7 @@ func GetUsersWithoutTeamPage(page int, perPage int, asAdmin bool) ([]*model.User
return nil, err
}
- for _, user := range users {
- SanitizeProfile(user, asAdmin)
- }
-
- return users, nil
+ return sanitizeProfiles(users, asAdmin), nil
}
func GetUsersWithoutTeam(offset int, limit int) ([]*model.User, *model.AppError) {
@@ -607,13 +583,25 @@ func GetUsersByIds(userIds []string, asAdmin bool) ([]*model.User, *model.AppErr
return nil, result.Err
} else {
users := result.Data.([]*model.User)
+ return sanitizeProfiles(users, asAdmin), nil
+ }
+}
- for _, u := range users {
- SanitizeProfile(u, asAdmin)
- }
+func GetUsersByUsernames(usernames []string, asAdmin bool) ([]*model.User, *model.AppError) {
+ if result := <-Srv.Store.User().GetProfilesByUsernames(usernames, ""); result.Err != nil {
+ return nil, result.Err
+ } else {
+ users := result.Data.([]*model.User)
+ return sanitizeProfiles(users, asAdmin), nil
+ }
+}
- return users, nil
+func sanitizeProfiles(users []*model.User, asAdmin bool) []*model.User {
+ for _, u := range users {
+ SanitizeProfile(u, asAdmin)
}
+
+ return users
}
func GenerateMfaSecret(userId string) (*model.MfaSecret, *model.AppError) {