diff options
| author | Corey Hulen <corey@hulen.com> | 2016-01-12 14:08:29 -0600 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-01-12 14:08:29 -0600 |
| commit | 55da65f6896345c75e5ba69f5c36dd00dbc6a0a9 (patch) | |
| tree | 03d57b7a4bc91234f41f498b731dbd6438f92ae7 | |
| parent | fe982081462ca298f85035020f07fc8aa36967af (diff) | |
| parent | d1eb3eef309fb6b859511123cf2507e92b3ced49 (diff) | |
| download | chat-55da65f6896345c75e5ba69f5c36dd00dbc6a0a9.tar.gz chat-55da65f6896345c75e5ba69f5c36dd00dbc6a0a9.tar.bz2 chat-55da65f6896345c75e5ba69f5c36dd00dbc6a0a9.zip | |
Merge pull request #1872 from mattermost/plt-1667
PLT-1667 Support old OAuth routes
| -rw-r--r-- | api/user.go | 2 | ||||
| -rw-r--r-- | web/web.go | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/api/user.go b/api/user.go index d4c7fcaf5..00d637ec2 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) diff --git a/web/web.go b/web/web.go index bf1208adc..c0fbb9808 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 |