From d4268cf0d86cee4d51fa1877ccf47b2a69b65cd4 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 12 Oct 2016 06:51:57 -0700 Subject: Trim trailing slashes to prevent OAuth2 URI mismatch errors (#4204) Closes https://gitlab.com/gitlab-org/gitlab-mattermost/issues/84 --- api/context.go | 2 +- api/context_test.go | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) (limited to 'api') diff --git a/api/context.go b/api/context.go index 81a2c021d..524ccf402 100644 --- a/api/context.go +++ b/api/context.go @@ -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 { diff --git a/api/context_test.go b/api/context_test.go index 88ba0f665..2227b7f65 100644 --- a/api/context_test.go +++ b/api/context_test.go @@ -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) + } + } + +} -- cgit v1.2.3-1-g7c22