Trim trailing slashes to prevent OAuth2 URI mismatch errors (#4204)

Closes https://gitlab.com/gitlab-org/gitlab-mattermost/issues/84
This commit is contained in:
Stan Hu
2016-10-12 06:51:57 -07:00
committed by Joram Wilander
parent d195eea07d
commit d4268cf0d8
2 changed files with 22 additions and 1 deletions

View File

@@ -364,7 +364,7 @@ func (c *Context) SetTeamURLFromSession() {
}
func (c *Context) SetSiteURL(url string) {
c.siteURL = url
c.siteURL = strings.TrimRight(url, "/")
}
func (c *Context) GetTeamURLFromTeam(team *model.Team) string {

View File

@@ -29,3 +29,24 @@ func TestCache(t *testing.T) {
t.Fatal("should have one less")
}
}
func TestSiteURL(t *testing.T) {
c := &Context{}
testCases := []struct {
url string
want string
}{
{"http://mattermost.com/", "http://mattermost.com"},
{"http://mattermost.com", "http://mattermost.com"},
}
for _, tc := range testCases {
c.SetSiteURL(tc.url)
if c.siteURL != tc.want {
t.Fatalf("expected %s, got %s", tc.want, c.siteURL)
}
}
}