IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-6983 Allowed team invite IDs of arbitrary lengths to match API v3 (#6944)

Browse Source
This commit is contained in:
Harrison Healey
2017-07-14 17:06:59 -04:00
committed by Saturnino Abril
parent a20ddb4047
commit 9a23519d07
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api4/context.go
View File

@@ -355,7 +355,7 @@ func (c *Context) RequireInviteId() *Context {
return c
}
if len(c.Params.InviteId) != 26 {
if len(c.Params.InviteId) == 0 {
c.SetInvalidUrlParam("invite_id")
}
return c

13
api4/team_test.go
View File

@@ -12,10 +12,10 @@ import (
"strings"
"testing"
"encoding/base64"
"github.com/mattermost/platform/app"
"github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils"
"encoding/base64"
)
func TestCreateTeam(t *testing.T) {
@@ -1475,7 +1475,7 @@ func TestInviteUsersToTeam(t *testing.T) {
}
func TestGetTeamInviteInfo(t *testing.T) {
th := Setup().InitBasic()
th := Setup().InitBasic().InitSystemAdmin()
defer TearDown()
Client := th.Client
team := th.BasicTeam
@@ -1491,6 +1491,13 @@ func TestGetTeamInviteInfo(t *testing.T) {
t.Fatal("should be empty")
}
team.InviteId = "12345678901234567890123456789012"
team, resp = th.SystemAdminClient.UpdateTeam(team)
CheckNoError(t, resp)
team, resp = Client.GetTeamInviteInfo(team.InviteId)
CheckNoError(t, resp)
_, resp = Client.GetTeamInviteInfo("junk")
CheckBadRequestStatus(t, resp)
CheckNotFoundStatus(t, resp)
}