diff options
| author | Jesús Espino <jespinog@gmail.com> | 2018-04-18 22:46:10 +0200 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2018-04-18 13:46:10 -0700 |
| commit | 0910eae31de8ed7b409654515dbd11f5c86dbf71 (patch) | |
| tree | 3d5fb47842693cd2ea1a357994c85d04902773a7 /api/team.go | |
| parent | b13a228b0451098ea32933a36fe64566e366583d (diff) | |
| download | chat-0910eae31de8ed7b409654515dbd11f5c86dbf71.tar.gz chat-0910eae31de8ed7b409654515dbd11f5c86dbf71.tar.bz2 chat-0910eae31de8ed7b409654515dbd11f5c86dbf71.zip | |
MM-9779: Incorporate a Token into the invitations system (#8604)
* Incorporate a Token into the invitations system
* Adding unit tests
* Fixing some api4 client tests
* Removing unnecesary hash validation
* Change the Hash concept on invitations with tokenId
* Not send invitation if it wasn't able to create the Token
* Fixing some naming problems
* Changing the hash query params received from the client side
* Removed unneded data param in the token usage
Diffstat (limited to 'api/team.go')
| -rw-r--r-- | api/team.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/api/team.go b/api/team.go index b1d8086d3..c3eaab128 100644 --- a/api/team.go +++ b/api/team.go @@ -182,15 +182,14 @@ func removeUserFromTeam(c *Context, w http.ResponseWriter, r *http.Request) { func addUserToTeamFromInvite(c *Context, w http.ResponseWriter, r *http.Request) { params := model.MapFromJson(r.Body) - hash := params["hash"] - data := params["data"] + tokenId := params["token"] inviteId := params["invite_id"] var team *model.Team var err *model.AppError - if len(hash) > 0 { - team, err = c.App.AddUserToTeamByHash(c.Session.UserId, hash, data) + if len(tokenId) > 0 { + team, err = c.App.AddUserToTeamByToken(c.Session.UserId, tokenId) } else if len(inviteId) > 0 { team, err = c.App.AddUserToTeamByInviteId(inviteId, c.Session.UserId) } else { |