summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorSaturnino Abril <saturnino.abril@gmail.com>2017-03-24 18:13:27 +0900
committerGeorge Goldberg <george@gberg.me>2017-03-24 09:13:27 +0000
commitf1274a7ec29919e9c99cf41f5c1b47589f38cfb1 (patch)
tree67e0c36cd13ba7ff74446d218141f706cb69240d /app
parent1167b391854957a5d58ed569c1dc2f80e9ccc599 (diff)
downloadchat-f1274a7ec29919e9c99cf41f5c1b47589f38cfb1.tar.gz
chat-f1274a7ec29919e9c99cf41f5c1b47589f38cfb1.tar.bz2
chat-f1274a7ec29919e9c99cf41f5c1b47589f38cfb1.zip
Endpoint for APIv4 POST /teams/{team_id}/members (#5804)
Diffstat (limited to 'app')
-rw-r--r--app/team.go42
1 files changed, 42 insertions, 0 deletions
diff --git a/app/team.go b/app/team.go
index d0d907731..0de6cffc4 100644
--- a/app/team.go
+++ b/app/team.go
@@ -391,6 +391,48 @@ func GetTeamMembersByIds(teamId string, userIds []string) ([]*model.TeamMember,
}
}
+func AddTeamMember(teamId, userId, siteURL string) (*model.TeamMember, *model.AppError) {
+ if _, err := AddUserToTeam(teamId, userId, siteURL); err != nil {
+ return nil, err
+ }
+
+ if teamMember, err := GetTeamMember(teamId, userId); err != nil {
+ return nil, err
+ } else {
+ return teamMember, nil
+ }
+}
+
+func AddTeamMemberByHash(userId, hash, data, siteURL string) (*model.TeamMember, *model.AppError) {
+ var team *model.Team
+ var err *model.AppError
+
+ if team, err = AddUserToTeamByHash(userId, hash, data, siteURL); err != nil {
+ return nil, err
+ }
+
+ if teamMember, err := GetTeamMember(team.Id, userId); err != nil {
+ return nil, err
+ } else {
+ return teamMember, nil
+ }
+}
+
+func AddTeamMemberByInviteId(inviteId, userId, siteURL string) (*model.TeamMember, *model.AppError) {
+ var team *model.Team
+ var err *model.AppError
+
+ if team, err = AddUserToTeamByInviteId(inviteId, userId, siteURL); err != nil {
+ return nil, err
+ }
+
+ if teamMember, err := GetTeamMember(team.Id, userId); err != nil {
+ return nil, err
+ } else {
+ return teamMember, nil
+ }
+}
+
func GetTeamUnread(teamId, userId string) (*model.TeamUnread, *model.AppError) {
result := <-Srv.Store.Team().GetChannelUnreadsForTeam(teamId, userId)
if result.Err != nil {