diff options
| author | Corey Hulen <corey@hulen.com> | 2016-01-12 14:46:06 -0600 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-01-12 14:46:06 -0600 |
| commit | b8c70b4d04a7719fd99a8b01485422d1e69dacfd (patch) | |
| tree | 321047afaf41986dcf8fc7e775e6e186e6d3b041 /api | |
| parent | cc746dda6acbcba3645bafcb368104f78ce1aeae (diff) | |
| parent | 6ce6115100aea3b11e113cc805abfaff89af12c4 (diff) | |
| download | chat-b8c70b4d04a7719fd99a8b01485422d1e69dacfd.tar.gz chat-b8c70b4d04a7719fd99a8b01485422d1e69dacfd.tar.bz2 chat-b8c70b4d04a7719fd99a8b01485422d1e69dacfd.zip | |
Merge pull request #1876 from mattermost/release-1.4
Release 1.4 RC2
Diffstat (limited to 'api')
| -rw-r--r-- | api/user.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/user.go b/api/user.go index 6c0ce86d6..d014ab995 100644 --- a/api/user.go +++ b/api/user.go @@ -1790,7 +1790,7 @@ func GetAuthorizationCode(c *Context, service, teamName string, props map[string props["team"] = teamName state := b64.StdEncoding.EncodeToString([]byte(model.MapToJson(props))) - redirectUri := c.GetSiteURL() + "/" + service + "/complete" + redirectUri := c.GetSiteURL() + "/signup/" + service + "/complete" // Remove /signup after a few releases (~1.8) authUrl := endpoint + "?response_type=code&client_id=" + clientId + "&redirect_uri=" + url.QueryEscape(redirectUri) + "&state=" + url.QueryEscape(state) |