summaryrefslogtreecommitdiffstats
path: root/web/web.go
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2016-01-12 08:02:38 -0500
committerJoramWilander <jwawilander@gmail.com>2016-01-12 08:02:38 -0500
commit1763ff6d72bae7dc57475dc73a03a7c0f12acc90 (patch)
tree6c890a1016f6b6a58fd786d655575c6cc98d6bf9 /web/web.go
parent82818ced78bd720f5354152cf7794903cafc0d14 (diff)
downloadchat-1763ff6d72bae7dc57475dc73a03a7c0f12acc90.tar.gz
chat-1763ff6d72bae7dc57475dc73a03a7c0f12acc90.tar.bz2
chat-1763ff6d72bae7dc57475dc73a03a7c0f12acc90.zip
Support old oauth routes
Diffstat (limited to 'web/web.go')
-rw-r--r--web/web.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/web/web.go b/web/web.go
index bf1208adc..337ed311d 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")
+ mainrouter.Handle("/signup/{service:[A-Za-z]+}/complete", api.AppHandlerIndependent(completeOAuth)).Methods("GET")
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