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 /web/web.go | |
| 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 'web/web.go')
| -rw-r--r-- | web/web.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/web/web.go b/web/web.go index 5cc0e288d..634a9d851 100644 --- a/web/web.go +++ b/web/web.go @@ -70,6 +70,8 @@ func InitWeb() { mainrouter.Handle("/verify_email", api.AppHandlerIndependent(verifyEmail)).Methods("GET") mainrouter.Handle("/find_team", api.AppHandlerIndependent(findTeam)).Methods("GET") mainrouter.Handle("/signup_team", api.AppHandlerIndependent(signup)).Methods("GET") + mainrouter.Handle("/login/{service:[A-Za-z]+}/complete", api.AppHandlerIndependent(completeOAuth)).Methods("GET") // Remove after a few releases (~1.8) + mainrouter.Handle("/signup/{service:[A-Za-z]+}/complete", api.AppHandlerIndependent(completeOAuth)).Methods("GET") // Remove after a few releases (~1.8) mainrouter.Handle("/{service:[A-Za-z]+}/complete", api.AppHandlerIndependent(completeOAuth)).Methods("GET") mainrouter.Handle("/admin_console", api.UserRequired(adminConsole)).Methods("GET") @@ -711,7 +713,7 @@ func completeOAuth(c *api.Context, w http.ResponseWriter, r *http.Request) { code := r.URL.Query().Get("code") state := r.URL.Query().Get("state") - uri := c.GetSiteURL() + "/" + service + "/complete" + uri := c.GetSiteURL() + "/signup/" + service + "/complete" // Remove /signup after a few releases (~1.8) if body, team, props, err := api.AuthorizeOAuthUser(service, code, state, uri); err != nil { c.Err = err |